fix merge error

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

@@ -715,7 +715,6 @@ static void gen_synthetic_tr(nw_state * s, tw_bf * bf, nw_message * m, tw_lp * l
         for (i = 0; i < length; i++)
         {
             /* Generate synthetic traffic */
-            //printf("\nAPP %d SRC %d Dest %d", jid.job, s->local_rank, dest_svr[i]);
             jid.rank = dest_svr[i];
             intm_dest_id = codes_jobmap_to_global_id(jid, jobmap_ctx); 
             global_dest_id = codes_mapping_get_lpid_from_relative(intm_dest_id, NULL, NW_LP_NM, NULL, 0);
@@ -727,6 +726,7 @@ static void gen_synthetic_tr(nw_state * s, tw_bf * bf, nw_message * m, tw_lp * l
             remote_m.fwd.app_id = s->app_id;
             remote_m.fwd.src_rank = s->local_rank;
 
+            // printf("\nAPP %d SRC %d Dest %d (twid %llu)", jid.job, s->local_rank, dest_svr[i], global_dest_id);
             m->event_rc = model_net_event(net_id, "synthetic-tr", global_dest_id, payload_sz, 0.0, 
                     sizeof(nw_message), (const void*)&remote_m, 
                     0, NULL, lp);
@@ -1416,19 +1416,18 @@ static void codes_exec_mpi_recv(
 
 	int found_matching_sends = rm_matching_send(s, bf, m, lp, recv_op);
 
-	/* save the req id inserted in the completed queue for reverse computation. */
-	if(found_matching_sends < 0)
-	  {
-	   	  m->fwd.found_match = -1;
-          qlist_add(&recv_op->ql, &s->pending_recvs_queue);
-
            /* for mpi irecvs, this is a non-blocking receive so just post it and move on with the trace read. */
     if(mpi_op->op_type == CODES_WK_IRECV)
     {
         bf->c6 = 1;
         codes_issue_next_event(lp);
-			return;
     }
+    /* save the req id inserted in the completed queue for reverse computation. */
+    if(found_matching_sends < 0)
+      {
+          m->fwd.found_match = -1;
+          qlist_add(&recv_op->ql, &s->pending_recvs_queue);
+
       }
     else
       {
@@ -1978,7 +1977,7 @@ void nw_test_init(nw_state* s, tw_lp* lp)
    }
    else 
    {
-       printf("\n Trace %s job id %d %d on nid %d", file_name_of_job[lid.job], s->app_id, s->local_rank, s->nw_id);
+       printf("\n Trace %s job id %d %d on nid %llu", file_name_of_job[lid.job], s->app_id, s->local_rank, s->nw_id);
        strcpy(params_d.file_name, file_name_of_job[lid.job]);
        params_d.num_net_traces = num_traces_of_job[lid.job];
        params = (char*)&params_d;