Added a new flag, -embeddedServerPort

Author: chrjo5

SimulationRuntime/c/simulation/solver/embedded_server.c

@@ -42,7 +42,7 @@
 #define DLL_EXT ".so"
 #endif
 
-void* no_embedded_server_init(DATA *data, double tout, double step, const char *argv_0, void (*omc_real_time_sync_update)(DATA *data, double scaling))
+void* no_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)
 {
   return NULL;
 }
@@ -55,7 +55,7 @@ void 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)) = no_embedded_server_init;
+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 (*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

SimulationRuntime/c/simulation/solver/embedded_server.h

@@ -37,7 +37,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));
+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 (*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

@@ -694,7 +694,18 @@ int solver_main(DATA* data, threadData_t *threadData, const char* init_initMetho
 #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);
+  int port = 4841;
+  /* If an embedded server is specified */
+  if (dllHandle != NULL) {
+    if (omc_flag[FLAG_EMBEDDED_SERVER_PORT]) {
+      port = atoi(omc_flagValue[FLAG_EMBEDDED_SERVER_PORT]);
+      /* In case of a bad conversion, don't spawn a server on port 0...*/
+      if (port == 0) {
+        port = 4841;
+      }
+    }
+  }
+  data->embeddedServerState = embedded_server_init(data, data->localData[0]->timeValue, solverInfo.currentStepSize, argv_0, omc_real_time_sync_update, port);
 #endif
   if(0 == retVal) {
     retVal = -1;

SimulationRuntime/c/util/simulation_options.c

@@ -42,6 +42,7 @@ const char *FLAG_NAME[FLAG_MAX+1] = {
   /* FLAG_DELTA_X_LINEARIZE */     "deltaXLinearize",
   /* FLAG_DELTA_X_SOLVER */        "deltaXSolver",
   /* FLAG_EMBEDDED_SERVER */       "embeddedServer",
+  /* FLAG_EMBEDDED_SERVER_PORT */  "embeddedServerPort",
   /* FLAG_EMIT_PROTECTED */        "emit_protected",
   /* FLAG_F */                     "f",
   /* FLAG_HELP */                  "help",
@@ -129,6 +130,7 @@ const char *FLAG_DESC[FLAG_MAX+1] = {
   /* FLAG_DELTA_X_LINEARIZE */     "value specifies the delta x value for numerical differentiation used by linearization. The default value is 1e-5.",
   /* FLAG_DELTA_X_SOLVER */        "value specifies the delta x value for numerical differentiation used by integrator. The default values is sqrt(DBL_EPSILON).",
   /* FLAG_EMBEDDED_SERVER */       "enables an embedded server. Valid values: none, opc-da [broken], opc-ua [experimental], or the path to a shared object.",
+  /* FLAG_EMBEDDED_SERVER_PORT */  "[int (default 4841)] value specifies the port number used by the embedded server",
   /* FLAG_EMIT_PROTECTED */        "emits protected variables to the result-file",
   /* FLAG_F */                     "value specifies a new setup XML file to the generated simulation code",
   /* FLAG_HELP */                  "get detailed information that specifies the command-line flag",
@@ -231,6 +233,8 @@ const char *FLAG_DETAILED_DESC[FLAG_MAX+1] = {
   "  * opc-da - [broken] run with embedded OPC DA server (WIN32 only, uses proprietary OPC SC interface)\n"
   "  * opc-ua - [experimental] run with embedded OPC UA server (TCP port 4841 for now; will have its own configuration option later)\n"
   "  * filename - path to a shared object implementing the embedded server interface (requires access to internal OMC data-structures if you want to read or write data)",
+  /* FLAG_EMBEDDED_SERVER_PORT */
+  "  Value specifies the port number used by the embedded server. The default value is 4841.",
   /* FLAG_EMIT_PROTECTED */
   "  Emits protected variables to the result-file.",
   /* FLAG_F */
@@ -444,6 +448,7 @@ const int FLAG_TYPE[FLAG_MAX] = {
   /* FLAG_DELTA_X_LINEARIZE */     FLAG_TYPE_OPTION,
   /* FLAG_DELTA_X_SOLVER */        FLAG_TYPE_OPTION,
   /* FLAG_EMBEDDED_SERVER */       FLAG_TYPE_OPTION,
+  /* FLAG_EMBEDDED_SERVER_PORT */  FLAG_TYPE_OPTION,
   /* FLAG_EMIT_PROTECTED */        FLAG_TYPE_FLAG,
   /* FLAG_F */                     FLAG_TYPE_OPTION,
   /* FLAG_HELP */                  FLAG_TYPE_OPTION,

SimulationRuntime/c/util/simulation_options.h

@@ -50,6 +50,7 @@ enum _FLAG
   FLAG_DELTA_X_LINEARIZE,
   FLAG_DELTA_X_SOLVER,
   FLAG_EMBEDDED_SERVER,
+  FLAG_EMBEDDED_SERVER_PORT,
   FLAG_EMIT_PROTECTED,
   FLAG_F,
   FLAG_HELP,

SimulationRuntime/opc/ua/omc_opc_ua.c

@@ -448,14 +448,14 @@ static inline omc_opc_ua_state* addAliasVars(omc_opc_ua_state *state, var_kind_t
   }
   return state;
 }
-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))
+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)
 {
   MODEL_DATA *modelData = data->modelData;
   omc_opc_ua_state *state = (omc_opc_ua_state*) malloc(sizeof(omc_opc_ua_state));
   UA_ServerConfig config = UA_ServerConfig_standard;
   var_kind_t vk;
   state->logger = Logger_Stdout;
-  state->nl = UA_ServerNetworkLayerTCP(UA_ConnectionConfig_standard, 4841);
+  state->nl = UA_ServerNetworkLayerTCP(UA_ConnectionConfig_standard, port);
   config.logger = Logger_Stdout;
   config.networkLayers = &state->nl;
   config.networkLayersSize = 1;

SimulationRuntime/opc/ua/omc_opc_ua.h

@@ -47,7 +47,7 @@
   #endif
 #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));
+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_embedded_server_deinit(void*);
 OPC_UA_EXPORT void omc_embedded_server_update(void*, double t);