Merging updated dumpi trace workload with codes-base

codes/codes.h

@@ -11,9 +11,16 @@
 #include <ross.h>
 #include <assert.h>
 
-#if 0
-#define codes_event_new tw_event_new
-#else
+// simple deprecation attribute hacking
+#if !defined(DEPRECATED)
+#  if defined(__GNUC__) || defined(__GNUG__) || defined(__clang__)
+#    define DEPRECATED __attribute__((deprecated))
+#  else
+#    define DEPRECATED
+#  endif
+#endif
+
+DEPRECATED
 static inline tw_event * codes_event_new(
     tw_lpid dest_gid, 
     tw_stime offset_ts, 
@@ -24,7 +31,24 @@ static inline tw_event * codes_event_new(
     //printf("codes_event_new() abs_ts: %.9f\n", abs_ts);
     return(tw_event_new(dest_gid, offset_ts, sender));
 }
-#endif
+
+static inline tw_event * tw_event_new_bounded(
+    tw_lpid dest_gid,
+    tw_stime offset_ts,
+    tw_lp * sender)
+{
+    tw_stime ts = offset_ts + tw_now(sender);
+    if (ts >= g_tw_ts_end) {
+        tw_error(TW_LOC,
+                "LP %lu tried to schedule a message for time %0.5e, "
+                "%0.5e past the end time\n",
+                sender->gid, ts, g_tw_ts_end-ts);
+        return NULL;
+    }
+    else
+        return tw_event_new(dest_gid, offset_ts, sender);
+}
+
 
 /* TODO: validate what value we should use here */
 /* Modeled latency for communication between local software components and

src/workload/methods/codes-dumpi-trace-nw-wrkld.c

@@ -356,8 +356,6 @@ int handleDUMPIIRecv(const dumpi_irecv *prm, uint16_t thread, const dumpi_time *
 	wrkld_per_rank.u.recv.tag = prm->tag;
         wrkld_per_rank.u.recv.num_bytes = prm->count * get_num_bytes(prm->datatype);
 	    
-        if(!wrkld_per_rank.u.recv.num_bytes)
-            printf("\n count %d data type %ld ", prm->count, prm->datatype);
             //assert(wrkld_per_rank.u.recv.num_bytes > 0);
         wrkld_per_rank.u.recv.source_rank = prm->source;
         wrkld_per_rank.u.recv.dest_rank = -1;