Adding LP state to input of event printing function

Author: helq

core/check-revent/crv-state.c

@@ -85,15 +85,15 @@ static crv_checkpointer * get_chkpntr(tw_lpid id) {
     return checkpointer_for_lps[id];
 }
 
-static void print_event(crv_checkpointer const * chkptr, tw_event * cev) {
+static void print_event(crv_checkpointer const * chkptr, tw_lp * clp, tw_event * cev) {
     fprintf(stderr, "\n  Event:\n  ---------\n");
     fprintf(stderr, "  Bit field contents\n");
     tw_fprint_binary_array(stderr, "", &cev->cv, 4);
     fprintf(stderr, "  ---------\n  Event contents\n");
     tw_fprint_binary_array(stderr, "", tw_event_data(cev), g_tw_msg_sz);
     if (chkptr && chkptr->print_event) {
         fprintf(stderr, "---------------------------------\n");
-        chkptr->print_event(stderr, "", tw_event_data(cev));
+        chkptr->print_event(stderr, "", clp->cur_state, tw_event_data(cev));
     }
     fprintf(stderr, "---------------------------------\n");
 }
@@ -132,7 +132,7 @@ void crv_check_lpstates(
             chkptr->print_lp(stderr, "", clp->cur_state);
             fprintf(stderr, "---------------------------------\n");
         }
-        print_event(chkptr, cev);
+        print_event(chkptr, clp, cev);
 	    tw_net_abort();
     }
     if (memcmp(&before_state->rng, clp->rng, sizeof(struct tw_rng_stream))) {
@@ -144,7 +144,7 @@ void crv_check_lpstates(
         tw_fprint_binary_array(stderr, "", &before_state->rng, sizeof(struct tw_rng_stream));
         fprintf(stderr, "\n  rng contents (%s):\n", after_msg);
         tw_fprint_binary_array(stderr, "", clp->rng, sizeof(struct tw_rng_stream));
-        print_event(chkptr, cev);
+        print_event(chkptr, clp, cev);
 	    tw_net_abort();
     }
     if (memcmp(&before_state->core_rng, clp->core_rng, sizeof(struct tw_rng_stream))) {
@@ -155,7 +155,7 @@ void crv_check_lpstates(
         tw_fprint_binary_array(stderr, "", &before_state->core_rng, sizeof(struct tw_rng_stream));
         fprintf(stderr, "\n  core_rng contents (%s):\n", after_msg);
         tw_fprint_binary_array(stderr, "", clp->core_rng, sizeof(struct tw_rng_stream));
-        print_event(chkptr, cev);
+        print_event(chkptr, clp, cev);
 	    tw_net_abort();
     }
 }

core/check-revent/crv-state.h

@@ -8,7 +8,7 @@ typedef void (*clean_checkpoint_state_f) (void * state);
 typedef bool (*check_states_f) (void * current_state, void const * before_state);
 typedef void (*print_lpstate_f) (FILE *, char const * prefix, void * state);
 typedef void (*print_checkpoint_state_f) (FILE *, char const * prefix, void * state);
-typedef void (*print_event_f) (FILE *, char const * prefix, void * state);
+typedef void (*print_event_f) (FILE *, char const * prefix, void * lp_state, void * event_msg);
 
 /*
  * Interface to implement in order to get tighter control over the

models/phold/phold.c

@@ -186,8 +186,8 @@ void print_state_saved(FILE * out, char const * prefix, struct phold_state_check
     fprintf(out, "%sstruct phold_state_checkpoint {\n  saved_dummy_data = %ld\n}\n", prefix, state->saved_dummy_data);
 }
 
-void print_event(FILE * out, char const * prefix, struct phold_message * state) {
-    fprintf(out, "%sstruct phold_message {\n  dummy_data = %ld\n}\n", prefix, state->dummy_data);
+void print_event(FILE * out, char const * prefix, struct phold_state * state, struct phold_message * message) {
+    fprintf(out, "%sstruct phold_message {\n  dummy_data = %ld\n}\n", prefix, message->dummy_data);
 }
 
 bool check_state(struct phold_state * before, struct phold_state * after) {