[FIXED] microservice cleanup (flapping MicroServiceStops... tests)

examples/micro-sequence.c

@@ -139,7 +139,7 @@ static microError *handle_sequence(microRequest *req)
         result_len = snprintf(result, sizeof(result), "%Lf", value);
     if (err == NULL)
         err = microRequest_Respond(req, result, result_len);
-    
+
     microArgs_Destroy(args);
     return err;
 }

src/conn.c

@@ -204,7 +204,9 @@ _freeConn(natsConnection *nc)
     natsStrHash_Destroy(nc->respMap);
     natsCondition_Destroy(nc->reconnectCond);
     natsMutex_Destroy(nc->subsMu);
+    natsMutex_Destroy(nc->servicesMu);
     natsMutex_Destroy(nc->mu);
+    NATS_FREE(nc->services);
 
     NATS_FREE(nc);
 
@@ -3238,6 +3240,8 @@ natsConn_create(natsConnection **newConn, natsOptions *options)
     s = natsMutex_Create(&(nc->mu));
     if (s == NATS_OK)
         s = natsMutex_Create(&(nc->subsMu));
+    if (s == NATS_OK)
+        s = natsMutex_Create(&(nc->servicesMu));
     if (s == NATS_OK)
         s = _setupServerPool(nc);
     if (s == NATS_OK)

src/glib/glib.c

@@ -119,8 +119,6 @@ _freeLib(void)
     nats_freeDispatcherPool(&gLib.replyDispatchers);
 
     natsNUID_free();
-    natsMutex_Destroy(gLib.service_callback_mu);
-    natsHash_Destroy(gLib.all_services_to_callback);
 
     natsCondition_Destroy(gLib.cond);
 
@@ -290,11 +288,6 @@ nats_openLib(natsClientConfig *config)
     if (s == NATS_OK)
         s = nats_initDispatcherPool(&(gLib.replyDispatchers), config->ReplyThreadPoolMax);
 
-    if (s == NATS_OK)
-        s = natsMutex_Create(&gLib.service_callback_mu);
-    if (s == NATS_OK)
-        s = natsHash_Create(&gLib.all_services_to_callback, 8);
-
     if (s == NATS_OK)
         gLib.initialized = true;
 
@@ -443,40 +436,6 @@ void nats_ReleaseThreadMemory(void)
     natsMutex_Unlock(gLib.lock);
 }
 
-natsStatus
-natsLib_startServiceCallbacks(microService *m)
-{
-    natsStatus s;
-
-    natsMutex_Lock(gLib.service_callback_mu);
-    s = natsHash_Set(gLib.all_services_to_callback, (int64_t)m, (void *)m, NULL);
-    natsMutex_Unlock(gLib.service_callback_mu);
-
-    return NATS_UPDATE_ERR_STACK(s);
-}
-
-void natsLib_stopServiceCallbacks(microService *m)
-{
-    if (m == NULL)
-        return;
-
-    natsMutex_Lock(gLib.service_callback_mu);
-    natsHash_Remove(gLib.all_services_to_callback, (int64_t)m);
-    natsMutex_Unlock(gLib.service_callback_mu);
-}
-
-natsMutex *
-natsLib_getServiceCallbackMutex(void)
-{
-    return gLib.service_callback_mu;
-}
-
-natsHash *
-natsLib_getAllServicesToCallback(void)
-{
-    return gLib.all_services_to_callback;
-}
-
 natsClientConfig *nats_testInspectClientConfig(void)
 {
     // Immutable after startup

src/glib/glibp.h

@@ -117,11 +117,6 @@ typedef struct __natsLib
 
     natsGCList gc;
 
-    // For micro services code
-    natsMutex *service_callback_mu;
-    // uses `microService*` as the key and the value.
-    natsHash *all_services_to_callback;
-
 } natsLib;
 
 natsLib *nats_lib(void);