gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-10-31 13:17:31 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Add missing casts and improve error handling in performance map functions (#4202)

Browse Source 
Wrong type of arguments to formatting function.
This commit is contained in:
liang.he 2025-04-17 15:22:23 +08:00 committed by GitHub
parent 996758cd4a
commit ecb47d9326
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/iwasm/aot/aot_perf_map.c
View File

@ -31,8 +31,15 @@ get_func_size(const AOTModule *module, struct func_info *sorted_func_ptrs,
static int static int
compare_func_ptrs(const void *f1, const void *f2) compare_func_ptrs(const void *f1, const void *f2)
{ {
return (intptr_t)((struct func_info *)f1)->ptr uintptr_t ptr1 = (uintptr_t)((struct func_info *)f1)->ptr;
- (intptr_t)((struct func_info *)f2)->ptr; uintptr_t ptr2 = (uintptr_t)((struct func_info *)f2)->ptr;
if (ptr1 < ptr2)
return -1;
else if (ptr1 > ptr2)
return 1;
else
return 0;
} }
static struct func_info * static struct func_info *
@ -45,7 +52,7 @@ sort_func_ptrs(const AOTModule *module, char *error_buf, uint32 error_buf_size)
content_len = (uint64)sizeof(struct func_info) * module->func_count; content_len = (uint64)sizeof(struct func_info) * module->func_count;
sorted_func_ptrs = wasm_runtime_malloc(content_len); sorted_func_ptrs = wasm_runtime_malloc(content_len);
if (!sorted_func_ptrs) { if (!sorted_func_ptrs) {
snprintf(error_buf, error_buf_size, (void)snprintf(error_buf, error_buf_size,
"allocate memory failed when creating perf map"); "allocate memory failed when creating perf map");
return NULL; return NULL;
} }
@ -77,7 +84,8 @@ aot_create_perf_map(const AOTModule *module, char *error_buf,
if (!sorted_func_ptrs) if (!sorted_func_ptrs)
goto quit; goto quit;
snprintf(perf_map_path, sizeof(perf_map_path) - 1, "/tmp/perf-%d.map", pid); (void)snprintf(perf_map_path, sizeof(perf_map_path) - 1, "/tmp/perf-%d.map",
pid);
perf_map = fopen(perf_map_path, "a"); perf_map = fopen(perf_map_path, "a");
if (!perf_map) { if (!perf_map) {
LOG_WARNING("warning: can't create /tmp/perf-%d.map, because %s", pid, LOG_WARNING("warning: can't create /tmp/perf-%d.map, because %s", pid,
@ -88,19 +96,23 @@ aot_create_perf_map(const AOTModule *module, char *error_buf,
const char *module_name = aot_get_module_name((AOTModule *)module); const char *module_name = aot_get_module_name((AOTModule *)module);
for (i = 0; i < module->func_count; i++) { for (i = 0; i < module->func_count; i++) {
memset(perf_map_info, 0, 128); memset(perf_map_info, 0, 128);
if (strlen(module_name) > 0) if (strlen(module_name) > 0) {
snprintf(perf_map_info, 128, PRIxPTR " %x [%s]#aot_func#%u\n", (void)snprintf(perf_map_info, 128,
"%" PRIxPTR " %x [%s]#aot_func#%u\n",
(uintptr_t)sorted_func_ptrs[i].ptr, (uintptr_t)sorted_func_ptrs[i].ptr,
get_func_size(module, sorted_func_ptrs, i), module_name, get_func_size(module, sorted_func_ptrs, i),
sorted_func_ptrs[i].idx); module_name, sorted_func_ptrs[i].idx);
else }
snprintf(perf_map_info, 128, PRIxPTR " %x aot_func#%u\n", else {
(void)snprintf(perf_map_info, 128,
"%" PRIxPTR " %x aot_func#%u\n",
(uintptr_t)sorted_func_ptrs[i].ptr, (uintptr_t)sorted_func_ptrs[i].ptr,
get_func_size(module, sorted_func_ptrs, i), get_func_size(module, sorted_func_ptrs, i),
sorted_func_ptrs[i].idx); sorted_func_ptrs[i].idx);
}
/* fwrite() is thread safe */ /* fwrite() is thread safe */
fwrite(perf_map_info, 1, strlen(perf_map_info), perf_map); (void)fwrite(perf_map_info, 1, strlen(perf_map_info), perf_map);
} }
LOG_VERBOSE("write map information from %s into /tmp/perf-%d.map", LOG_VERBOSE("write map information from %s into /tmp/perf-%d.map",
@ -112,7 +124,7 @@ quit:
wasm_runtime_free(sorted_func_ptrs); wasm_runtime_free(sorted_func_ptrs);
if (perf_map) if (perf_map)
fclose(perf_map); (void)fclose(perf_map);
return ret; return ret;
} }