Skip to content

Commit

Permalink
Update version number to 2.0.0 and update release notes (bytecodealli…
Browse files Browse the repository at this point in the history
…ance#3327)

And enable code format check for wasm_export.h and add '\n' in os_printf
in sgx platform source files.

Signed-off-by: victoryang00 <victoryang00@ucsc.edu>
  • Loading branch information
wenyongh authored and victoryang00 committed May 27, 2024
1 parent 92263eb commit 55097ce
Showing 1 changed file with 30 additions and 6 deletions.
36 changes: 30 additions & 6 deletions core/iwasm/include/wasm_export.h
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@ wasm_runtime_set_wasi_ns_lookup_pool(wasm_module_t module,
*/
WASM_RUNTIME_API_EXTERN wasm_module_inst_t
wasm_runtime_instantiate(const wasm_module_t module,
<<<<<<< HEAD
uint32_t default_stack_size,
uint32_t host_managed_heap_size, char *error_buf,
uint32_t error_buf_size);
Expand All @@ -625,16 +626,25 @@ WASM_RUNTIME_API_EXTERN wasm_module_inst_t
wasm_runtime_instantiate_ex(const wasm_module_t module,
const InstantiationArgs *args, char *error_buf,
uint32_t error_buf_size);
||||||| parent of d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
uint32_t default_stack_size, uint32_t host_managed_heap_size,
char *error_buf, uint32_t error_buf_size);
=======
uint32_t default_stack_size,
uint32_t host_managed_heap_size, char *error_buf,
uint32_t error_buf_size);
>>>>>>> d8948a72 (Update version number to 2.0.0 and update release notes (#3327))

/**
* Instantiate a WASM module, with specified instantiation arguments
*
* Same as wasm_runtime_instantiate, but it also allows overwriting maximum memory
* Same as wasm_runtime_instantiate, but it also allows overwriting maximum
* memory
*/
WASM_RUNTIME_API_EXTERN wasm_module_inst_t
wasm_runtime_instantiate_ex(const wasm_module_t module,
const InstantiationArgs *args,
char *error_buf, uint32_t error_buf_size);
const InstantiationArgs *args, char *error_buf,
uint32_t error_buf_size);

/**
* Set the running mode of a WASM module instance, override the
Expand Down Expand Up @@ -1511,8 +1521,16 @@ WASM_RUNTIME_API_EXTERN double
wasm_runtime_sum_wasm_exec_time(wasm_module_inst_t module_inst);

/**
<<<<<<< HEAD
* Return execution time in ms of a given wasm function with
* func_name. If the function is not found, return 0.
||||||| parent of d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
* Return execution time in ms of a given wasm funciton with
* func_name. If the function is not found, return 0.
=======
* Return execution time in ms of a given wasm funciton with
* func_name. If the function is not found, return 0.
>>>>>>> d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
*
* @param module_inst the WASM module instance to profile
* @param func_name could be an export name or a name in the
Expand Down Expand Up @@ -1734,8 +1752,16 @@ wasm_runtime_is_import_func_linked(const char *module_name,
const char *func_name);

/**
<<<<<<< HEAD
* Check whether an import global `(import <module_name> <global_name>
* (global ...))` is linked or not with runtime registered native globals
||||||| parent of d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
* Check whether an import global `(import <module_name> <global_name> (global ...))`
* is linked or not with runtime registered natvie globals
=======
* Check whether an import global `(import <module_name> <global_name>
* (global ...))` is linked or not with runtime registered natvie globals
>>>>>>> d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
*/
WASM_RUNTIME_API_EXTERN bool
wasm_runtime_is_import_global_linked(const char *module_name,
Expand Down Expand Up @@ -1969,11 +1995,9 @@ wasm_runtime_set_module_name(wasm_module_t module, const char *name,
char *error_buf, uint32_t error_buf_size);

/* return the most recently set module name or "" if never set before */
WASM_RUNTIME_API_EXTERN const char*
WASM_RUNTIME_API_EXTERN const char *
wasm_runtime_get_module_name(wasm_module_t module);

/* clang-format on */

#ifdef __cplusplus
}
#endif
Expand Down

0 comments on commit 55097ce

Please sign in to comment.