Output the information when opc-ua server is initialized.

Author: adeas31

SimulationRuntime/c/simulation/solver/embedded_server.c

@@ -47,6 +47,10 @@ void* no_embedded_server_init(DATA *data, double tout, double step, const char *
   return NULL;
 }
 
+void no_wait_for_step(void *handle)
+{
+}
+
 void no_embedded_server_deinit(void *handle)
 {
 }
@@ -57,14 +61,15 @@ int no_embedded_server_update(void *handle, double tout)
 }
 
 void* (*embedded_server_init)(DATA *data, double tout, double step, const char *argv_0, void (*omc_real_time_sync_update)(DATA *data, double scaling), int port) = no_embedded_server_init;
+void (*wait_for_step)(void*) = no_wait_for_step;
 void (*embedded_server_deinit)(void*) = no_embedded_server_deinit;
 // Tells the embedded server that a simulation step has passed; the server
 // can read/write values from/to the simulator
 int (*embedded_server_update)(void*, double tout) = no_embedded_server_update;
 
 void* embedded_server_load_functions(const char *server_name)
 {
-  void *dll, *funcInit, *funcDeinit, *funcUpdate;
+  void *dll, *funcInit, *funcWaitForStep, *funcDeinit, *funcUpdate;
   if (NULL==server_name || 0==strcmp("none", server_name)) {
     return NULL;
   }
@@ -88,20 +93,26 @@ void* embedded_server_load_functions(const char *server_name)
 
   funcInit = dlsym(dll, "omc_embedded_server_init");
   if (!funcInit) {
-    errorStreamPrint(LOG_DEBUG, 0, "Failed to load function opc_da_init: %s\n", dlerror());
+    errorStreamPrint(LOG_DEBUG, 0, "Failed to load function omc_embedded_server_init: %s\n", dlerror());
+    MMC_THROW();
+  }
+  funcWaitForStep = dlsym(dll, "omc_wait_for_step");
+  if (!funcWaitForStep) {
+    errorStreamPrint(LOG_DEBUG, 0, "Failed to load function omc_wait_for_step: %s\n", dlerror());
     MMC_THROW();
   }
   funcDeinit = dlsym(dll, "omc_embedded_server_deinit");
   if (!funcDeinit) {
-    errorStreamPrint(LOG_DEBUG, 0, "Failed to load function opc_da_deinit: %s\n", dlerror());
+    errorStreamPrint(LOG_DEBUG, 0, "Failed to load function omc_embedded_server_deinit: %s\n", dlerror());
     MMC_THROW();
   }
   funcUpdate = dlsym(dll, "omc_embedded_server_update");
   if (!funcUpdate) {
-    errorStreamPrint(LOG_DEBUG, 0, "Failed to load function opc_da_new_iteration: %s\n", dlerror());
+    errorStreamPrint(LOG_DEBUG, 0, "Failed to load function omc_embedded_server_update: %s\n", dlerror());
     MMC_THROW();
   }
   embedded_server_init = funcInit;
+  wait_for_step = funcWaitForStep;
   embedded_server_deinit = funcDeinit;
   embedded_server_update = funcUpdate;
   infoStreamPrint(LOG_DEBUG, 0, "Loaded embedded server");

SimulationRuntime/c/simulation/solver/embedded_server.h

@@ -38,6 +38,7 @@ extern "C" {
 #endif
 
 extern void* (*embedded_server_init)(DATA *data, double tout, double step, const char *argv_0, void (*omc_real_time_sync_update)(DATA *data, double scaling), int port);
+extern void (*wait_for_step)(void *handle);
 extern void (*embedded_server_deinit)(void *handle);
 /* Tells the embedded server that a simulation step has passed; the server
  * can read/write values from/to the simulator

SimulationRuntime/c/simulation/solver/solver_main.c

@@ -706,6 +706,8 @@ int solver_main(DATA* data, threadData_t *threadData, const char* init_initMetho
     }
   }
   data->embeddedServerState = embedded_server_init(data, data->localData[0]->timeValue, solverInfo.currentStepSize, argv_0, omc_real_time_sync_update, port);
+  infoStreamPrint(LOG_STDOUT, 0, "The embedded server is initialized.");
+  wait_for_step(data->embeddedServerState);
 #endif
   if(0 == retVal) {
     retVal = -1;

SimulationRuntime/opc/ua/omc_opc_ua.c

@@ -102,6 +102,11 @@ static void waitForStep(omc_opc_ua_state *state)
   }
 }
 
+void omc_wait_for_step(void *state_vp)
+{
+  waitForStep((omc_opc_ua_state*) state_vp);
+}
+
 static UA_StatusCode
 readBoolean(void *handle, const UA_NodeId nodeid, UA_Boolean sourceTimeStamp, const UA_NumericRange *range, UA_DataValue *dataValue)
 {
@@ -585,11 +590,6 @@ void* omc_embedded_server_init(DATA *data, double t, double step, const char *ar
 
   pthread_rwlock_unlock(&state->rwlock);
 
-  if (state) {
-    fprintf(stderr, "omc_embedded_server_init done, state=%p, server=%p. Pause run=%d step=%d\n", state, state->server, state->run, state->step);
-    waitForStep(state);
-  }
-
   return state;
 }
 

SimulationRuntime/opc/ua/omc_opc_ua.h

@@ -48,6 +48,7 @@
 #endif
 
 OPC_UA_EXPORT void* omc_embedded_server_init(DATA *data, double t, double step, const char *argv_0, void (*omc_real_time_sync_update)(DATA *data, double scaling), int port);
+OPC_UA_EXPORT void omc_wait_for_step(void*);
 OPC_UA_EXPORT void omc_embedded_server_deinit(void*);
 OPC_UA_EXPORT int omc_embedded_server_update(void*, double t);