X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fdata_structures.c;h=7a9b16d42486f3219d1c7474bf35cf59cc245d77;hb=d5b038ec901e9753a8569f33516a49361c54254c;hp=d4c804b68523c20f7778ea4a6ae25060b8c0a3a5;hpb=76be6fc24daf61767bf7f0c2e64f4691fbb56c63;p=lttv.git

diff --git a/lttv/lttv/sync/data_structures.c b/lttv/lttv/sync/data_structures.c
index d4c804b6..7a9b16d4 100644
--- a/lttv/lttv/sync/data_structures.c
+++ b/lttv/lttv/sync/data_structures.c
@@ -34,10 +34,6 @@
 #include "data_structures.h"
 
 
-#ifndef g_info
-#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-#endif
-
 // TCP sequence numbers use clock arithmetic, these comparison functions take
 // that into account
 #define SEQ_LT(a,b)     ((int32_t)((a)-(b)) < 0)
@@ -99,15 +95,12 @@ bool isAcking(const Message* const ackSegment, const Message* const
  * Convert an IP address from 32 bit form to dotted quad
  *
  * Args:
- *   str:          A preallocated string of length >= 17
+ *   str:          A preallocated string of length >= 16
  *   addr:         Address
  */
 void convertIP(char* const str, const uint32_t addr)
 {
-	struct in_addr iaddr;
-
-	iaddr.s_addr= htonl(addr);
-	strcpy(str, inet_ntoa(iaddr));
+	strcpy(str, inet_ntoa((struct in_addr) {.s_addr= addr}));
 }
 
 
@@ -116,7 +109,7 @@ void convertIP(char* const str, const uint32_t addr)
  */
 void printTCPSegment(const Message* const segment)
 {
-	char saddr[17], daddr[17];
+	char saddr[16], daddr[16];
 	SegmentKey* segmentKey;
 
 	g_assert(segment->inE->type == TCP);
@@ -241,8 +234,6 @@ void gdnTCPSegmentListDestroy(gpointer data)
 
 	list= (GQueue*) data;
 
-	g_debug("XXXX gdnTCPSegmentListDestroy\n");
-
 	g_queue_foreach(list, &gfTCPSegmentDestroy, NULL);
 	g_queue_free(list);
 }
@@ -257,7 +248,6 @@ void gdnTCPSegmentListDestroy(gpointer data)
  */
 void gfTCPSegmentDestroy(gpointer data, gpointer user_data)
 {
-	g_debug("XXXX gfTCPSegmentDestroy\n");
 	destroyTCPSegment((Message*) data);
 }
 
@@ -273,7 +263,6 @@ void destroyTCPSegment(Message* const segment)
 {
 	TCPEvent* inE, *outE;
 
-	g_debug("XXXX destroyTCPSegment");
 	segment->print(segment);
 
 	g_assert(segment->inE != NULL && segment->outE != NULL);
@@ -329,6 +318,7 @@ void destroyTCPEvent(Event* const event)
 	destroyEvent(event);
 }
 
+
 /*
  * Free the memory used by a base Event
  */
@@ -545,7 +535,7 @@ void gdnDestroyBroadcast(gpointer data)
 void destroyBroadcast(Broadcast* const broadcast)
 {
 	g_queue_foreach(broadcast->events, &gfDestroyEvent, NULL);
-	g_queue_clear(broadcast->events);
+	g_queue_free(broadcast->events);
 	free(broadcast);
 }
 
@@ -576,5 +566,82 @@ void gfDestroyEvent(gpointer data, gpointer user_data)
  */
 double wallTimeSub(const WallTime const* tA, const WallTime const* tB)
 {
-	return tA->seconds - tB->seconds + (tA->nanosec - tB->nanosec) / 1e9;
+	return (double) tA->seconds - tB->seconds + ((double) tA->nanosec - tB->nanosec) / 1e9;
+}
+
+
+/*
+ * Allocate and copy a base event
+ *
+ * Args:
+ *   newEvent:     new event, pointer will be updated
+ *   event:        event to copy
+ */
+void copyEvent(const Event* const event, Event** const newEvent)
+{
+	g_assert(event->event.tcpEvent == NULL);
+
+	*newEvent= malloc(sizeof(Event));
+	memcpy(*newEvent, event, sizeof(Event));
+}
+
+
+/*
+ * Allocate and copy a TCP event
+ *
+ * Args:
+ *   newEvent:     new event, pointer will be updated
+ *   event:        event to copy
+ */
+void copyTCPEvent(const Event* const event, Event** const newEvent)
+{
+	g_assert(event->type == TCP);
+
+	*newEvent= malloc(sizeof(Event));
+	memcpy(*newEvent, event, sizeof(Event));
+
+	(*newEvent)->event.tcpEvent= malloc(sizeof(TCPEvent));
+	memcpy((*newEvent)->event.tcpEvent, event->event.tcpEvent,
+		sizeof(TCPEvent));
+
+	(*newEvent)->event.tcpEvent->segmentKey= malloc(sizeof(SegmentKey));
+	memcpy((*newEvent)->event.tcpEvent->segmentKey,
+		event->event.tcpEvent->segmentKey, sizeof(SegmentKey));
+}
+
+
+/*
+ * Allocate and copy a UDP event
+ *
+ * Args:
+ *   newEvent:     new event, pointer will be updated
+ *   event:        event to copy
+ */
+void copyUDPEvent(const Event* const event, Event** const newEvent)
+{
+	g_assert(event->type == UDP);
+
+	*newEvent= malloc(sizeof(Event));
+	memcpy(*newEvent, event, sizeof(Event));
+
+	(*newEvent)->event.udpEvent= malloc(sizeof(UDPEvent));
+	memcpy((*newEvent)->event.udpEvent, event->event.udpEvent,
+		sizeof(UDPEvent));
+
+	(*newEvent)->event.udpEvent->datagramKey= malloc(sizeof(DatagramKey));
+	memcpy((*newEvent)->event.udpEvent->datagramKey,
+		event->event.udpEvent->datagramKey, sizeof(DatagramKey));
+}
+
+
+/*
+ * A GFunc for g_queue_foreach()
+ *
+ * Args:
+ *   data          Event*, event to add
+ *   user_data     GArray*, array to add to
+ */
+void gfAddEventToArray(gpointer data, gpointer user_data)
+{
+	g_array_append_val((GArray*) user_data, data);
 }