The event ID of the envelope is now always initialized with a sequential number.
authorFilippo Gioachin <gioachin@uiuc.edu>
Mon, 18 Jan 2010 21:57:19 +0000 (15:57 -0600)
committerFilippo Gioachin <gioachin@uiuc.edu>
Mon, 18 Jan 2010 21:57:19 +0000 (15:57 -0600)
This makes deprecated tracing mode record-replay, thus the files are deleted from Charm.

src/ck-core/ck.C
src/ck-core/envelope.h
src/ck-core/init.C
src/ck-perf/trace-recordreplay.C [deleted file]
src/ck-perf/trace-recordreplay.h [deleted file]
src/scripts/Make.depends
src/scripts/Makefile

index e257f55972fe6d5c7944012b0c1d4a08894e003b..40b6ff5d394962c7723781cb095015877552a020 100644 (file)
@@ -1841,6 +1841,9 @@ printf("[%d] DELETE!\n", CkMyPe());
 //------------------- Message Watcher (record/replay) ----------------
 
 #include "crc32.h"
+
+CkpvDeclare(int, envelopeEventID);
+
 CkMessageWatcher::~CkMessageWatcher() {}
 
 class CkMessageRecorder : public CkMessageWatcher {
index 963cfd85968fe357146e06a4baca7750c3993ed5..724f1cd708cd2a7ac0a70d77e8d5bf941cce2fa1 100644 (file)
@@ -95,6 +95,11 @@ typedef unsigned char  UChar;
 
 /**
 @addtogroup CkEnvelope
+*/
+
+CkpvExtern(int, envelopeEventID);
+
+/**
 @{
 The class envelope defines a Charm++ message's header. The first
 'CmiReservedHeaderSize' bytes of memory is exclusively reserved for Converse
@@ -244,7 +249,7 @@ private:
       env->setPacked(0);
       _SET_USED(env, 0);
       //for record-replay
-      env->setEvent(0);
+      env->setEvent(++CkpvAccess(envelopeEventID));
       env->setRef(0);
 
 #ifdef USE_CRITICAL_PATH_HEADER_ARRAY
index b565101c531d287f03e9a7b5d1a2638d094ea729..04ac8299cf4f046b3e5b3a1a29d5fbcb22939763 100644 (file)
@@ -837,6 +837,8 @@ void _initCharm(int unused_argc, char **argv)
         traceCharmInit(argv);
 #endif
        
+    CkpvInitialize(int, envelopeEventID);
+    CkpvAccess(envelopeEventID) = 0;
        CkMessageWatcherInit(argv,CkpvAccess(_coreState));
        
        /**
diff --git a/src/ck-perf/trace-recordreplay.C b/src/ck-perf/trace-recordreplay.C
deleted file mode 100644 (file)
index bd33cd9..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-/**
- * \addtogroup CkPerf
-*/
-/*@{*/
-
-#include "charm++.h"
-#include "trace-recordreplay.h"
-#include "signal.h"
-
-#define DEBUGF(x)  // CmiPrintf x
-
-#define VER   4.0
-
-#define INVALIDEP     -2
-
-CkpvStaticDeclare(TraceRecordReplay*, _trace);
-
-/**
-  For each TraceFoo module, _createTraceFoo() must be defined.
-  This function is called in _createTraces() generated in moduleInit.C
-*/
-void _createTracerecordreplay(char **argv)
-{
-  DEBUGF(("%d createTraceRecordReplay\n", CkMyPe()));
-  CkpvInitialize(TraceRecordReplay*, _trace);
-  CkpvAccess(_trace) = new  TraceRecordReplay(argv);
-  CkpvAccess(_traces)->addTrace(CkpvAccess(_trace));
-}
-
-TraceRecordReplay::TraceRecordReplay(char **argv):curevent(1) {}
-
-void TraceRecordReplay::beginExecute(envelope *e)
-{
-  // no message means thread execution
-  if (e==NULL) {
-  }
-  else {
-    e->setEvent(curevent++);
-  }  
-}
-
-
-void TraceRecordReplay::creation(envelope *e, int ep, int num)
-{
-  e->setEvent(curevent++);
-}
-
-
-/*@}*/
diff --git a/src/ck-perf/trace-recordreplay.h b/src/ck-perf/trace-recordreplay.h
deleted file mode 100644 (file)
index ca7cd81..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-/**
- * \addtogroup CkPerf
-*/
-/*@{*/
-
-#ifndef _RECORDREPLAY_H
-#define _RECORDREPLAY_H
-
-#include <stdio.h>
-#include <errno.h>
-
-#include "trace.h"
-#include "envelope.h"
-#include "register.h"
-#include "trace-common.h"
-
-// initial bin size, time in seconds
-#define  BIN_SIZE      0.001
-
-#define  MAX_MARKS       256
-
-#define  MAX_PHASES       10
-
-
-/// class for recording trace record replay 
-/**
-  TraceRecordReplay increments curEvent variable in the envelope everytime a message is executed 
-*/
-class TraceRecordReplay : public Trace {
-    int curevent;
-  public:
-    TraceRecordReplay(char **argv);
-    void creation(envelope *e, int epIdx, int num=1);
-
-    void beginExecute(envelope *e);
-};
-
-#endif
-
-/*@}*/
index 75c0ceaaee72ce966495577e137b4be18dd69760..f0a51f054cd6ce32bdf724505dcfea923327ce5f 100644 (file)
@@ -366,24 +366,6 @@ trace-converse.o: trace-converse.c conv-trace.h converse.h conv-config.h \
 trace-all.o: trace-all.C
        $(CHARMC) -c -I. trace-all.C
 
-trace-recordreplay.o: trace-recordreplay.C charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
-  debug-charm.h simd.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h lbdb++.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
-  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
-  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
-  trace.h trace-bluegene.h envelope.h trace-recordreplay.h register.h \
-  trace-common.h
-       $(CHARMC) -c -I. trace-recordreplay.C
-
 trace-memory.o: trace-memory.C trace-memory.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
index 0f58f1217effe1696265b4637947309338811999..7fb4e6e1222cd82a1a1b46c1bd2695af3c97c0bf 100644 (file)
@@ -326,7 +326,7 @@ TRACELIBS=$(L)/libtrace-projections.a  $(L)/libtrace-summary.a   $(L)/libtrace-u
          $(L)/libtrace-simple.a $(L)/libtrace-controlPoints.a\
           $(L)/libtrace-counter.a $(L)/libtrace-bluegene.a \
          $(L)/libtrace-projector.a $(L)/libtrace-all.a $(L)/libtrace-converse.a \
-          $(L)/libtrace-recordreplay.a  $(L)/libtracef_f.a $(L)/libtrace-memory.a
+          $(L)/libtracef_f.a $(L)/libtrace-memory.a
 MEMLIBS=$(L)/libmemory-default.o $(L)/libmemory-os.o $(L)/libmemory-gnu.o \
           $(L)/libmemory-gnuold.o $(L)/libmemory-verbose.o     \
          $(L)/libmemory-paranoid.o \
@@ -841,10 +841,6 @@ $(L)/libtrace-controlPoints.a: $(LIBTRACE_CONTROLPOINTS)
        $(CHARMC) -o $@ $^
 # Do not change this rule!
 
-LIBTRACE_RECREP=trace-recordreplay.o
-$(L)/libtrace-recordreplay.a: $(LIBTRACE_RECREP)
-       $(CHARMC) -o $@ $(LIBTRACE_RECREP)
-
 LIBTRACE_COUNT=trace-counter.o
 $(L)/libtrace-counter.a: $(LIBTRACE_COUNT)
        $(CHARMC) -o $@ $(LIBTRACE_COUNT)
@@ -858,7 +854,7 @@ $(L)/libtrace-memory.a: $(LIBTRACE_MEMORY)
        $(CHARMC) -o $@ $(LIBTRACE_MEMORY)
 
 LIBTRACE_ALL=trace-all.o trace-projections.o trace-summary.o trace-simple.o \
-$(TAU_TRACE_OBJ) trace-recordreplay.o trace-projector.o traceCore.o traceCoreCommon.o charmProjections.o converseProjections.o machineProjections.o trace-memory.o trace-controlPoints.o trace-utilization.o
+$(TAU_TRACE_OBJ) trace-projector.o traceCore.o traceCoreCommon.o charmProjections.o converseProjections.o machineProjections.o trace-memory.o trace-controlPoints.o trace-utilization.o
 
 $(L)/libtrace-all.a: $(LIBTRACE_ALL)
        $(CHARMC) -o $@ $(LIBTRACE_ALL)
@@ -882,7 +878,7 @@ tracef_f.o: tracef_f.f90
 TRACE_OBJS =  trace-projections.o  trace-summary.o  trace-simple.o \
              trace-counter.o trace-controlPoints.o trace-utilization.o \
              trace-bluegene.o trace-projector.o trace-converse.o trace-all.o \
-              trace-recordreplay.o trace-memory.o
+          trace-memory.o
 
 ######################################################################
 #