Changeset 19f4fb15 in OpenModelica

Timestamp:

2014-06-01T17:03:20+02:00 (10 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

2603d68

Parents:

bcc9fb24

Message:

#2706

• Fixed the FMU memmory allocation & free memory issues.

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@20915 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Location:

SimulationRuntime/fmi/export

Files:

• fmi1/fmu1_model_interface.c (modified) (7 diffs)
• fmi2/fmu2_model_interface.c (modified) (1 diff)

SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.c

@@ -109 +109 @@
 }
 
-fmiComponent fmiInstantiateModel(fmiString instanceName, fmiString GUID,
-    fmiCallbackFunctions functions, fmiBoolean loggingOn)
+fmiComponent fmiInstantiateModel(fmiString instanceName, fmiString GUID, fmiCallbackFunctions functions, fmiBoolean loggingOn)
 {
   ModelInstance* comp;
@@ -131 +130 @@
   comp = (ModelInstance *)functions.allocateMemory(1, sizeof(ModelInstance));
   if (comp) {
+    comp->instanceName = functions.allocateMemory(1 + strlen(instanceName), sizeof(char));
+    comp->GUID = functions.allocateMemory(1 + strlen(GUID), sizeof(char));
     DATA* fmudata = (DATA *)functions.allocateMemory(1, sizeof(DATA));
     threadData_t *threadData = (threadData_t *)functions.allocateMemory(1, sizeof(threadData));
@@ -140 +141 @@
       return NULL;
     }
-  }else{
-    functions.logger(NULL, instanceName, fmiError, "error",
-        "fmiInstantiateModel: Out of memory.");
+  }
+  if (!comp || !comp->instanceName || !comp->GUID) {
+    functions.logger(NULL, instanceName, fmiError, "error", "fmiInstantiateModel: Out of memory.");
     return NULL;
   }
@@ -158 +159 @@
   modelInfoXmlInit(&(comp->fmuData->modelData.modelDataXml));
 
-  comp->instanceName = instanceName;
-  comp->GUID = GUID;
+  strcpy(comp->instanceName, instanceName);
+  strcpy(comp->GUID, GUID);
   comp->functions = functions;
   comp->loggingOn = loggingOn;
@@ -184 +185 @@
   if (comp->loggingOn) comp->functions.logger(c, comp->instanceName, fmiOK, "log",
       "fmiFreeModelInstance");
+
+  /* free instanceName & GUID */
+  if (comp->instanceName) comp->functions.freeMemory(comp->instanceName);
+  if (comp->GUID) comp->functions.freeMemory(comp->GUID);
+  /* free comp */
   comp->functions.freeMemory(comp);
 }
@@ -769 +775 @@
       "fmiTerminate");
 
+  comp->state = modelTerminated;
   /* deinitDelay(comp->fmuData); */
   comp->fmuData->callback->callExternalObjectDestructors(comp->fmuData);
@@ -780 +787 @@
   freeStateSetData(comp->fmuData);
   deInitializeDataStruc(comp->fmuData);
+  comp->functions.freeMemory(comp->fmuData->threadData);
   comp->functions.freeMemory(comp->fmuData);
 

SimulationRuntime/fmi/export/fmi2/fmu2_model_interface.c

@@ -195 +195 @@
     }
   }
-  if (!comp || !comp->instanceName || !comp->GUID || !comp->fmuData) {
+  if (!comp || !comp->instanceName || !comp->GUID) {
     functions->logger(functions->componentEnvironment, instanceName, fmiError, "error", "fmiInstantiate: Out of memory.");
     return NULL;