Fixing remaining fixmes.

Eliminating the flag for partial log, since this only affects the assumption that the log is in order, which it isn't any more.

Copied from Perforce
 Change: 179150
 ServerID: perforce.ravenbrook.com

6 files changed, 15 insertions, 26 deletions

diff --git a/mps/code/eventcnv.c b/mps/code/eventcnv.c
index f52ab854641..ece05330777 100644
--- a/mps/code/eventcnv.c
+++ b/mps/code/eventcnv.c
@@ -55,7 +55,6 @@ static Bool verbose = FALSE;
 static char style = '\0';
 static Bool reportEvents = FALSE;
 static Bool eventEnabled[EventCodeMAX+1];
-static Bool partialLog = FALSE; /* FIXME: can't read out-of-order labels */
 static Word bucketSize = 0;
 
 
@@ -147,9 +146,6 @@ static char *parseArgs(int argc, char *argv[])
         else
           name = argv[i];
         break;
-      case 'p': /* partial log */
-        partialLog = TRUE;
-        break;
       case 'v': /* verbosity */
         verbose = TRUE;
         break;
@@ -644,7 +640,7 @@ int main(int argc, char *argv[])
       everror("unable to open \"%s\"\n", filename);
   }
 
-  res = EventProcCreate(&proc, partialLog, logReader, (void *)input);
+  res = EventProcCreate(&proc, logReader, (void *)input);
   if (res != ResOK)
     everror("Can't init EventProc module: error %d.", res);
 
diff --git a/mps/code/eventdef.h b/mps/code/eventdef.h
index 004ee6d9668..d8edc6a2bee 100644
--- a/mps/code/eventdef.h
+++ b/mps/code/eventdef.h
@@ -55,7 +55,7 @@
 #define EventNameMAX ((size_t)19)
 #define EventCodeMAX ((EventCode)0x0071)
 
-/* FIXME: Work out why not-in-use events were not in use and restore or delete them. */
+/* TODO: Work out why not-in-use events were not in use and restore or delete them. */
 
 #define EVENT_LIST(EVENT, X) \
   /*       0123456789012345678 <- don't exceed without changing EventNameMAX */ \
diff --git a/mps/code/eventpro.c b/mps/code/eventpro.c
index 0fce7d44633..439746bf950 100644
--- a/mps/code/eventpro.c
+++ b/mps/code/eventpro.c
@@ -22,7 +22,6 @@
 #include <string.h> /* strcmp */
 
 struct EventProcStruct {
-  Bool partialLog;        /* Is this a partial log? */
   EventProcReader reader; /* reader fn */
   void *readerP;          /* closure pointer for reader fn */
   Table internTable;      /* dictionary of intern ids to symbols */
@@ -58,7 +57,8 @@ struct EventProcStruct {
  * of the structure.  This has to agree with the writing (EVENT_END).
  */
 
-/* FIXME: MPS_PF_ALIGN should be read from event file header? */
+/* TODO: Should read this and other layout information from an event file
+   header in order to be able to process events from other architectures. */
 
 #define EventSizeAlign(size) sizeAlignUp(size, MPS_PF_ALIGN)
 
@@ -293,9 +293,8 @@ Res EventRecord(EventProc proc, Event event, EventClock etime)
 
     if (label == NULL) return ResMEMORY;
     label->id = event->Label.f1;
-    if (!proc->partialLog) {
-      assert(TableLookup(&entry, proc->internTable, label->id));
-    }
+    /* If events were in time order we'd be able to assert that
+       TableLookup(&entry, proc->internTable, label->id) */
     label->time = etime;
     label->addr = event->Label.f0;
     if (TableLookup(&entry, proc->labelTable, (Word)label->addr))
@@ -345,8 +344,9 @@ void EventDestroy(EventProc proc, Event event)
 
 /* EventProcCreate -- initialize the module */
 
-Res EventProcCreate(EventProc *procReturn, Bool partial,
-                    EventProcReader reader, void *readerP)
+Res EventProcCreate(EventProc *procReturn,
+                    EventProcReader reader,
+                    void *readerP)
 {
   Res res;
   EventProc proc = malloc(sizeof(struct EventProcStruct));
@@ -359,7 +359,6 @@ Res EventProcCreate(EventProc *procReturn, Bool partial,
   /* check use of labelTable */
   assert(sizeof(Word) >= sizeof(Addr));
 
-  proc->partialLog = partial;
   proc->reader = reader; proc->readerP = readerP;
   res = TableCreate(&proc->internTable, (size_t)1<<4);
   if (res != ResOK) goto failIntern;
diff --git a/mps/code/eventpro.h b/mps/code/eventpro.h
index 375eaec19c2..a4a7d34e780 100644
--- a/mps/code/eventpro.h
+++ b/mps/code/eventpro.h
@@ -32,8 +32,9 @@ extern void EventDestroy(EventProc proc, Event event);
 
 extern Res EventRecord(EventProc proc, Event event, EventClock etime);
 
-extern Res EventProcCreate(EventProc *procReturn, Bool partial,
-                           EventProcReader reader, void *readerP);
+extern Res EventProcCreate(EventProc *procReturn,
+                           EventProcReader reader,
+                           void *readerP);
 extern void EventProcDestroy(EventProc proc);
 
 
diff --git a/mps/code/eventrep.c b/mps/code/eventrep.c
index 7bbf2828eb2..d135c4fc122 100644
--- a/mps/code/eventrep.c
+++ b/mps/code/eventrep.c
@@ -51,7 +51,6 @@ static ulong totalEvents; /* count of events */
 static ulong discardedEvents; /* count of ignored events */
 static ulong unknownEvents; /* count of unknown events */
 
-static Bool partialLog;
 static Word eventTime;
 
 /* Dictionaries for translating from log to replay values */
@@ -698,7 +697,7 @@ void EventReplay(Event event, Word etime)
 
 /* EventRepInit -- initialize the module */
 
-Res EventRepInit(Bool partial)
+Res EventRepInit(void)
 {
   Res res;
 
@@ -711,7 +710,6 @@ Res EventRepInit(Bool partial)
   /* by the MPS functions is justified by the reverse conversion */
   /* being acceptable (which is upto the event log generator). */
 
-  partialLog = partial;
   totalEvents = 0; discardedEvents = 0; unknownEvents = 0;
 
   res = TableCreate(&arenaTable, (size_t)1);
diff --git a/mps/code/replay.c b/mps/code/replay.c
index 9dd34557d10..974ce5dcd07 100644
--- a/mps/code/replay.c
+++ b/mps/code/replay.c
@@ -37,8 +37,6 @@ typedef unsigned long ulong;
 
 /* command-line arguments */
 
-static Bool partialLog = FALSE;
-
 static char *prog; /* program name */
 
 
@@ -105,9 +103,6 @@ static char *parseArgs(int argc, char *argv[])
         else  
           name = argv[i];
         break;  
-      case 'p': /* partial log */
-        partialLog = TRUE;
-        break;
       case '?': case 'h': /* help */
         usage();
         break;
@@ -172,11 +167,11 @@ int main(int argc, char *argv[])
       error("unable to open \"%s\"\n", filename);
   }
 
-  res = EventProcCreate(&proc, partialLog, logReader, (void *)input);
+  res = EventProcCreate(&proc, logReader, (void *)input);
   if (res != ResOK)
     error("Can't init EventProc module: error %d.", res);
 
-  res = EventRepInit(partialLog);
+  res = EventRepInit();
   if (res != ResOK)
     error("Can't init EventRep module: error %d.", res);