Merge pull request Kvixen#34 from tkorvola/assert

utAssert support

Author: Kvixen

includes/rt_assert.h

@@ -0,0 +1,14 @@
+#ifndef RT_ASSERT_H_
+#define RT_ASSERT_H_
+
+/* Assertion support for Simulix.
+ *
+ * A file with the same name may be generated by Matlab Coder.  This file
+ * replaces it.
+ */
+
+#include "sx_assert.h"
+
+#define utAssert(expr) sx_assert((expr), "Assertion " #expr " failed")
+
+#endif

includes/sx_assert.c

@@ -0,0 +1,18 @@
+#include <setjmp.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+#include "sx_assert.h"
+#include "sx_assert_int.h"
+
+jmp_buf fmu_exit;
+bool has_jmp = false;
+
+/*TODO proper logging */
+void sx_assert_f(int cond, const char *file, int line, const char *msg) {
+    if (cond)
+        return;
+    fprintf(stderr, "%s:%d: %s\n", file, line, msg);
+    if (has_jmp)
+        longjmp(fmu_exit, 1);
+}

includes/sx_assert.h

@@ -0,0 +1,11 @@
+#ifndef SX_ASSERT_H_
+#define SX_ASSERT_H_
+
+/* Simulix assertion support.
+ */
+
+extern void sx_assert_f(int cond, const char *file, int line, const char *msg);
+
+#define sx_assert(expr, msg) sx_assert_f((expr), __FILE__, __LINE__, (msg))
+
+#endif

includes/sx_assert_int.h

@@ -0,0 +1,13 @@
+#ifndef SX_ASSERT_INT_H_
+#define SX_ASSERT_INT_H_
+
+/* Internal details of Simulix assertion support.
+ */
+
+#include <setjmp.h>
+#include <stdbool.h>
+
+extern jmp_buf fmu_exit;
+extern bool has_jmp;
+
+#endif

templates/Simulix_dllmain_template.c

@@ -8,10 +8,14 @@
 #include "rtwtypes.h"
 #include "rtw_modelmap.h"
 #include <stdint.h>
+#include <stdbool.h>
+#include <setjmp.h>
 
 // include fmu header files, typedefs and macros
 #include "fmuTemplate.h"
 
+#include "sx_assert_int.h"
+
 //! System DLL base address
 size_t dllBaseAddress_U32 = 0;
 //! System DLL image size in bytes
@@ -217,13 +221,21 @@ static void eventUpdate(ModelInstance *comp, fmi2EventInfo *eventInfo, int isTim
     fmi2Boolean error = fmi2False;
 
     if (isTimeEvent) {{
+        if (setjmp(fmu_exit)) {{
+            /* Assertion failed in model. */
+            has_jmp = false;
+            eventInfo->terminateSimulation = fmi2True;
+            return;
+        }}
+        has_jmp = true;
         while (current_time < (comp->time - 0.1 * step_size) )
         {{
             {modelName}_step();
             current_time        += step_size;
             {modelName}_time += 1;         // Only for Vision/Testlogger that cannot handle double-presicion floats
             simulation_ticks    += 1;
         }}
+        has_jmp = false;
 
         /*
         {{

unpack.py

@@ -29,7 +29,11 @@
 TEMPLATE_REPLACE = {
 }
 
+# Matching paths are always included (regardless of BAD_SOURCES etc.).
+GOOD_SOURCE_PATTERN = re.compile(r"includes/rt_assert\.h$")
+
 BAD_SOURCES = {
+    "rt_assert.h",
     "rt_main.c",
     "Simulix_exemain.c",
     "cJSON.c",
@@ -196,9 +200,12 @@ def generate_files(src, dst, zip_path, zip_name, extension_path, temp_path):
 def extract_file_names(dst):
     for root, dirs, files in walk(dst):
         for file in files:
-            if not file in BAD_SOURCES and SOURCE_OR_HEADER_PATTERN.search(file):
+            p = path.join(root, file)
+            if (GOOD_SOURCE_PATTERN.search(p)
+                or not file in BAD_SOURCES
+                   and SOURCE_OR_HEADER_PATTERN.search(file)):
                 LIST_OF_SOURCES.append(path.join(root, file))
-                
+
 # Fmu Functions
 def handle_fmu(dst, fmu_path):
     file_name, file_ext = path.splitext(fmu_path)