fix: addressed review comment

Author: Hritik Gupta

core/iwasm/common/wasm_shared_memory.c

@@ -10,10 +10,6 @@ static bh_list shared_memory_list_head;
 static bh_list *const shared_memory_list = &shared_memory_list_head;
 static korp_mutex shared_memory_list_lock;
 
-static bh_list atomic_wait_address_list_head;
-static bh_list *const atomic_wait_address_list = &atomic_wait_address_list_head;
-static korp_mutex atomic_wait_address_list_lock;
-
 /* clang-format off */
 enum {
     S_WAITING,
@@ -56,8 +52,6 @@ wasm_shared_memory_init()
 {
     if (os_mutex_init(&shared_memory_list_lock) != 0)
         return false;
-    if (os_mutex_init(&atomic_wait_address_list_lock) != 0)
-        return false;
     /* wait map not exists, create new map */
     if (!(wait_map = bh_hash_map_create(32, true, (HashFunc)wait_address_hash,
                                         (KeyEqualFunc)wait_address_equal, NULL,
@@ -73,7 +67,6 @@ void
 wasm_shared_memory_destroy()
 {
     os_mutex_destroy(&shared_memory_list_lock);
-    os_mutex_destroy(&atomic_wait_address_list_lock);
     if (wait_map) {
         bh_hash_map_destroy(wait_map);
     }
@@ -99,12 +92,35 @@ search_module(WASMModuleCommon *module)
     return NULL;
 }
 
+static void
+create_list_of_waiter_addresses(void *key, void *value, void *user_data)
+{
+    /* add waiter address to atomic wait list */
+    AtomicWaitAddressNode *wait_address_node;
+
+    if (!(wait_address_node =
+              wasm_runtime_malloc(sizeof(AtomicWaitAddressNode)))) {
+        return;
+    }
+    wait_address_node->addr = key;
+    bh_assert(bh_list_insert(user_data, wait_address_node) == BH_LIST_SUCCESS);
+}
+
 void
 notify_stale_threads_on_exception(WASMModuleInstanceCommon *module_inst)
 {
+    bh_list atomic_wait_address_list_head;
+    bh_list *const atomic_wait_address_list = &atomic_wait_address_list_head;
+    static korp_mutex atomic_wait_address_list_lock;
     AtomicWaitAddressNode *node;
 
+    bh_list_status ret = bh_list_init(atomic_wait_address_list);
+    bh_assert(ret == BH_LIST_SUCCESS);
+
     os_mutex_lock(&atomic_wait_address_list_lock);
+    bh_hash_map_traverse(wait_map, create_list_of_waiter_addresses,
+                         atomic_wait_address_list);
+
     node = bh_list_first_elem(atomic_wait_address_list);
     while (node) {
         wasm_runtime_atomic_notify(module_inst, node->addr, UINT32_MAX);
@@ -330,11 +346,6 @@ release_wait_info(HashMap *wait_map_, AtomicWaitInfo *wait_info, void *address)
 
     if (wait_info->wait_list->len == 0) {
         bh_hash_map_remove(wait_map_, address, NULL, NULL);
-
-        os_mutex_lock(&atomic_wait_address_list_lock);
-        bh_list_remove(atomic_wait_address_list, address);
-        os_mutex_unlock(&atomic_wait_address_list_lock);
-
         destroy_wait_info(wait_info);
     }
 
@@ -376,22 +387,6 @@ wasm_runtime_atomic_wait(WASMModuleInstanceCommon *module, void *address,
 
     os_mutex_lock(&wait_info->wait_list_lock);
 
-    /* add waiter address to atomic wait list */
-    AtomicWaitAddressNode *wait_address_node;
-
-    os_mutex_lock(&atomic_wait_address_list_lock);
-    if (!(wait_address_node =
-              wasm_runtime_malloc(sizeof(AtomicWaitAddressNode)))) {
-        wasm_runtime_set_exception(module,
-                                   "failed to create wait address node");
-        os_mutex_unlock(&atomic_wait_address_list_lock);
-        return -1;
-    }
-    wait_address_node->addr = address;
-    bh_assert(bh_list_insert(atomic_wait_address_list, wait_address_node)
-              == BH_LIST_SUCCESS);
-    os_mutex_unlock(&atomic_wait_address_list_lock);
-
     if ((!wait64 && *(uint32 *)address != (uint32)expect)
         || (wait64 && *(uint64 *)address != expect)) {
         os_mutex_unlock(&wait_info->wait_list_lock);