Do not compile embedded server for source FMU

OpenModelica · Mar 24, 2016 · ffcb0f7 · ffcb0f7
1 parent b472093
commit ffcb0f7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -884,6 +884,7 @@ int _main_SimulationRuntime(int argc, char**argv, DATA *data, threadData_t *thre
   return retVal;
 }
 
+#if !defined(OMC_MINIMAL_RUNTIME)
 const char* prettyPrintNanoSec(int64_t ns, int *v)
 {
   if (ns > 100000000000L || ns < -100000000000L) {
@@ -900,5 +901,6 @@ const char* prettyPrintNanoSec(int64_t ns, int *v)
     return "ns";
   }
 }
+#endif
 
 } // extern "C"
diff --git a/SimulationRuntime/c/simulation/simulation_runtime.h b/SimulationRuntime/c/simulation/simulation_runtime.h
@@ -82,8 +82,9 @@ extern void communicateMsg(char id, unsigned int size, const char *data);
  */
 extern int _main_SimulationRuntime(int argc, char**argv, DATA *data, threadData_t *threadData);
 
-
+#if !defined(OMC_MINIMAL_RUNTIME)
 const char* prettyPrintNanoSec(int64_t ns, int *v);
+#endif
 
 #ifdef __cplusplus
 }

diff --git a/SimulationRuntime/c/simulation/solver/perform_simulation.c b/SimulationRuntime/c/simulation/solver/perform_simulation.c
@@ -49,8 +49,10 @@
 #include <float.h>
 
 #include "simulation/solver/synchronous.h"
+#if !defined(OMC_MINIMAL_RUNTIME)
 #include "simulation/solver/embedded_server.h"
 #include "simulation/solver/real_time_sync.h"
+#endif
 
 /*! \fn updateContinuousSystem
  *
@@ -216,6 +218,7 @@ static void fmtEmitStep(DATA* data, threadData_t *threadData, MEASURE_TIME* mt,
   if ((omc_flag[FLAG_NOEVENTEMIT] && didEventStep == 0) || !omc_flag[FLAG_NOEVENTEMIT]) {
     sim_result.emit(&sim_result, data, threadData);
   }
+#if !defined(OMC_MINIMAL_RUNTIME)
   embedded_server_update(data->embeddedServerState, data->localData[0]->timeValue);
   if (data->real_time_sync.enabled) {
     double time = data->localData[0]->timeValue;
@@ -233,6 +236,7 @@ static void fmtEmitStep(DATA* data, threadData_t *threadData, MEASURE_TIME* mt,
   }
 
   printAllVarsDebug(data, 0, LOG_DEBUG);  /* ??? */
+#endif
 }
 
 static void fmtClose(MEASURE_TIME* mt)

diff --git a/SimulationRuntime/c/simulation/solver/solver_main.c b/SimulationRuntime/c/simulation/solver/solver_main.c
@@ -51,8 +51,10 @@
 #include "simulation/solver/epsilon.h"
 #include "linearSystem.h"
 #include "sym_imp_euler.h"
+#if !defined(OMC_MINIMAL_RUNTIME)
 #include "simulation/solver/embedded_server.h"
 #include "simulation/solver/real_time_sync.h"
+#endif
 
 #include "optimization/OptimizerInterface.h"
 
@@ -658,10 +660,11 @@ int solver_main(DATA* data, threadData_t *threadData, const char* init_initMetho
   }
   omc_alloc_interface.collect_a_little();
 
+#if !defined(OMC_MINIMAL_RUNTIME)
   dllHandle = embedded_server_load_functions(omc_flagValue[FLAG_EMBEDDED_SERVER]);
   omc_real_time_sync_init(threadData, data);
   data->embeddedServerState = embedded_server_init(data, data->localData[0]->timeValue, solverInfo.currentStepSize, argv_0, omc_real_time_sync_update);
-
+#endif
   if(0 == retVal) {
     /* if the model has no time changing variables skip the main loop*/
     if(data->modelData->nVariablesReal == 0    &&
@@ -719,9 +722,10 @@ int solver_main(DATA* data, threadData_t *threadData, const char* init_initMetho
     const char *unit = prettyPrintNanoSec(data->real_time_sync.maxLate, &tMaxLate);
     infoStreamPrint(LOG_RT, 0, "Maximum real-time latency was (positive=missed dealine, negative is slack): %d %s", tMaxLate, unit);
   }
+#if !defined(OMC_MINIMAL_RUNTIME)
   embedded_server_deinit(data->embeddedServerState);
   embedded_server_unload_functions(dllHandle);
-
+#endif
   /* free SolverInfo memory */
   freeSolverData(data, &solverInfo);