From 5586f7b82d98b30d6df70913879cd780e0bcc442 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 24 Aug 2022 17:39:32 +0900 Subject: [PATCH] source debug: Remove unused platform_port (#1403) --- core/iwasm/common/wasm_runtime_common.c | 1 - core/iwasm/include/wasm_export.h | 2 +- core/iwasm/libraries/debug-engine/debug_engine.c | 5 +---- core/iwasm/libraries/debug-engine/debug_engine.h | 2 +- product-mini/platforms/posix/main.c | 2 -- product-mini/platforms/windows/main.c | 2 -- 6 files changed, 3 insertions(+), 11 deletions(-) diff --git a/core/iwasm/common/wasm_runtime_common.c b/core/iwasm/common/wasm_runtime_common.c index 7562877c..1230b465 100644 --- a/core/iwasm/common/wasm_runtime_common.c +++ b/core/iwasm/common/wasm_runtime_common.c @@ -408,7 +408,6 @@ wasm_runtime_full_init(RuntimeInitArgs *init_args) #if WASM_ENABLE_DEBUG_INTERP != 0 if (strlen(init_args->ip_addr)) if (!wasm_debug_engine_init(init_args->ip_addr, - init_args->platform_port, init_args->instance_port)) { wasm_runtime_destroy(); return false; diff --git a/core/iwasm/include/wasm_export.h b/core/iwasm/include/wasm_export.h index 9c1b3afc..da388c85 100644 --- a/core/iwasm/include/wasm_export.h +++ b/core/iwasm/include/wasm_export.h @@ -137,7 +137,7 @@ typedef struct RuntimeInitArgs { /* Debug settings, only used when WASM_ENABLE_DEBUG_INTERP != 0 */ char ip_addr[128]; - int platform_port; + int unused; /* was platform_port */ int instance_port; /* Fast JIT code cache size */ diff --git a/core/iwasm/libraries/debug-engine/debug_engine.c b/core/iwasm/libraries/debug-engine/debug_engine.c index d0d85e43..36adb753 100644 --- a/core/iwasm/libraries/debug-engine/debug_engine.c +++ b/core/iwasm/libraries/debug-engine/debug_engine.c @@ -17,7 +17,6 @@ typedef struct WASMDebugEngine { struct WASMDebugEngine *next; WASMDebugControlThread *control_thread; char ip_addr[128]; - int32 platform_port; int32 process_base_port; bh_list debug_instance_list; korp_mutex instance_list_lock; @@ -290,7 +289,7 @@ wasm_debug_engine_destroy() } bool -wasm_debug_engine_init(char *ip_addr, int32 platform_port, int32 process_port) +wasm_debug_engine_init(char *ip_addr, int32 process_port) { if (wasm_debug_handler_init() != 0) { return false; @@ -302,8 +301,6 @@ wasm_debug_engine_init(char *ip_addr, int32 platform_port, int32 process_port) if (g_debug_engine) { process_port -= 1; - g_debug_engine->platform_port = - platform_port > 0 ? platform_port : 1234; g_debug_engine->process_base_port = (process_port > 0) ? process_port : 0; if (ip_addr) diff --git a/core/iwasm/libraries/debug-engine/debug_engine.h b/core/iwasm/libraries/debug-engine/debug_engine.h index 7c159a04..939d75f9 100644 --- a/core/iwasm/libraries/debug-engine/debug_engine.h +++ b/core/iwasm/libraries/debug-engine/debug_engine.h @@ -117,7 +117,7 @@ WASMDebugInstance * wasm_exec_env_get_instance(WASMExecEnv *exec_env); bool -wasm_debug_engine_init(char *ip_addr, int32 platform_port, int32 process_port); +wasm_debug_engine_init(char *ip_addr, int32 process_port); void wasm_debug_engine_destroy(); diff --git a/product-mini/platforms/posix/main.c b/product-mini/platforms/posix/main.c index 9d544e26..7f325276 100644 --- a/product-mini/platforms/posix/main.c +++ b/product-mini/platforms/posix/main.c @@ -329,7 +329,6 @@ main(int argc, char *argv[]) #endif #if WASM_ENABLE_DEBUG_INTERP != 0 char *ip_addr = NULL; - /* int platform_port = 0; */ int instance_port = 0; #endif @@ -497,7 +496,6 @@ main(int argc, char *argv[]) #endif #if WASM_ENABLE_DEBUG_INTERP != 0 - init_args.platform_port = 0; init_args.instance_port = instance_port; if (ip_addr) strcpy(init_args.ip_addr, ip_addr); diff --git a/product-mini/platforms/windows/main.c b/product-mini/platforms/windows/main.c index 6d053c7a..265cf2c8 100644 --- a/product-mini/platforms/windows/main.c +++ b/product-mini/platforms/windows/main.c @@ -247,7 +247,6 @@ main(int argc, char *argv[]) #endif #if WASM_ENABLE_DEBUG_INTERP != 0 char *ip_addr = NULL; - /* int platform_port = 0; */ int instance_port = 0; #endif @@ -371,7 +370,6 @@ main(int argc, char *argv[]) #endif #if WASM_ENABLE_DEBUG_INTERP != 0 - init_args.platform_port = 0; init_args.instance_port = instance_port; if (ip_addr) strcpy(init_args.ip_addr, ip_addr);