adding support for ROSS model sampling to custom dragonfly

codes/net/dragonfly-custom.h

@@ -85,6 +85,8 @@ struct terminal_custom_message
    tw_stime saved_total_time;
    tw_stime saved_sample_time;
    tw_stime msg_start_time;
+   tw_stime saved_busy_time_ross;
+   tw_stime saved_fin_chunks_ross;
 };
 
 #ifdef __cplusplus

src/network-workloads/model-net-mpi-replay.c

@@ -2504,8 +2504,11 @@ st_model_types nw_lp_model_types[] = {
      (ev_trace_f) nw_lp_event_collect,
      sizeof(int),
      (model_stat_f) nw_lp_model_stat_collect,
+     0,
+     NULL,
+     NULL,
      0},
-    {NULL, 0, NULL, 0, NULL, 0}
+    {NULL, 0, NULL, 0, NULL, 0, NULL, NULL, 0}
 };
 
 static const st_model_types  *nw_lp_get_model_stat_types(void)

src/network-workloads/model-net-synthetic-custom-dfly.c

@@ -107,6 +107,53 @@ tw_lptype svr_lp = {
     sizeof(svr_state),
 };
 
+/* setup for the ROSS event tracing
+ * can have a different function for  rbev_trace_f and ev_trace_f
+ * but right now it is set to the same function for both
+ */
+void custom_svr_event_collect(svr_msg *m, tw_lp *lp, char *buffer, int *collect_flag)
+{
+    (void)lp;
+    (void)collect_flag;
+    int type = (int) m->svr_event_type;
+    memcpy(buffer, &type, sizeof(type));
+}
+
+/* can add in any model level data to be collected along with simulation engine data
+ * in the ROSS instrumentation.  Will need to update the last field in 
+ * svr_model_types[0] for the size of the data to save in each function call
+ */
+void custom_svr_model_stat_collect(svr_state *s, tw_lp *lp, char *buffer)
+{
+    (void)s;
+    (void)lp;
+    (void)buffer;
+    return;
+}
+
+st_model_types custom_svr_model_types[] = {
+    {(rbev_trace_f) custom_svr_event_collect,
+     sizeof(int),
+     (ev_trace_f) custom_svr_event_collect,
+     sizeof(int),
+     (model_stat_f) custom_svr_model_stat_collect,
+     0,
+     NULL,
+     NULL,
+     0},
+    {NULL, 0, NULL, 0, NULL, 0, NULL, NULL, 0}
+};
+
+static const st_model_types  *custom_svr_get_model_stat_types(void)
+{
+    return(&custom_svr_model_types[0]);
+}
+
+void custom_svr_register_model_types()
+{
+    st_model_type_register("nw-lp", custom_svr_get_model_stat_types());
+}
+
 const tw_optdef app_opt [] =
 {
         TWOPT_GROUP("Model net synthetic traffic " ),
@@ -380,6 +427,9 @@ int main(
     model_net_register();
     svr_add_lp_type();
 
+    if (g_st_ev_trace || g_st_model_stats || g_st_use_analysis_lps)
+        custom_svr_register_model_types();
+
     codes_mapping_setup();
 
     net_ids = model_net_configure(&num_nets);