Start some cleanup

Signed-off-by: falkTX <falktx@falktx.com>

Author: falkTX

src/effects.c

@@ -4371,8 +4371,7 @@ int effects_init(void* client)
     INIT_LIST_HEAD(&g_rtsafe_list);
     INIT_LIST_HEAD(&g_raw_midi_port_list);
 
-    if (!rtsafe_memory_pool_create(&g_rtsafe_mem_pool, "mod-host", sizeof(postponed_event_list_data),
-                                   MAX_POSTPONED_EVENTS))
+    if (!rtsafe_memory_pool_create(&g_rtsafe_mem_pool, sizeof(postponed_event_list_data), MAX_POSTPONED_EVENTS))
     {
         fprintf(stderr, "can't allocate realtime-safe memory pool\n");
         if (client == NULL)
@@ -5211,7 +5210,6 @@ int effects_add(const char *uri, int instance, int activate)
     event_ports_count = 0;
     input_event_ports_count = 0;
     output_event_ports_count = 0;
-    worker_buf_size = 0;
     effect->presets_count = 0;
     effect->presets = NULL;
     effect->monitors_count = 0;

src/monitor/monitor-client.c

@@ -465,6 +465,7 @@ int jack_initialize(jack_client_t* client, const char* load_init)
     if (!mon->in_ports || !mon->out_ports)
     {
         fprintf(stderr, "out of memory\n");
+        free(mon);
         return 1;
     }
 

src/rtmempool/rtmempool.c

@@ -33,30 +33,17 @@ typedef struct list_head k_list_head;
 
 typedef struct _RtMemPool
 {
-    char name[RTSAFE_MEMORY_POOL_NAME_MAX];
-
-    size_t dataSize;
-    size_t maxPreallocated;
-
     k_list_head used;
-    unsigned int usedCount;
-
     k_list_head unused;
-    unsigned int unusedCount;
-
     pthread_mutex_t mutex;
-
 } RtMemPool;
 
 // ------------------------------------------------------------------------------------------------
 
 bool rtsafe_memory_pool_create(RtMemPool_Handle* handlePtr,
-                               const char* poolName,
                                size_t dataSize,
                                size_t maxPreallocated)
 {
-    assert(poolName == NULL || strlen(poolName) < RTSAFE_MEMORY_POOL_NAME_MAX);
-
     k_list_head* nodePtr;
     RtMemPool* poolPtr;
 
@@ -67,23 +54,8 @@ bool rtsafe_memory_pool_create(RtMemPool_Handle* handlePtr,
         return false;
     }
 
-    if (poolName != NULL)
-    {
-        strcpy(poolPtr->name, poolName);
-    }
-    else
-    {
-        sprintf(poolPtr->name, "%p", poolPtr);
-    }
-
-    poolPtr->dataSize = dataSize;
-    poolPtr->maxPreallocated = maxPreallocated;
-
     INIT_LIST_HEAD(&poolPtr->used);
-    poolPtr->usedCount = 0;
-
     INIT_LIST_HEAD(&poolPtr->unused);
-    poolPtr->unusedCount = 0;
 
     pthread_mutexattr_t atts;
     pthread_mutexattr_init(&atts);
@@ -93,17 +65,16 @@ bool rtsafe_memory_pool_create(RtMemPool_Handle* handlePtr,
     pthread_mutex_init(&poolPtr->mutex, &atts);
     pthread_mutexattr_destroy(&atts);
 
-    while (poolPtr->unusedCount < poolPtr->maxPreallocated)
+    for (unsigned int unusedCount = 0; unusedCount < maxPreallocated; unusedCount++)
     {
-        nodePtr = malloc(sizeof(k_list_head) + poolPtr->dataSize);
+        nodePtr = malloc(sizeof(k_list_head) + dataSize);
 
         if (nodePtr == NULL)
         {
             break;
         }
 
         list_add_tail(nodePtr, &poolPtr->unused);
-        poolPtr->unusedCount++;
     }
 
     *handlePtr = (RtMemPool_Handle)poolPtr;
@@ -120,21 +91,10 @@ void rtsafe_memory_pool_destroy(RtMemPool_Handle handle)
     k_list_head* nodePtr;
     RtMemPool* poolPtr = (RtMemPool*)handle;
 
-    // caller should deallocate all chunks prior releasing pool itself
-    if (poolPtr->usedCount != 0)
-    {
-        assert(0);
-    }
-
-    while (poolPtr->unusedCount != 0)
+    while (! list_empty(&poolPtr->unused))
     {
-        assert(! list_empty(&poolPtr->unused));
-
         nodePtr = poolPtr->unused.next;
-
         list_del(nodePtr);
-        poolPtr->unusedCount--;
-
         free(nodePtr);
     }
 
@@ -166,9 +126,6 @@ void* rtsafe_memory_pool_allocate_atomic(RtMemPool_Handle handle)
     nodePtr = poolPtr->unused.next;
     list_del(nodePtr);
 
-    poolPtr->unusedCount--;
-    poolPtr->usedCount++;
-
     list_add_tail(nodePtr, &poolPtr->used);
 
     pthread_mutex_unlock(&poolPtr->mutex);
@@ -189,8 +146,6 @@ void rtsafe_memory_pool_deallocate(RtMemPool_Handle handle, void* memoryPtr)
 
     list_del((k_list_head*)memoryPtr - 1);
     list_add_tail((k_list_head*)memoryPtr - 1, &poolPtr->unused);
-    poolPtr->usedCount--;
-    poolPtr->unusedCount++;
 
     pthread_mutex_unlock(&poolPtr->mutex);
 }

src/rtmempool/rtmempool.h

@@ -46,7 +46,6 @@ typedef void* RtMemPool_Handle;
  * @return Success status, true if successful
  */
 bool rtsafe_memory_pool_create(RtMemPool_Handle* handlePtr,
-                               const char* poolName,
                                size_t dataSize,
                                size_t maxPreallocated);