Skip to content

Commit

Permalink
After regenerating the bindings from wasmtime c-api (main/dev branch)
Browse files Browse the repository at this point in the history
and adjusting the shared memory arguments to match the new api, I
found out that I needed to adjust other parts of the bindings that I guess
have changed since the last release.
In this commit, I only change the (shared) memory related ones, but I
think I can adjust the rest of the c-api that has changed as well in
the following commits.
  • Loading branch information
atilag committed Nov 12, 2024
1 parent cd78fa1 commit 0f8b244
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
78 changes: 39 additions & 39 deletions wasmtime/_bindings.py
Original file line number Diff line number Diff line change
Expand Up @@ -1955,9 +1955,9 @@ def wasi_config_inherit_stderr(config: Any) -> None:

_wasi_config_preopen_dir = dll.wasi_config_preopen_dir
_wasi_config_preopen_dir.restype = c_bool
_wasi_config_preopen_dir.argtypes = [POINTER(wasi_config_t), POINTER(c_char), POINTER(c_char)]
def wasi_config_preopen_dir(config: Any, path: Any, guest_path: Any) -> bool:
return _wasi_config_preopen_dir(config, path, guest_path) # type: ignore
_wasi_config_preopen_dir.argtypes = [POINTER(wasi_config_t), POINTER(c_char), POINTER(c_char), c_size_t, c_size_t]
def wasi_config_preopen_dir(config: Any, host_path: Any, guest_path: Any, dir_perms: Any, file_perms: Any) -> bool:
return _wasi_config_preopen_dir(config, host_path, guest_path, dir_perms, file_perms) # type: ignore

class wasmtime_error(Structure):
pass
Expand Down Expand Up @@ -2096,6 +2096,12 @@ def wasmtime_config_wasm_multi_memory_set(arg0: Any, arg1: Any) -> None:
def wasmtime_config_wasm_memory64_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_wasm_memory64_set(arg0, arg1) # type: ignore

_wasmtime_config_wasm_wide_arithmetic_set = dll.wasmtime_config_wasm_wide_arithmetic_set
_wasmtime_config_wasm_wide_arithmetic_set.restype = None
_wasmtime_config_wasm_wide_arithmetic_set.argtypes = [POINTER(wasm_config_t), c_bool]
def wasmtime_config_wasm_wide_arithmetic_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_wasm_wide_arithmetic_set(arg0, arg1) # type: ignore

_wasmtime_config_strategy_set = dll.wasmtime_config_strategy_set
_wasmtime_config_strategy_set.restype = None
_wasmtime_config_strategy_set.argtypes = [POINTER(wasm_config_t), wasmtime_strategy_t]
Expand Down Expand Up @@ -2132,35 +2138,29 @@ def wasmtime_config_cranelift_opt_level_set(arg0: Any, arg1: Any) -> None:
def wasmtime_config_profiler_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_profiler_set(arg0, arg1) # type: ignore

_wasmtime_config_static_memory_forced_set = dll.wasmtime_config_static_memory_forced_set
_wasmtime_config_static_memory_forced_set.restype = None
_wasmtime_config_static_memory_forced_set.argtypes = [POINTER(wasm_config_t), c_bool]
def wasmtime_config_static_memory_forced_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_static_memory_forced_set(arg0, arg1) # type: ignore

_wasmtime_config_static_memory_maximum_size_set = dll.wasmtime_config_static_memory_maximum_size_set
_wasmtime_config_static_memory_maximum_size_set.restype = None
_wasmtime_config_static_memory_maximum_size_set.argtypes = [POINTER(wasm_config_t), c_uint64]
def wasmtime_config_static_memory_maximum_size_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_static_memory_maximum_size_set(arg0, arg1) # type: ignore

_wasmtime_config_static_memory_guard_size_set = dll.wasmtime_config_static_memory_guard_size_set
_wasmtime_config_static_memory_guard_size_set.restype = None
_wasmtime_config_static_memory_guard_size_set.argtypes = [POINTER(wasm_config_t), c_uint64]
def wasmtime_config_static_memory_guard_size_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_static_memory_guard_size_set(arg0, arg1) # type: ignore

_wasmtime_config_dynamic_memory_guard_size_set = dll.wasmtime_config_dynamic_memory_guard_size_set
_wasmtime_config_dynamic_memory_guard_size_set.restype = None
_wasmtime_config_dynamic_memory_guard_size_set.argtypes = [POINTER(wasm_config_t), c_uint64]
def wasmtime_config_dynamic_memory_guard_size_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_dynamic_memory_guard_size_set(arg0, arg1) # type: ignore

_wasmtime_config_dynamic_memory_reserved_for_growth_set = dll.wasmtime_config_dynamic_memory_reserved_for_growth_set
_wasmtime_config_dynamic_memory_reserved_for_growth_set.restype = None
_wasmtime_config_dynamic_memory_reserved_for_growth_set.argtypes = [POINTER(wasm_config_t), c_uint64]
def wasmtime_config_dynamic_memory_reserved_for_growth_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_dynamic_memory_reserved_for_growth_set(arg0, arg1) # type: ignore
_wasmtime_config_memory_may_move_set = dll.wasmtime_config_memory_may_move_set
_wasmtime_config_memory_may_move_set.restype = None
_wasmtime_config_memory_may_move_set.argtypes = [POINTER(wasm_config_t), c_bool]
def wasmtime_config_memory_may_move_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_memory_may_move_set(arg0, arg1) # type: ignore

_wasmtime_config_memory_reservation_set = dll.wasmtime_config_memory_reservation_set
_wasmtime_config_memory_reservation_set.restype = None
_wasmtime_config_memory_reservation_set.argtypes = [POINTER(wasm_config_t), c_uint64]
def wasmtime_config_memory_reservation_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_memory_reservation_set(arg0, arg1) # type: ignore

_wasmtime_config_memory_guard_size_set = dll.wasmtime_config_memory_guard_size_set
_wasmtime_config_memory_guard_size_set.restype = None
_wasmtime_config_memory_guard_size_set.argtypes = [POINTER(wasm_config_t), c_uint64]
def wasmtime_config_memory_guard_size_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_memory_guard_size_set(arg0, arg1) # type: ignore

_wasmtime_config_memory_reservation_reserved_for_growth_set = dll.wasmtime_config_memory_reservation_reserved_for_growth_set
_wasmtime_config_memory_reservation_reserved_for_growth_set.restype = None
_wasmtime_config_memory_reservation_reserved_for_growth_set.argtypes = [POINTER(wasm_config_t), c_uint64]
def wasmtime_config_memory_reservation_reserved_for_growth_set(arg0: Any, arg1: Any) -> None:
return _wasmtime_config_memory_reservation_reserved_for_growth_set(arg0, arg1) # type: ignore

_wasmtime_config_native_unwind_info_set = dll.wasmtime_config_native_unwind_info_set
_wasmtime_config_native_unwind_info_set.restype = None
Expand Down Expand Up @@ -2937,9 +2937,9 @@ def wasmtime_linker_instantiate_pre(linker: Any, module: Any, instance_pre: Any)

_wasmtime_memorytype_new = dll.wasmtime_memorytype_new
_wasmtime_memorytype_new.restype = POINTER(wasm_memorytype_t)
_wasmtime_memorytype_new.argtypes = [c_uint64, c_bool, c_uint64, c_bool]
def wasmtime_memorytype_new(min: Any, max_present: Any, max: Any, is_64: Any) -> ctypes._Pointer:
return _wasmtime_memorytype_new(min, max_present, max, is_64) # type: ignore
_wasmtime_memorytype_new.argtypes = [c_uint64, c_bool, c_uint64, c_bool, c_bool]
def wasmtime_memorytype_new(min: Any, max_present: Any, max: Any, is_64: Any, shared: Any) -> ctypes._Pointer:
return _wasmtime_memorytype_new(min, max_present, max, is_64, shared) # type: ignore

_wasmtime_memorytype_minimum = dll.wasmtime_memorytype_minimum
_wasmtime_memorytype_minimum.restype = c_uint64
Expand Down Expand Up @@ -3054,25 +3054,25 @@ def wasmtime_table_type(store: Any, table: Any) -> ctypes._Pointer:

_wasmtime_table_get = dll.wasmtime_table_get
_wasmtime_table_get.restype = c_bool
_wasmtime_table_get.argtypes = [POINTER(wasmtime_context_t), POINTER(wasmtime_table_t), c_uint32, POINTER(wasmtime_val_t)]
_wasmtime_table_get.argtypes = [POINTER(wasmtime_context_t), POINTER(wasmtime_table_t), c_uint64, POINTER(wasmtime_val_t)]
def wasmtime_table_get(store: Any, table: Any, index: Any, val: Any) -> bool:
return _wasmtime_table_get(store, table, index, val) # type: ignore

_wasmtime_table_set = dll.wasmtime_table_set
_wasmtime_table_set.restype = POINTER(wasmtime_error_t)
_wasmtime_table_set.argtypes = [POINTER(wasmtime_context_t), POINTER(wasmtime_table_t), c_uint32, POINTER(wasmtime_val_t)]
_wasmtime_table_set.argtypes = [POINTER(wasmtime_context_t), POINTER(wasmtime_table_t), c_uint64, POINTER(wasmtime_val_t)]
def wasmtime_table_set(store: Any, table: Any, index: Any, value: Any) -> ctypes._Pointer:
return _wasmtime_table_set(store, table, index, value) # type: ignore

_wasmtime_table_size = dll.wasmtime_table_size
_wasmtime_table_size.restype = c_uint32
_wasmtime_table_size.restype = c_uint64
_wasmtime_table_size.argtypes = [POINTER(wasmtime_context_t), POINTER(wasmtime_table_t)]
def wasmtime_table_size(store: Any, table: Any) -> int:
return _wasmtime_table_size(store, table) # type: ignore

_wasmtime_table_grow = dll.wasmtime_table_grow
_wasmtime_table_grow.restype = POINTER(wasmtime_error_t)
_wasmtime_table_grow.argtypes = [POINTER(wasmtime_context_t), POINTER(wasmtime_table_t), c_uint32, POINTER(wasmtime_val_t), POINTER(c_uint32)]
_wasmtime_table_grow.argtypes = [POINTER(wasmtime_context_t), POINTER(wasmtime_table_t), c_uint64, POINTER(wasmtime_val_t), POINTER(c_uint64)]
def wasmtime_table_grow(store: Any, table: Any, delta: Any, init: Any, prev_size: Any) -> ctypes._Pointer:
return _wasmtime_table_grow(store, table, delta, init, prev_size) # type: ignore

Expand Down
2 changes: 1 addition & 1 deletion wasmtime/_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ def _as_extern(self) -> "ctypes._Pointer[ffi.wasm_externtype_t]":


class MemoryType(Managed["ctypes._Pointer[ffi.wasm_memorytype_t]"]):
def __init__(self, limits: Limits, is_64: bool = False, shared: bool = True):
def __init__(self, limits: Limits, is_64: bool = False, shared: bool = False):
if not isinstance(limits, Limits):
raise TypeError("expected Limits")
if is_64:
Expand Down

0 comments on commit 0f8b244

Please sign in to comment.