DISPATCH-1962 Fix leak of qdr_core_subscribe

Author: jiridanek

src/router_core/modules/mobile_sync/mobile.c

@@ -936,14 +936,11 @@ static void qcm_mobile_sync_final_CT(void *module_context)
 {
     qdrm_mobile_sync_t *msync = (qdrm_mobile_sync_t*) module_context;
 
-    qdr_core_unsubscribe(msync->message_sub1);
-    qdr_core_unsubscribe(msync->message_sub2);
     qdrc_event_unsubscribe_CT(msync->core, msync->event_sub);
     qdr_core_timer_free_CT(msync->core, msync->timer);
 
-    //
-    // Don't explicitly unsubscribe the addresses, these are already gone at module-final time.  // TODO: appears not?
-    //
+    qdr_core_unsubscribe(msync->message_sub1);
+    qdr_core_unsubscribe(msync->message_sub2);
 
     free(msync);
 }

src/router_core/router_core.c

@@ -150,9 +150,6 @@ void qdr_core_free(qdr_core_t *core)
     core->router_id = 0;
     core->router_area = 0;
 
-    // I have to first run qdrc_endpoint_do_cleanup_CT src/router_core/core_link_endpoint.c:241
-    //  and only then qcm_edge_router_final_CT src/router_core/modules/edge_router/module.c:59
-
     qdr_link_route_t *link_route = 0;
     while ( (link_route = DEQ_HEAD(core->link_routes))) {
         DEQ_REMOVE_HEAD(core->link_routes);
@@ -295,9 +292,20 @@ void qdr_core_free(qdr_core_t *core)
     // Drain the general work lists
     qdr_general_handler(core);
 
+    // at this point all the conn identifiers have been freed
+    qd_hash_free(core->conn_id_hash);
+
+    qdr_agent_free(core->mgmt_agent);
+
     //
     // Free the core resources
     //
+    if (core->routers_by_mask_bit)       free(core->routers_by_mask_bit);
+    if (core->control_links_by_mask_bit) free(core->control_links_by_mask_bit);
+    if (core->data_links_by_mask_bit)    free(core->data_links_by_mask_bit);
+    if (core->neighbor_free_mask)        qd_bitmask_free(core->neighbor_free_mask);
+    if (core->rnode_conns_by_mask_bit)   free(core->rnode_conns_by_mask_bit);
+
     sys_thread_free(core->thread);
     sys_cond_free(core->action_cond);
     sys_mutex_free(core->action_lock);
@@ -311,17 +319,6 @@ void qdr_core_free(qdr_core_t *core)
         }
     }
 
-    // at this point all the conn identifiers have been freed
-    qd_hash_free(core->conn_id_hash);
-
-    qdr_agent_free(core->mgmt_agent);
-
-    if (core->routers_by_mask_bit)       free(core->routers_by_mask_bit);
-    if (core->control_links_by_mask_bit) free(core->control_links_by_mask_bit);
-    if (core->data_links_by_mask_bit)    free(core->data_links_by_mask_bit);
-    if (core->neighbor_free_mask)        qd_bitmask_free(core->neighbor_free_mask);
-    if (core->rnode_conns_by_mask_bit)   free(core->rnode_conns_by_mask_bit);
-
     free(core);
 }
 

tests/lsan.supp

@@ -33,23 +33,11 @@ leak:^pni_init_default_logger$
 # DISPATCH-1844 - shutdown leak
 leak:sys_mutex
 
-# expected, not a bug:
-#
-#leak:qdr_core_subscribe
-
 # Ubuntu 16.04 (Xenial)
 #
 leak:_ctypes_alloc_format_string
 leak:__strdup
 
-# to be triaged; system_tests_http
-leak:^callback_healthz$
-leak:^callback_metrics$
-
-# to be triaged; system_tests_http1_adaptor
-leak:^pn_condition$
-leak:^pn_raw_connection$
-
 ####
 #### Miscellaneous 3rd party libraries:
 ####