Merge branch '1.9'

matyhtf · matyhtf · commit 29055a3dab7a · 2017-08-04T19:02:13.000+08:00
diff --git a/include/Client.h b/include/Client.h
@@ -150,5 +150,6 @@ typedef struct
 } swDNSResolver_result;
 
 int swDNSResolver_request(char *domain, void (*callback)(char *, swDNSResolver_result *, void *), void *data);
+int swDNSResolver_free();
 
 #endif /* SW_CLIENT_H_ */
diff --git a/include/hashmap.h b/include/hashmap.h
@@ -46,6 +46,7 @@ int swHashMap_move_int(swHashMap *hmap, uint64_t old_key, uint64_t new_key);
 void* swHashMap_each(swHashMap* hmap, char **key);
 void* swHashMap_each_int(swHashMap* hmap, uint64_t *key);
 #define swHashMap_each_reset(hmap)    (hmap->iterator = NULL)
+uint32_t swHashMap_count(swHashMap* hmap);
 
 #ifdef __cplusplus
 }
diff --git a/src/core/hashmap.c b/src/core/hashmap.c
@@ -358,6 +358,15 @@ void* swHashMap_each_int(swHashMap* hmap, uint64_t *key)
     }
 }
 
+uint32_t swHashMap_count(swHashMap* hmap)
+{
+    if (hmap == NULL)
+    {
+        return 0;
+    }
+    return HASH_COUNT(hmap->root);
+}
+
 void swHashMap_free(swHashMap* hmap)
 {
     swHashMap_node *find, *tmp = NULL;
diff --git a/src/network/DNS.c b/src/network/DNS.c
@@ -395,6 +395,32 @@ int swDNSResolver_request(char *domain, void (*callback)(char *, swDNSResolver_r
     return SW_OK;
 }
 
+int swDNSResolver_free()
+{
+    if (resolver_socket == NULL)
+    {
+        return SW_ERR;
+    }
+    if (SwooleG.main_reactor == NULL)
+    {
+        return SW_ERR;
+    }
+    if (swHashMap_count(request_map) > 0)
+    {
+        return SW_ERR;
+    }
+
+    SwooleG.main_reactor->del(SwooleG.main_reactor, resolver_socket->socket->fd);
+    resolver_socket->close(resolver_socket);
+    swClient_free(resolver_socket);
+    sw_free(resolver_socket);
+    resolver_socket = NULL;
+    swHashMap_free(request_map);
+    request_map = NULL;
+
+    return SW_OK;
+}
+
 /**
  * The function converts the dot-based hostname into the DNS format
  * (i.e. www.apple.com into 3www5apple3com0)
diff --git a/src/network/Worker.c b/src/network/Worker.c
@@ -475,6 +475,8 @@ void swWorker_try_to_exit()
         swAio_free();
     }
 
+    swDNSResolver_free();
+
     uint8_t call_worker_exit_func = 0;
 
     while (1)

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ int swHashMap_move_int(swHashMap *hmap, uint64_t old_key, uint64_t new_key);`
`46`	`46`	`void* swHashMap_each(swHashMap* hmap, char **key);`
`47`	`47`	`void* swHashMap_each_int(swHashMap* hmap, uint64_t *key);`
`48`	`48`	`#define swHashMap_each_reset(hmap) (hmap->iterator = NULL)`
	`49`	`+uint32_t swHashMap_count(swHashMap* hmap);`
`49`	`50`
`50`	`51`	`#ifdef __cplusplus`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -358,6 +358,15 @@ void* swHashMap_each_int(swHashMap* hmap, uint64_t *key)`
`358`	`358`	`}`
`359`	`359`	`}`
`360`	`360`
	`361`	`+uint32_t swHashMap_count(swHashMap* hmap)`
	`362`	`+{`
	`363`	`+ if (hmap == NULL)`
	`364`	`+ {`
	`365`	`+ return 0;`
	`366`	`+ }`
	`367`	`+ return HASH_COUNT(hmap->root);`
	`368`	`+}`
	`369`	`+`
`361`	`370`	`void swHashMap_free(swHashMap* hmap)`
`362`	`371`	`{`
`363`	`372`	`swHashMap_node find, tmp = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -475,6 +475,8 @@ void swWorker_try_to_exit()`
`475`	`475`	`swAio_free();`
`476`	`476`	`}`
`477`	`477`
	`478`	`+ swDNSResolver_free();`
	`479`	`+`
`478`	`480`	`uint8_t call_worker_exit_func = 0;`
`479`	`481`
`480`	`482`	`while (1)`