Draft: Performance improvements

libs/util/src/win/libs.c

@@ -10,6 +10,7 @@
 
 #define _WINSOCKAPI_    // stops windows.h including winsock.h
 #include <windows.h>
+#include <shlwapi.h>
 
 #include "common/logging.h"
 #include "common/memory.h"
@@ -23,24 +24,12 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-McxStatus mcx_dll_load(DllHandle * handle, const char * dllPath) {
-    DllHandleCheck compValue;
-
-    wchar_t * wDllPath = mcx_string_to_widechar(dllPath);
-
-    * handle = LoadLibraryExW(wDllPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-    mcx_free(wDllPath);
-
-    compValue = (DllHandleCheck) * handle;
-    if (compValue <= HINSTANCE_ERROR) {
-        LPVOID lpMsgBuf;
-        DWORD err = GetLastError();
-
-        mcx_log(LOG_ERROR, "Util: Dll (%s) could not be loaded", dllPath);
-
-        switch (err) {
+static void print_last_error() {
+    LPVOID lpMsgBuf;
+    DWORD err = GetLastError();
+    switch (err) {
         case ERROR_BAD_EXE_FORMAT:
-            mcx_log(LOG_ERROR, "Util: There is a mismatch in bitness (32/64) between current Model.CONNECT Execution Engine and the dynamic library", dllPath);
+            mcx_log(LOG_ERROR, "Util: There is a mismatch in bitness (32/64) between current Model.CONNECT Execution Engine and the dynamic library");
             break;
         default:
             FormatMessage(
@@ -56,11 +45,62 @@ McxStatus mcx_dll_load(DllHandle * handle, const char * dllPath) {
             mcx_log(LOG_ERROR, "Util: Error %d: %s", err, lpMsgBuf);
             LocalFree(lpMsgBuf);
             break;
+    }
+}
+
+
+McxStatus mcx_dll_load(DllHandle * handle, const char * dllPath) {
+    DllHandleCheck compValue;
+
+    wchar_t * wDllPath = mcx_string_to_widechar(dllPath);
+
+    McxStatus retVal = RETURN_OK;
+
+    if (PathIsRelativeW(wDllPath)) {
+        wchar_t * wFullDllPath = NULL;
+        DWORD length = GetFullPathNameW(wDllPath, 0, NULL, NULL);
+        if (length == 0) {
+            mcx_log(LOG_ERROR, "Util: Error retrieving length of absolute path of Dll (%s)", dllPath);
+            print_last_error();
+            retVal = RETURN_ERROR;
+            goto relpath_cleanup;
+        }
+        wFullDllPath = (wchar_t *) mcx_malloc(sizeof(wchar_t) * length);
+        length = GetFullPathNameW(wDllPath, length, wFullDllPath, NULL);
+        if (length == 0) {
+            mcx_log(LOG_ERROR, "Util: Error creating absolute path for Dll (%s)", dllPath);
+            print_last_error();
+            retVal = RETURN_ERROR;
+            goto relpath_cleanup;
         }
-        return RETURN_ERROR;
+relpath_cleanup:
+        if (wDllPath) {
+            mcx_free(wDllPath);
+        }
+        if (retVal != RETURN_OK) {
+            goto cleanup;
+        }
+        wDllPath = wFullDllPath;
+    }
+
+    mcx_log(LOG_DEBUG, "Util: Loading Dll %S", wDllPath);
+
+    * handle = LoadLibraryExW(wDllPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+
+    compValue = (DllHandleCheck) * handle;
+    if (compValue <= HINSTANCE_ERROR) {
+        mcx_log(LOG_ERROR, "Util: Dll (%s) could not be loaded", dllPath);
+        print_last_error();
+        retVal = RETURN_ERROR;
+        goto cleanup;
+    }
+
+cleanup:
+    if (wDllPath) {
+        mcx_free(wDllPath);
     }
 
-    return RETURN_OK;
+    return retVal;
 }
 
 

libs/util/src/win/os.c

@@ -87,10 +87,25 @@ const char * mcx_os_get_errno_descr(int errnum) {
 
 int mcx_os_path_exists(const char * path) {
     int ret;
-    wchar_t * wPath = mcx_string_to_widechar(path);
+    char * absoluteNormalizedPath = NULL;
+    wchar_t * wPath = NULL;
+
+    absoluteNormalizedPath = mcx_os_path_normalize(path);
+    if (path && !absoluteNormalizedPath) {
+        mcx_log(LOG_ERROR, "Util: Could not convert path '%s' to a normalized absolute path", path);
+        return 0;
+    }
+
+    wPath = mcx_string_to_widechar(absoluteNormalizedPath);
+
+    if (absoluteNormalizedPath) {
+        mcx_free(absoluteNormalizedPath);
+    }
 
     ret = (_waccess(wPath, 0) != -1);
-    mcx_free(wPath);
+    if (wPath) {
+        mcx_free(wPath);
+    }
 
     return ret;
 }

mcx/mcx.c

@@ -316,14 +316,20 @@ McxStatus RunMCX(int argc, char *argv[]) {
         goto cleanup;
     }
 
+    mcx_signal_handler_set_function("ConfigSetupFromCmdLine");
     retVal = config->SetupFromCmdLine(config, argc, argv);
+    mcx_signal_handler_unset_function();
     if (retVal == RETURN_ERROR) {
         goto cleanup;
     }
 
+    mcx_signal_handler_set_function("SetupLogFiles");
     SetupLogFiles(config->logFile, config->writeAllLogFile);
+    mcx_signal_handler_unset_function();
     logInitialized = 1;
+    mcx_signal_handler_set_function("ConfigSetupFromEnvironment");
     retVal = config->SetupFromEnvironment(config);
+    mcx_signal_handler_unset_function();
     if (RETURN_OK != retVal) {
         mcx_log(LOG_INFO, "Setting up configuration from environment failed");
         retVal = RETURN_ERROR;
@@ -337,22 +343,28 @@ McxStatus RunMCX(int argc, char *argv[]) {
         goto cleanup;
     }
 
+    mcx_signal_handler_set_function("ReaderSetup");
     retVal = reader->Setup(reader, config->modelFile, config);
+    mcx_signal_handler_unset_function();
     if (retVal == RETURN_ERROR) {
         mcx_log(LOG_ERROR, "Input reader setup failed");
         retVal = RETURN_ERROR;
         goto cleanup;
     }
 
+    mcx_signal_handler_set_function("ReaderRead");
     mcxInput = reader->Read(reader, config->modelFile);
+    mcx_signal_handler_unset_function();
     if (!mcxInput) {
         mcx_log(LOG_ERROR, "Parsing of input file failed");
         retVal = RETURN_ERROR;
         goto cleanup;
     }
     element = (InputElement *) mcxInput;
 
+    mcx_signal_handler_set_function("ConfigSetupFromInput");
     retVal = config->SetupFromInput(config, mcxInput->config);
+    mcx_signal_handler_unset_function();
     if (RETURN_OK != retVal) {
         mcx_log(LOG_ERROR, "Setting up configuration from input file failed");
         retVal = RETURN_ERROR;
@@ -387,20 +399,26 @@ McxStatus RunMCX(int argc, char *argv[]) {
     mcx_cpu_time_get(&clock_read_begin);
     mcx_time_get(&time_read_begin);
 
+    mcx_signal_handler_set_function("TaskRead");
     retVal = task->Read(task, mcxInput->task);
+    mcx_signal_handler_unset_function();
     if (RETURN_OK != retVal) {
         retVal = RETURN_ERROR;
         goto cleanup;
     }
 
+    mcx_signal_handler_set_function("ModelRead");
     retVal = model->Read(model, mcxInput->model);
+    mcx_signal_handler_unset_function();
     if (RETURN_OK != retVal) {
         retVal = RETURN_ERROR;
         goto cleanup;
     }
 
     object_destroy(mcxInput);
+    mcx_signal_handler_set_function("ReaderCleanup");
     reader->Cleanup(reader);
+    mcx_signal_handler_unset_function();
     object_destroy(reader);
 
     mcx_cpu_time_get(&clock_read_end);
@@ -421,19 +439,25 @@ McxStatus RunMCX(int argc, char *argv[]) {
     mcx_cpu_time_get(&clock_setup_begin);
     mcx_time_get(&time_setup_begin);
 
+    mcx_signal_handler_set_function("TaskSetup");
     retVal = task->Setup(task, model);
+    mcx_signal_handler_unset_function();
     if (RETURN_OK != retVal) {
         retVal = RETURN_ERROR;
         goto cleanup;
     }
 
+    mcx_signal_handler_set_function("ModelSetup");
     retVal = model->Setup(model);
+    mcx_signal_handler_unset_function();
     if (RETURN_OK != retVal) {
         retVal = RETURN_ERROR;
         goto cleanup;
     }
 
+    mcx_signal_handler_set_function("TaskPrepareRun");
     retVal = task->PrepareRun(task, model);
+    mcx_signal_handler_unset_function();
     if (RETURN_OK != retVal) {
         retVal = RETURN_ERROR;
         goto cleanup;
@@ -457,7 +481,9 @@ McxStatus RunMCX(int argc, char *argv[]) {
     mcx_cpu_time_get(&clock_init_begin);
     mcx_time_get(&time_init_begin);
 
+    mcx_signal_handler_set_function("TaskInitialize");
     retVal = task->Initialize(task, model);
+    mcx_signal_handler_unset_function();
     if (RETURN_OK != retVal) {
         retVal = RETURN_ERROR;
         goto cleanup;
@@ -481,7 +507,9 @@ McxStatus RunMCX(int argc, char *argv[]) {
     mcx_log(LOG_INFO, " ");
     mcx_cpu_time_get(&clock_sim_begin);
     mcx_time_get(&time_sim_begin);
+    mcx_signal_handler_set_function("TaskRun");
     retVal = task->Run(task, model);
+    mcx_signal_handler_unset_function();
     if (RETURN_OK != retVal) {
         retVal = RETURN_ERROR;
         goto cleanup;
@@ -512,6 +540,7 @@ McxStatus RunMCX(int argc, char *argv[]) {
     mcx_cpu_time_get(&clock_cleanup_begin);
     mcx_time_get(&time_cleanup_begin);
 
+    mcx_signal_handler_set_function("RunMCX:Cleanup");
     object_destroy(task);
     object_destroy(model);
     object_destroy(config);
@@ -544,6 +573,10 @@ McxStatus RunMCX(int argc, char *argv[]) {
 
 
 cleanup:
+    if (reader) {
+        reader->Cleanup(reader);
+        object_destroy(reader);
+    }
     if (mcxInput) { object_destroy(mcxInput); }
 
     if (model) { object_destroy(model); }
@@ -554,6 +587,7 @@ McxStatus RunMCX(int argc, char *argv[]) {
         mcx_log(LOG_INFO, "**********************************************************************");
     }
 
+    mcx_signal_handler_unset_function(); // RunMCX:Cleanup
 
     return retVal;
 }

scripts/SSP/Ports.xsd

@@ -25,10 +25,6 @@
         <xs:list itemType="xs:int"/>
     </xs:simpleType>
 
-    <xs:simpleType name="BooleanVectorT">
-        <xs:list itemType="xs:boolean"/>
-    </xs:simpleType>
-
     <!-- common attributes -->
     <xs:attributeGroup name="CommonScalarPortAttributes">
         <xs:attribute name="writeResults" type="xs:boolean"/>
@@ -38,7 +34,7 @@
         <xs:attribute name="startIndex" type="xs:unsignedInt" use="required"/>
         <xs:attribute name="endIndex" type="xs:unsignedInt" use="required"/>
 
-        <xs:attribute name="writeResults" type="mse:BooleanVectorT"/>
+        <xs:attribute name="writeResults" type="xs:boolean"/>
     </xs:attributeGroup>
 
     <!-- scalar ports -->

src/CMakeLists.txt

@@ -18,6 +18,7 @@ file(GLOB MCX_SRC_COMMON
     "core/channels/*.c" "core/channels/*.cpp"
     "core/connections/*.c" "core/connections/*.cpp"
     "core/connections/filters/*.c" "core/connections/filters/*.cpp"
+    "core/parameters/*.c" "core/parameters/*.cpp"
     "components/*.c" "components/*.cpp"
     "fmu/*.c" "fmu/*.cpp"
     "objects/*.c" "objects/*.cpp"

src/CentralParts.h

@@ -100,7 +100,6 @@ typedef enum DecoupleTypeDef {
     DECOUPLE_ALWAYS   = 0x4
 } DecoupleType;
 
-// Note: the enum values are mandatory because the enum is used in integer context
 typedef enum PolyOrderTypeDef {
       POLY_CONSTANT = 0
     , POLY_LINEAR = 1
@@ -150,6 +149,7 @@ typedef enum StoreLevel {
     STORE_NONE  = 1,
     STORE_SYNCHRONIZATION = 2,
     STORE_COUPLING = 3,
+    STORE_MICRO = 4,
 } StoreLevel;
 
 typedef enum {

src/components/ComponentTypes.c

@@ -38,8 +38,10 @@ OBJECT_CLASS(ComponentType, Object);
 /*****************************************************************************/
 /*                        ComponentTypeConstant                               */
 /*****************************************************************************/
+const char * const compConstantTypeString = "CONSTANT";
+
 static const char * ComponentTypeConstantToString(ComponentType * type) {
-    return "CONSTANT";
+    return compConstantTypeString;
 }
 
 static void ComponentTypeConstantDestructor(ComponentTypeConstant * type) {

src/components/ComponentTypes.h

@@ -28,6 +28,7 @@ struct ComponentType {
 };
 
 
+extern const char * const compConstantTypeString;
 extern const ObjectClass _ComponentTypeConstant;
 typedef struct ComponentTypeConstant {
     ComponentType _;