Clear the extra memory pools on each iteration

https://trac.openmodelica.org/OpenModelica/ticket/5406

Belonging to [master]:
  - #3022

Author: sjoelund

SimulationRuntime/c/gc/memory_pool.c

@@ -61,10 +61,10 @@ static list *memory_pools = NULL;
 
 static void pool_init(void)
 {
-  memory_pools = (list*) malloc(sizeof(list));
+  memory_pools = (list*) omc_alloc_interface.malloc_uncollectable(sizeof(list));
   memory_pools->used = 0;
   memory_pools->size = 2*1024*1024; /* 2MB pool by default */
-  memory_pools->memory = malloc(memory_pools->size);
+  memory_pools->memory = omc_alloc_interface.malloc_uncollectable(memory_pools->size);
   memory_pools->next = NULL;
 }
 
@@ -95,12 +95,12 @@ static inline void pool_expand(size_t len)
   if (memory_pools->size - memory_pools->used >= len) {
     return;
   }
-  newlist = (list*) malloc(sizeof(list));
+  newlist = (list*) omc_alloc_interface.malloc_uncollectable(sizeof(list));
   newlist->next = memory_pools;
   memory_pools = newlist;
   memory_pools->used = 0;
   memory_pools->size = upper_power_of_two(3*memory_pools->next->size/2 + len); /* expand by 1.5x the old memory pool. More if we request a very large array. */
-  memory_pools->memory = malloc(memory_pools->size);
+  memory_pools->memory = omc_alloc_interface.malloc_uncollectable(memory_pools->size);
 }
 
 static void* pool_malloc(size_t sz)
@@ -120,20 +120,30 @@ static void* pool_malloc(size_t sz)
   return res;
 }
 
-static int pool_free(void)
+static int pool_free_extra_list(void)
 {
   list *freelist = memory_pools->next;
   while (freelist) {
     list *next = freelist->next;
-    free(freelist->memory);
-    free(freelist);
+    omc_alloc_interface.free_uncollectable(freelist->memory);
+    omc_alloc_interface.free_uncollectable(freelist);
     freelist = next;
   }
   memory_pools->used = 0;
   memory_pools->next = 0;
   return 0;
 }
 
+void free_memory_pool()
+{
+  pool_free_extra_list();
+  if (memory_pools) {
+    omc_alloc_interface.free_uncollectable(memory_pools->memory);
+    omc_alloc_interface.free_uncollectable(memory_pools);
+    memory_pools = NULL;
+  }
+}
+
 static void nofree(void* ptr)
 {
 }
@@ -148,7 +158,7 @@ omc_alloc_interface_t omc_alloc_interface_pooled = {
   pool_malloc,
   (char*(*)(size_t)) malloc,
   strdup,
-  pool_free,
+  pool_free_extra_list,
   malloc_zero,
   free,
   malloc,
@@ -215,7 +225,7 @@ omc_alloc_interface_t omc_alloc_interface = {
   pool_malloc,
   (char*(*)(size_t)) malloc,
   strdup,
-  pool_free,
+  pool_free_extra_list,
   malloc_zero /* calloc, but with malloc interface */,
   free,
   malloc,

SimulationRuntime/c/gc/memory_pool.h

@@ -48,6 +48,8 @@ extern _index_t** index_alloc(int n);
 
 void* generic_alloc(int n, size_t sze);
 
+void free_memory_pool();
+
 #if defined(__cplusplus)
 } /* end extern "C" */
 #endif

SimulationRuntime/fmi/export/openmodelica/fmu2_model_interface.c.inc

@@ -193,6 +193,8 @@ static inline void resetThreadData(ModelInstance* comp)
   if (comp->threadDataParent) {
     pthread_setspecific(mmc_thread_data_key, comp->threadDataParent);
   }
+  /* Clear the extra memory pools */
+  omc_alloc_interface.collect_a_little();
 }
 
 static inline void setThreadData(ModelInstance* comp)
@@ -362,23 +364,23 @@ fmi2Component fmi2Instantiate(fmi2String instanceName, fmi2Type fmuType, fmi2Str
   * The problem is that we might overwrite the main simulation's copy of the interface...
   */
   threadData_t *threadDataParent = (threadData_t*) pthread_getspecific(mmc_thread_data_key);
-  if (0==threadDataParent) {
-    /* We can only disable GC if the parent is not OM */
-    omc_alloc_interface = omc_alloc_interface_pooled;
-  }
-  mmc_init_nogc();
-  omc_alloc_interface.init();
-
-  // ignoring arguments: fmuResourceLocation, visible
   ModelInstance *comp;
   if (!functions->logger) {
     return NULL;
   }
-
   if (!functions->allocateMemory || !functions->freeMemory) {
     functions->logger(functions->componentEnvironment, instanceName, fmi2Error, "error", "fmi2Instantiate: Missing callback function.");
     return NULL;
   }
+  if (0==threadDataParent) {
+    /* We can only disable GC if the parent is not OM */
+    omc_alloc_interface = omc_alloc_interface_pooled;
+    /* TODO: omc_alloc_interface.malloc_uncollectable = functions->allocateMemory; // Note that the interface is wrong. Should pass threadData to all allocations instead, and have the interface in there. */
+  }
+  mmc_init_nogc();
+  omc_alloc_interface.init();
+
+  // ignoring arguments: fmuResourceLocation, visible
   if (!instanceName || strlen(instanceName) == 0) {
     functions->logger(functions->componentEnvironment, instanceName, fmi2Error, "error", "fmi2Instantiate: Missing instance name.");
     return NULL;
@@ -544,6 +546,7 @@ void fmi2FreeInstance(fmi2Component c)
   if (comp->functions) comp->functions->freeMemory((void*)comp->functions);
   /* free comp */
   freeMemory(comp);
+  free_memory_pool();
 }
 
 fmi2Status fmi2SetupExperiment(fmi2Component c, fmi2Boolean toleranceDefined, fmi2Real tolerance, fmi2Real startTime, fmi2Boolean stopTimeDefined, fmi2Real stopTime)