Draft: Prepare for arrays

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;
 }
 
 

mcx/mcx.c

@@ -573,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); }

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/components/comp_constant.c

@@ -10,6 +10,7 @@
 
 #include "components/comp_constant.h"
 
+#include "core/channels/ChannelValue.h"
 #include "core/Databus.h"
 #include "reader/model/components/specific_data/ConstantInput.h"
 
@@ -23,31 +24,27 @@ static McxStatus Read(Component * comp, ComponentInput * input, const struct Con
     ConstantInput * constantInput = (ConstantInput *)input;
 
     Databus * db = comp->GetDatabus(comp);
-    size_t numVecOut = DatabusGetOutVectorChannelsNum(db);
+    size_t numOut = DatabusGetOutChannelsNum(db);
 
-    // We read each vector channel (scalars are vectors of length 1)
-    // and the corresponding values from the input file.
-    compConstant->values = (ChannelValue **)mcx_calloc(numVecOut, sizeof(ChannelValue *));
+    compConstant->values = (ChannelValue **)mcx_calloc(numOut, sizeof(ChannelValue *));
 
     if (constantInput->values) {
         ConstantValuesInput * values = constantInput->values;
         size_t i = 0;
 
-        for (i = 0; i < numVecOut; i++) {
+        for (i = 0; i < numOut; i++) {
             ConstantValueInput * value = (ConstantValueInput *)values->values->At(values->values, i);
             if (value->type == CONSTANT_VALUE_SCALAR) {
-                compConstant->values[i] = (ChannelValue *)mcx_calloc(1, sizeof(ChannelValue));
-                ChannelValueInit(compConstant->values[i], value->value.scalar->type);
-                ChannelValueSetFromReference(compConstant->values[i], &value->value.scalar->value);
+                compConstant->values[i] = ChannelValueNewScalar(value->value.scalar->type, &value->value.scalar->value);
+                if (!compConstant->values[i]) {
+                    ComponentLog(comp, LOG_ERROR, "Could not set channel value");
+                    return RETURN_ERROR;
+                }
             } else {
-                size_t j = 0;
-                size_t size = ChannelValueTypeSize(value->value.array->type);
-                compConstant->values[i] = (ChannelValue *)mcx_calloc(value->value.array->numValues,
-                                                                     sizeof(ChannelValue));
-                for (j = 0; j < value->value.array->numValues; j++) {
-                    ChannelValueInit(compConstant->values[i] + j, value->value.array->type);
-                    ChannelValueSetFromReference(compConstant->values[i] + j,
-                                                 (char *)value->value.array->values + j * size);
+                compConstant->values[i] = ChannelValueNewArray(1, &value->value.array->numValues, value->value.array->type, value->value.array->values);
+                if (!compConstant->values[i]) {
+                    ComponentLog(comp, LOG_ERROR, "Could not set channel value");
+                    return RETURN_ERROR;
                 }
             }
         }
@@ -59,36 +56,15 @@ static McxStatus Read(Component * comp, ComponentInput * input, const struct Con
 static ChannelValue * GetValue(CompConstant * compConstant, size_t idx) {
     Component * comp = (Component *) (compConstant);
     Databus * db = comp->GetDatabus(comp);
-    size_t numVecOut = DatabusGetOutVectorChannelsNum(db);
-    size_t i = 0;
-    size_t sum = 0;
+    size_t numOut = DatabusGetOutChannelsNum(db);
     ChannelValue * value = NULL;
-    VectorChannelInfo * vInfo = NULL;
-    size_t numCh = 0;
-    size_t startIdx = 0;
-    size_t endIdx = 0;
-
-    for (i = 0; i < numVecOut; i++) {
-        vInfo = DatabusGetOutVectorChannelInfo(db, i);
-        startIdx = vInfo->GetStartIndex(vInfo);
-        endIdx = vInfo->GetEndIndex(vInfo);
-        numCh = endIdx - startIdx + 1;
-
-        sum += numCh;
-        if (sum > idx) {
-            break;
-        }
-    }
 
-    if (i >= numVecOut) {
+    if (idx >= numOut) {
         ComponentLog(comp, LOG_ERROR, "GetValue: Invalid index (%zu) provided", idx);
         return NULL;
     }
 
-    value = compConstant->values[i];
-    if (!vInfo->IsScalar(vInfo)) {
-        value += idx - (sum - numCh);
-    }
+    value = compConstant->values[idx];
 
     return value;
 }
@@ -97,16 +73,12 @@ static McxStatus Setup(Component * comp) {
     CompConstant * constComp = (CompConstant *)comp;
     McxStatus retVal = RETURN_OK;
     Databus * db = comp->GetDatabus(comp);
-    size_t numVecOut = DatabusGetOutVectorChannelsNum(db);
+    size_t numOut = DatabusGetOutChannelsNum(db);
 
     size_t i = 0;
 
-    for (i = 0; i < numVecOut; i++) {
-        VectorChannelInfo * vInfo = DatabusGetOutVectorChannelInfo(db, i);
-        size_t startIdx = vInfo->GetStartIndex(vInfo);
-        size_t endIdx = vInfo->GetEndIndex(vInfo);
-        size_t numCh = endIdx - startIdx;
-        retVal = DatabusSetOutRefVectorChannel(db, i, startIdx, endIdx, constComp->values[i]);
+    for (i = 0; i < numOut; i++) {
+        retVal = DatabusSetOutReference(db, i, (void *) &constComp->values[i]->value, constComp->values[i]->type);
         if (RETURN_OK != retVal) {
             ComponentLog(comp, LOG_ERROR, "Could not register out channel reference");
             return RETURN_ERROR;
@@ -128,18 +100,12 @@ static void CompConstantDestructor(CompConstant * compConst) {
     Component * comp = (Component *)compConst;
     McxStatus retVal = RETURN_OK;
     Databus * db = comp->GetDatabus(comp);
-    size_t numVecOut = DatabusGetOutVectorChannelsNum(db);
-
-    if (numVecOut > 0 && compConst->values != NULL) {
-        size_t i, j;
-        for (i = 0; i < numVecOut; i++) {
-            VectorChannelInfo * vInfo = DatabusGetOutVectorChannelInfo(db, i);
-            size_t startIdx = vInfo->GetStartIndex(vInfo);
-            size_t endIdx = vInfo->GetEndIndex(vInfo);
-            size_t numCh = endIdx - startIdx + 1;
-            for (j = 0; j < numCh; j++) {
-                ChannelValueDestructor(&compConst->values[i][j]);
-            }
+    size_t numOut = DatabusGetOutChannelsNum(db);
+
+    if (numOut > 0 && compConst->values != NULL) {
+        size_t i;
+        for (i = 0; i < numOut; i++) {
+            ChannelValueDestructor(compConst->values[i]);
             mcx_free(compConst->values[i]);
         }
         mcx_free(compConst->values);