修复server#stop node未释放的bug

frodosens · Sep 3, 2014 · 92234d3 · 92234d3
1 parent 20d9b31
commit 92234d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/FSNet/fs_server.c b/FSNet/fs_server.c
@@ -340,9 +340,9 @@ fs_server_start(struct fs_server* server, struct fs_node_addr* addr, enum fs_ser
 
 
 void
-__hahs_destroy_fn(void* data){
-    if(data){
-        struct fs_node* node = (struct fs_node*)data;
+__hash_each(const char* key, void* val, const void* server){
+    if(val){
+        struct fs_node* node = (struct fs_node*)val;
         fs_node_shudown(node);
     }
 }
@@ -378,6 +378,7 @@ fs_server_stop(struct fs_server* server, int32_t what){
 
 
     if(server->node_map){
+        sm_enum(server->node_map, __hash_each, server);
         sm_delete(server->node_map);
         server->node_map = NULL;
     }

diff --git a/FSNet/hash.h b/FSNet/hash.h
@@ -64,7 +64,7 @@ extern "C"
      *
      * Return value: None.
      */
-    typedef void(*sm_enum_func)(const char *key, const char *value, const void *obj);
+    typedef void(*sm_enum_func)(const char *key, void *value, const void *obj);
 
     /*
      * Creates a string map.