Changeset e1dbd879 in OpenModelica

Timestamp:

2022-05-16T11:15:56+02:00 (2 years ago)

Author:

Philip Hannebohm <phannebohm@…>

Children:

14ac561

Parents:

5b747e9

git-author:

Philip Hannebohm <phannebohm@…> (05/16/22 10:46:52)

git-committer:

Philip Hannebohm <phannebohm@…> (05/16/22 11:15:56)

Message:

Fix array management

File:

• OMCompiler/SimulationRuntime/c/simulation/solver/events.c (modified) (5 diffs)

OMCompiler/SimulationRuntime/c/simulation/solver/events.c

@@ -299 +299 @@
   static LIST tmpEventList = (LIST){NULL, NULL, sizeof(long), 0};
 
-  /* FIXME stop allocating all the time */
-  double *states_right = (double*) malloc(data->modelData->nStates * sizeof(double));
-  double *states_left = (double*) malloc(data->modelData->nStates * sizeof(double));
+  /* static work arrays */
+  static double *states_left = NULL;
+  static double *states_right = NULL;
 
   double time_left = data->simulationInfo->timeValueOld;
   double time_right = data->localData[0]->timeValue;
 
-  assert(states_right);
-  assert(states_left);
-
-  for(it=listFirstNode(eventList); it; it=listNextNode(it))
-  {
-    infoStreamPrint(LOG_ZEROCROSSINGS, 0, "search for current event. Events in list: %ld", *((long*)listNodeData(it)));
+  /* allocate memory once at first call, never free */
+  if(!states_left)
+  {
+    states_left = (double*) malloc(data->modelData->nStates * sizeof(double));
+    assertStreamPrint(NULL, NULL != states_left, "out of memory");
+  }
+  if(!states_right)
+  {
+    states_right = (double*) malloc(data->modelData->nStates * sizeof(double));
+    assertStreamPrint(NULL, NULL != states_right, "out of memory");
   }
 
@@ -317 +321 @@
   memcpy(states_left,  data->simulationInfo->realVarsOld, data->modelData->nStates * sizeof(double));
   memcpy(states_right, data->localData[0]->realVars     , data->modelData->nStates * sizeof(double));
+
+  for(it=listFirstNode(eventList); it; it=listNextNode(it))
+  {
+    infoStreamPrint(LOG_ZEROCROSSINGS, 0, "search for current event. Events in list: %ld", *((long*)listNodeData(it)));
+  }
 
   /* Search for event time and event_id with bisection method */
@@ -349 +358 @@
   while(listLen(&tmpEventList) > 0)
   {
+    /* TODO do this directly w/o free-malloc */
     long event_id = *((long*)listFirstData(&tmpEventList));
     listPopFront(&tmpEventList);
@@ -359 +369 @@
 
   data->localData[0]->timeValue = time_left;
-  for(i=0; i < data->modelData->nStates; i++) {
-    data->localData[0]->realVars[i] = states_left[i];
-  }
+  memcpy(data->localData[0]->realVars, states_left, data->modelData->nStates * sizeof(double));
 
   /* determined continuous system */
@@ -369 +377 @@
 
   data->localData[0]->timeValue = time_right;
-  for(i=0; i < data->modelData->nStates; i++)
-  {
-    data->localData[0]->realVars[i] = states_right[i];
-  }
-
-  free(states_left);
-  free(states_right);
+  memcpy(data->localData[0]->realVars, states_right, data->modelData->nStates * sizeof(double));
 
   TRACE_POP