fix crashes in omccAPI if threadData is allocated in the heap

adrpo · OpenModelica-Hudson · commit 51635434768a · 2018-02-16T22:49:17.000+01:00
- hide threadData again - set threadData and then copy it after each call Belonging to [master]: - #2216
diff --git a/SimulationRuntime/c/meta/meta_modelica_data.h b/SimulationRuntime/c/meta/meta_modelica_data.h
@@ -250,6 +250,9 @@ void mmc_catch_dummy_fn();
 #define MMC_ELSE() } else { threadData->mmc_jumper = old_jumper;
 
 #define MMC_TRY_TOP() { threadData_t threadDataOnStack = {0}, *oldThreadData = (threadData_t*)pthread_getspecific(mmc_thread_data_key),*threadData = &threadDataOnStack; pthread_setspecific(mmc_thread_data_key,threadData); pthread_mutex_init(&threadData->parentMutex,NULL); mmc_init_stackoverflow(threadData); MMC_TRY_INTERNAL(mmc_jumper) threadData->mmc_stack_overflow_jumper = threadData->mmc_jumper; /* Let the default stack overflow handler be the top-level handler */
+
+#define MMC_TRY_TOP_SET(X) { threadData_t threadDataOnStack = *((threadData_t*)X), *oldThreadData = (threadData_t*)pthread_getspecific(mmc_thread_data_key),*threadData = &threadDataOnStack; pthread_setspecific(mmc_thread_data_key,threadData); pthread_mutex_init(&threadData->parentMutex,NULL); mmc_init_stackoverflow(threadData); MMC_TRY_INTERNAL(mmc_jumper) threadData->mmc_stack_overflow_jumper = threadData->mmc_jumper; /* Let the default stack overflow handler be the top-level handler */
+
 #define MMC_TRY_TOP_INTERNAL() { threadData_t *oldThreadData = (threadData_t*)pthread_getspecific(mmc_thread_data_key); pthread_setspecific(mmc_thread_data_key,threadData); pthread_mutex_init(&threadData->parentMutex,NULL); mmc_init_stackoverflow(threadData); MMC_TRY_INTERNAL(mmc_jumper) threadData->mmc_stack_overflow_jumper = threadData->mmc_jumper;
 #define MMC_CATCH_TOP(X) pthread_setspecific(mmc_thread_data_key,oldThreadData); } else {pthread_setspecific(mmc_thread_data_key,oldThreadData);X;}}}
 
diff --git a/SimulationRuntime/cpp/Core/ReduceDAE/com/ModelicaCompiler.cpp b/SimulationRuntime/cpp/Core/ReduceDAE/com/ModelicaCompiler.cpp
@@ -33,7 +33,7 @@ _model(model)
   std::cout << "Intialize OMC, use gcc" << std::endl;
 
 
-  status = InitOMC(&_omcPtr,"gcc",omhome, 1);
+  status = InitOMC(&_omcPtr,"gcc",omhome);
   if(status > 0)
   {
     std::cout << "..ok" << std::endl;
@@ -43,7 +43,7 @@ _model(model)
   {
     std::cout << "..failed" << std::endl;
     char* errorMsg = 0;
-    status = GetError(&_omcPtr, &errorMsg);
+    status = GetError(_omcPtr, &errorMsg);
     string errorMsgStr(errorMsg);
     throw std::runtime_error("error to intialize OMC: " + errorMsgStr);
   }
@@ -52,7 +52,7 @@ _model(model)
 
 ModelicaCompiler::~ModelicaCompiler(void)
 {
-
+   FreeOMC(_omcPtr);
 }
 
 void ModelicaCompiler::loadFile(bool load_file)
@@ -65,7 +65,7 @@ void ModelicaCompiler::loadFile(bool load_file)
   {
     //command="loadModel(Modelica)";
     command="loadModel(Modelica,{\"3.2.2\"})";
-    status=SendCommand(&_omcPtr,command.c_str(),&result);
+    status=SendCommand(_omcPtr,command.c_str(),&result);
     if(status>0)
       cout<<"load Modelica Library : "<< result<<std::endl;
     else
@@ -82,7 +82,7 @@ void ModelicaCompiler::loadFile(bool load_file)
   {
     //command="loadModel(Modelica)";
     command="loadModel(Modelica,{\"3.2.2\"})";
-    status=SendCommand(&_omcPtr,command.c_str(),&result);
+    status=SendCommand(_omcPtr,command.c_str(),&result);
 
     if(status>0)
       cout<<"load Modelica Library : "<< result<<std::endl;
@@ -101,7 +101,7 @@ void ModelicaCompiler::loadFile()
   char* result =0;
 
   command="loadModel(Modelica,{\"3.2.2\"})";
-  status = SendCommand(&_omcPtr, command.c_str(), &result);
+  status = SendCommand(_omcPtr, command.c_str(), &result);
 
   if(status>0)
     cout<<"load Modelica Library : "<< result<<std::endl;
@@ -131,7 +131,7 @@ void ModelicaCompiler::loadFile()
 
   cout << "PackageName : " << str << std::endl;
 
-  status=LoadFile(&_omcPtr,fileToLoad);
+  status=LoadFile(_omcPtr,fileToLoad);
   //status=LoadFile(_omcPtr,"package.mo");
 
   if(status>0)
@@ -141,7 +141,7 @@ void ModelicaCompiler::loadFile()
 
     std::cout << "failed to load "<<str << std::endl;
     char* errorMsg=0;
-    status = GetError(&_omcPtr,&errorMsg);
+    status = GetError(_omcPtr,&errorMsg);
     string errorMsgStr(errorMsg);
     throw std::runtime_error("error while loading file: " + str+" " + errorMsgStr);
   }
@@ -169,15 +169,15 @@ void ModelicaCompiler::generateLabeledSimCode(string reduction_method)
   //command.append(s);
   command.append(")");
   cout << command << std::endl;
-  int status = SendCommand(&_omcPtr, command.c_str(), &result);
+  int status = SendCommand(_omcPtr, command.c_str(), &result);
   if(status>0)
     cout<<"generated labeled simcode for: "<<_model<<" "<< result<<std::endl;
   else
   {
 
     std::cout << "..failed" << std::endl;
     char* errorMsg=0;
-    status = GetError(&_omcPtr, &errorMsg);
+    status = GetError(_omcPtr, &errorMsg);
 
     throw std::runtime_error("error while executing " + command+ " with error " + errorMsg);
   }
@@ -192,7 +192,7 @@ void ModelicaCompiler::generateReferenceSolution()
   command.append(_model);
   command.append(_model);
   command.append(")");
-  int status = SendCommand(&_omcPtr, command.c_str(), &result);
+  int status = SendCommand(_omcPtr, command.c_str(), &result);
 
   if(status>0)
     cout<<"generated reference solution for: "<<_model<<" "<< result<<std::endl;
@@ -201,7 +201,7 @@ void ModelicaCompiler::generateReferenceSolution()
 
     std::cout << "..failed" << std::endl;
     char* errorMsg = 0;
-    status = GetError(&_omcPtr, &errorMsg);
+    status = GetError(_omcPtr, &errorMsg);
 
     throw std::runtime_error("error while executing  " + command+ " with error " + errorMsg);
   }
@@ -243,15 +243,15 @@ void ModelicaCompiler::reduceTerms(std::vector<unsigned int>& labels, double sta
   //command.append(")");
 
   cout<<command<<std::endl;
-  status = SendCommand(&_omcPtr, command.c_str(), &result);
+  status = SendCommand(_omcPtr, command.c_str(), &result);
   if(status>0)
     cout<<"reduceTerms for: "<<_model<<" "<< result<<std::endl;
   else
   {
 
     std::cout << "..failed" << std::endl;
     char* errorMsg = 0;
-    status = GetError(&_omcPtr, &errorMsg);
+    status = GetError(_omcPtr, &errorMsg);
 
     throw std::runtime_error("error while executing " + command+ " with error " + errorMsg);
   }
@@ -271,15 +271,15 @@ void ModelicaCompiler::reduceTerms(std::vector<unsigned int>& labels, double sta
   command.append(",startTime=0.0,stopTime = 20.0)");
 
   cout<<command<<std::endl;
-  status=SendCommand(&_omcPtr,command.c_str(),&result);
+  status=SendCommand(_omcPtr,command.c_str(),&result);
   if(status>0)
     cout<<"simulation for reduced model: "<<_model<<" "<< result<<std::endl;
   else
   {
 
     std::cout << "simulation for reduced model failed" << std::endl;
     char* errorMsg=0;
-    status = GetError(&_omcPtr, &errorMsg);
+    status = GetError(_omcPtr, &errorMsg);
 
     throw std::runtime_error("error while executing " + command+ " with error " + errorMsg);
   }
diff --git a/SimulationRuntime/cpp/Include/Core/ReduceDAE/com/ModelicaCompiler.h b/SimulationRuntime/cpp/Include/Core/ReduceDAE/com/ModelicaCompiler.h
@@ -17,6 +17,6 @@ class ModelicaCompiler
   string _model;
   string _model_path;
   string _file_name;
-  OMCData _omcPtr;
+  OMCData* _omcPtr;
   bool _load_package;
 };
diff --git a/SimulationRuntime/cpp/omcCAPI/include/OMC.h b/SimulationRuntime/cpp/omcCAPI/include/OMC.h
@@ -6,27 +6,18 @@
 
 #include "OMCAPI.h"
 
-/**
-Complete definition for OMCData
-*/
-OMC_DLL typedef struct OMCData
-{
-   OMCData(void *threadData);
-   ~OMCData();
-   void *threadData;
-} data;
-
-
 extern "C"
 {
+    OMC_DLL typedef struct OMCData data;
+
     void OMC_DLL InitMetaOMC();
     /**
     *  \brief Allocates and initializes OpenModelica compiler(omc) instance
     *  \param [in] compiler name of c++ compiler (gcc for mingw compiler, msvc10 for Visual Studio 2010 compiler,msvc12 for Visual Studio 2012 compiler ...)
     *  \param [out] omcPtr  pointer to allocated omc instance
     *  \return returns a status flag
     */
-   int OMC_DLL InitOMC(data* omcData, const char* compiler, const char* openModelicaHome, int initThreadData = 1);
+   int OMC_DLL InitOMC(data** omcDataPtr, const char* compiler, const char* openModelicaHome);
    /**
     *  \brief returns the version of the OpenModelica compiler (omc) instance
     *  \param [in] omcPtr Pointer to omc instance
diff --git a/SimulationRuntime/cpp/omcCAPI/src/OMC.cpp b/SimulationRuntime/cpp/omcCAPI/src/OMC.cpp
diff --git a/SimulationRuntime/cpp/omcCAPI/src/OMCTest.cpp b/SimulationRuntime/cpp/omcCAPI/src/OMCTest.cpp
