Store graph callbacks in a structure

[lttv.git] / lttv / lttv / sync / data_structures.h

diff --git a/lttv/lttv/sync/data_structures.h b/lttv/lttv/sync/data_structures.h
index 62a776a8847ba3f5fc8b81c368493ccbb147918f..014b7da105cc8172f836f42e3d21fac8ea49b437 100644 (file)
--- a/lttv/lttv/sync/data_structures.h
+++ b/lttv/lttv/sync/data_structures.h
@@ -23,8 +23,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <ltt/ltt.h>
-
 
 enum Direction
 {
@@ -36,7 +34,7 @@ enum EventType
 {
        TCP,
        UDP,
-       TYPE_COUNT, // This must be the last field
+       TYPE_COUNT // This must be the last field
 };
 
 // Stage 1 to 2: These structures are passed from processing to matching modules
@@ -79,10 +77,19 @@ typedef struct
        bool unicast;
 } UDPEvent;
 
+typedef struct
+{
+       uint32_t seconds;
+       uint32_t nanosec;
+} WallTime;
+
 typedef struct _Event
 {
        unsigned long traceNum;
-       uint64_t time;
+       // wallTime is corrected according to factors in trace struct, cpuTime
+       // is not
+       uint64_t cpuTime;
+       WallTime wallTime;
 
        // specific event structures and functions could be in separate files and
        // type could be an int
@@ -93,6 +100,7 @@ typedef struct _Event
                UDPEvent* udpEvent;
        } event;
 
+       void (*copy)(const struct _Event* const event, struct _Event** const newEvent);
        void (*destroy)(struct _Event* const event);
 } Event;
 
@@ -107,11 +115,13 @@ typedef struct _Message
 typedef struct
 {
        Message* message;
+       // Event* acks[]
        GQueue* acks;
 } Exchange;
 
 typedef struct
 {
+       // Event* events[]
        GQueue* events;
 } Broadcast;
 
@@ -142,10 +152,14 @@ void gdnDestroyDatagramKey(gpointer data);
 
 // Event-related functions
 void gdnDestroyEvent(gpointer data);
+void copyEvent(const Event* const event, Event** const newEvent);
+void copyTCPEvent(const Event* const event, Event** const newEvent);
+void copyUDPEvent(const Event* const event, Event** const newEvent);
 void destroyEvent(Event* const event);
 void destroyTCPEvent(Event* const event);
 void destroyUDPEvent(Event* const event);
 void gfDestroyEvent(gpointer data, gpointer user_data);
+double wallTimeSub(const WallTime const* tA, const WallTime const* tB);
 
 // Message-related functions
 void printTCPSegment(const Message* const segment);