Update the SimMock objects.

dse/mocks/examples/network/test_network.c

@@ -31,7 +31,7 @@ static int test_setup(void** state)
 static int test_teardown(void** state)
 {
     SimMock* mock = *state;
-    simmock_exit(mock);
+    simmock_exit(mock, false);
     simmock_free(mock);
     return 0;
 }
@@ -74,7 +74,7 @@ void test_network__network2target2network(void** state)
     }
     /* Inject a message carrying the reset_counters signal. */
     uint8_t buffer[8] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-    simmock_write_frame(mock->sv_network_tx, "can_bus", buffer, 8, 0x1f0u);
+    simmock_write_frame(mock->sv_network_tx, "can_bus", buffer, 8, 0x1f0u, 0);
     assert_int_equal(simmock_step(mock, true), 0);
     /* 20ms */
     {

dse/mocks/simmock.c

@@ -426,16 +426,27 @@ int simmock_step(SimMock* mock, bool assert_rc)
 simmock_exit
 ============
 
-Call `model_exit()` for each model.
+Call `model_destroy()` for each model.
 
 Parameters
 ----------
 mock (SimMock*)
 : A SimMock object.
+
+call_destroy (bool)
+: Indicate that model_destroy() should be explicitly called. Set to `true` when
+  using the SimMock library outside of the ModelC repo (which has its own mock
+  object representing the controller).
 */
-void simmock_exit(SimMock* mock)
+void simmock_exit(SimMock* mock, bool call_destroy)
 {
     assert_non_null(mock);
+
+    if (call_destroy) {
+        for (ModelMock* model = mock->model; model->name; model++) {
+            modelc_destroy(model->mi);
+        }
+    }
     modelc_exit(&mock->sim);
 }
 
@@ -667,9 +678,12 @@ len (size_t)
 
 frame_id (uint32_t)
 : The Frame ID associated with the data.
+
+frame_type (uint8_t)
+: The Frame Type associated with the frame.
 */
 void simmock_write_frame(SignalVector* sv, const char* sig_name, uint8_t* data,
-    size_t len, uint32_t frame_id)
+    size_t len, uint32_t frame_id, uint8_t frame_type)
 {
     assert_non_null(sv);
     assert_true(sv->is_binary);
@@ -686,7 +700,8 @@ void simmock_write_frame(SignalVector* sv, const char* sig_name, uint8_t* data,
     char* node_id_save = __get_ncodec_node_id(nc);
     __set_ncodec_node_id(nc, (char*)"42");
     ncodec_write(nc, &(struct NCodecCanMessage){
-                         .frame_id = frame_id, .len = len, .buffer = data });
+                         .frame_id = frame_id, .frame_type = frame_type,
+                         .len = len, .buffer = data });
     ncodec_flush(nc);
     __set_ncodec_node_id(nc, node_id_save);
     free(node_id_save);

dse/mocks/simmock.h

@@ -142,10 +142,10 @@ void simmock_load_model_check(ModelMock* model, bool expect_create_func,
     bool expect_step_func, bool expect_destroy_func);
 void simmock_setup(SimMock* mock, const char* sig_name, const char* net_name);
 int  simmock_step(SimMock* mock, bool assert_rc);
-void simmock_exit(SimMock* mock);
+void simmock_exit(SimMock* mock, bool call_destroy);
 ModelMock* simmock_find_model(SimMock* mock, const char* name);
 void simmock_write_frame(SignalVector* sv, const char* sig_name, uint8_t* data,
-    size_t len, uint32_t frame_id);
+    size_t len, uint32_t frame_id, uint8_t frame_type);
 uint32_t simmock_read_frame(
     SignalVector* sv, const char* sig_name, uint8_t* data, size_t len);
 void simmock_free(SimMock* mock);

dse/modelc/controller/modelc_debug.c

@@ -44,3 +44,23 @@ int modelc_step(ModelInstanceSpec* model_instance, double step_size)
     double model_time = 0.0;
     return step_model(model_instance, &model_time);
 }
+
+
+/**
+ *  modelc_destroy
+ *
+ *  Bypass the controller and call model_destroy() directly.
+ *
+ *  Parameters
+ *  ----------
+ *  model_instance : ModelInstanceSpec (pointer to)
+ *      The model instance, which holds references to the registered channels
+ * and model functions. step_size : double The duration simulation step to be
+ * performed (in seconds).
+ */
+void modelc_destroy(ModelInstanceSpec* mi)
+{
+    if (mi->model_desc->vtable.destroy == NULL) return;
+    mi->model_desc->vtable.destroy(mi->model_desc);
+    mi->model_desc->vtable.destroy = NULL;
+}

dse/modelc/runtime.h

@@ -120,7 +120,8 @@ DLL_PUBLIC int  modelc_model_create(
 
 
 /* modelc_debug.c - Debug Interface. */
-DLL_PUBLIC int modelc_step(ModelInstanceSpec* model_instance, double step_size);
+DLL_PUBLIC int modelc_step(ModelInstanceSpec* mi, double step_size);
+DLL_PUBLIC void modelc_destroy(ModelInstanceSpec* mi);
 
 
 /* modelc_args.c - CLI argument parsing routines. */

tests/cmocka/model/interface/test_model_interface.c

@@ -23,7 +23,7 @@ static int test_teardown(void** state)
 {
     SimMock* mock = *state;
 
-    simmock_exit(mock);
+    simmock_exit(mock, false);
     simmock_free(mock);
 
     chdir(__entry_path__);