X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_processing_lttng_standard.c;h=b79ca4af27d3cab4545eb79b8dc037d0280ef8c8;hb=d4721e1a5216f34570d7e10257f85601cb3991bc;hp=a8c08aaf05a1e2924d194e12c64933ba6a503965;hpb=f6691532b67cb6911749118e3da8d74de876380c;p=lttv.git

diff --git a/lttv/lttv/sync/event_processing_lttng_standard.c b/lttv/lttv/sync/event_processing_lttng_standard.c
index a8c08aaf..b79ca4af 100644
--- a/lttv/lttv/sync/event_processing_lttng_standard.c
+++ b/lttv/lttv/sync/event_processing_lttng_standard.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "sync_chain_lttv.h"
+#include "sync_chain.h"
 #include "event_processing_lttng_common.h"
 
 #include "event_processing_lttng_standard.h"
@@ -370,8 +370,9 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 	LttvTraceHook* traceHook;
 	LttvTracefileContext* tfc;
 	LttEvent* event;
-	LttTime time;
 	LttCycleCount tsc;
+	LttTime time;
+	WallTime wTime;
 	LttTrace* trace;
 	unsigned long traceNum;
 	struct marker_info* info;
@@ -380,19 +381,21 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
 	traceHook= (LttvTraceHook*) hookData;
 	tfc= (LttvTracefileContext*) callData;
+	trace= tfc->t_context->t;
 	syncState= (SyncState*) traceHook->hook_data;
 	processingData= (ProcessingDataLTTVStandard*) syncState->processingData;
 	event= ltt_tracefile_get_event(tfc->tf);
-	time= ltt_event_time(event);
-	tsc= ltt_event_cycle_count(event);
-	trace= tfc->t_context->t;
 	info= marker_get_info_from_id(tfc->tf->mdata, event->event_id);
+	tsc= ltt_event_cycle_count(event);
+	time= ltt_event_time(event);
+	wTime.seconds= time.tv_sec;
+	wTime.nanosec= time.tv_nsec;
 
 	g_assert(g_hash_table_lookup_extended(processingData->traceNumTable,
 			trace, NULL, (gpointer*) &traceNum));
 
 	g_debug("XXXX process event: time: %ld.%09ld trace: %ld (%p) name: %s ",
-		(long) time.tv_sec, time.tv_nsec, traceNum, trace,
+		time.tv_sec, time.tv_nsec, traceNum, trace,
 		g_quark_to_string(info->name));
 
 	if (info->name == LTT_EVENT_DEV_XMIT_EXTENDED)
@@ -419,18 +422,20 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
 		outE= malloc(sizeof(Event));
 		outE->traceNum= traceNum;
-		outE->time= tsc;
+		outE->cpuTime= tsc;
+		outE->wallTime= wTime;
 		outE->type= TCP;
+		outE->copy= &copyTCPEvent;
 		outE->destroy= &destroyTCPEvent;
 		outE->event.tcpEvent= malloc(sizeof(TCPEvent));
 		outE->event.tcpEvent->direction= OUT;
 		outE->event.tcpEvent->segmentKey= malloc(sizeof(SegmentKey));
 		outE->event.tcpEvent->segmentKey->connectionKey.saddr=
-			ltt_event_get_unsigned(event, lttv_trace_get_hook_field(traceHook,
-					3));
+			htonl(ltt_event_get_unsigned(event,
+					lttv_trace_get_hook_field(traceHook, 3)));
 		outE->event.tcpEvent->segmentKey->connectionKey.daddr=
-			ltt_event_get_unsigned(event, lttv_trace_get_hook_field(traceHook,
-					4));
+			htonl(ltt_event_get_unsigned(event,
+					lttv_trace_get_hook_field(traceHook, 4)));
 		outE->event.tcpEvent->segmentKey->tot_len=
 			ltt_event_get_unsigned(event, lttv_trace_get_hook_field(traceHook,
 					5));
@@ -486,8 +491,10 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
 			inE= malloc(sizeof(Event));
 			inE->traceNum= traceNum;
-			inE->time= tsc;
+			inE->cpuTime= tsc;
+			inE->wallTime= wTime;
 			inE->event.tcpEvent= NULL;
+			inE->copy= &copyEvent;
 			inE->destroy= &destroyEvent;
 
 			skb= (void*) (long) ltt_event_get_long_unsigned(event,
@@ -530,15 +537,16 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
 			inE->type= TCP;
 			inE->event.tcpEvent= malloc(sizeof(TCPEvent));
+			inE->copy= &copyTCPEvent;
 			inE->destroy= &destroyTCPEvent;
 			inE->event.tcpEvent->direction= IN;
 			inE->event.tcpEvent->segmentKey= malloc(sizeof(SegmentKey));
 			inE->event.tcpEvent->segmentKey->connectionKey.saddr=
-				ltt_event_get_unsigned(event,
-					lttv_trace_get_hook_field(traceHook, 1));
+				htonl(ltt_event_get_unsigned(event,
+						lttv_trace_get_hook_field(traceHook, 1)));
 			inE->event.tcpEvent->segmentKey->connectionKey.daddr=
-				ltt_event_get_unsigned(event,
-					lttv_trace_get_hook_field(traceHook, 2));
+				htonl(ltt_event_get_unsigned(event,
+						lttv_trace_get_hook_field(traceHook, 2)));
 			inE->event.tcpEvent->segmentKey->tot_len=
 				ltt_event_get_unsigned(event,
 					lttv_trace_get_hook_field(traceHook, 3));
@@ -608,15 +616,16 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
 			inE->type= UDP;
 			inE->event.udpEvent= malloc(sizeof(UDPEvent));
+			inE->copy= &copyUDPEvent;
 			inE->destroy= &destroyUDPEvent;
 			inE->event.udpEvent->direction= IN;
 			inE->event.udpEvent->datagramKey= malloc(sizeof(DatagramKey));
 			inE->event.udpEvent->datagramKey->saddr=
-				ltt_event_get_unsigned(event,
-					lttv_trace_get_hook_field(traceHook, 1));
+				htonl(ltt_event_get_unsigned(event,
+					lttv_trace_get_hook_field(traceHook, 1)));
 			inE->event.udpEvent->datagramKey->daddr=
-				ltt_event_get_unsigned(event,
-					lttv_trace_get_hook_field(traceHook, 2));
+				htonl(ltt_event_get_unsigned(event,
+					lttv_trace_get_hook_field(traceHook, 2)));
 			inE->event.udpEvent->unicast= ltt_event_get_unsigned(event,
 				lttv_trace_get_hook_field(traceHook, 3)) == 0 ? false : true;
 			inE->event.udpEvent->datagramKey->ulen=