X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_matching_tcp.c;h=9ba8b63265463670db782c8dddb57b72f76890c3;hb=053b4b77c527fa96a7a24967da9b2d0f6ef68cfc;hp=9c3e6a9d3606bef458b2782160b8e4fb0ae46546;hpb=8d7d16dd4f5f6ae09f556a9b0b477baaa93d468c;p=lttv.git

diff --git a/lttv/lttv/sync/event_matching_tcp.c b/lttv/lttv/sync/event_matching_tcp.c
index 9c3e6a9d..9ba8b632 100644
--- a/lttv/lttv/sync/event_matching_tcp.c
+++ b/lttv/lttv/sync/event_matching_tcp.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <errno.h>
+#include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -31,11 +32,6 @@
 #include "event_matching_tcp.h"
 
 
-#ifndef g_info
-#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-#endif
-
-
 // Functions common to all matching modules
 static void initMatchingTCP(SyncState* const syncState);
 static void destroyMatchingTCP(SyncState* const syncState);
@@ -43,8 +39,8 @@ static void destroyMatchingTCP(SyncState* const syncState);
 static void matchEventTCP(SyncState* const syncState, Event* const event);
 static GArray* finalizeMatchingTCP(SyncState* const syncState);
 static void printMatchingStatsTCP(SyncState* const syncState);
-static void writeMatchingGraphsPlotsTCP(SyncState* const syncState, const
-	unsigned int i, const unsigned int j);
+static void writeMatchingGraphsPlotsTCPMessages(SyncState* const syncState,
+	const unsigned int i, const unsigned int j);
 
 // Functions specific to this module
 static void registerMatchingTCP() __attribute__((constructor (101)));
@@ -74,8 +70,9 @@ static MatchingModule matchingModuleTCP = {
 	.matchEvent= &matchEventTCP,
 	.finalizeMatching= &finalizeMatchingTCP,
 	.printMatchingStats= &printMatchingStatsTCP,
-	.writeMatchingGraphsPlots= &writeMatchingGraphsPlotsTCP,
-	.writeMatchingGraphsOptions= NULL,
+	.graphFunctions= {
+		.writeTraceTraceForePlots= &writeMatchingGraphsPlotsTCPMessages,
+	}
 };
 
 
@@ -590,7 +587,7 @@ static void openGraphDataFiles(SyncState* const syncState)
 
 	matchingData= (MatchingDataTCP*) syncState->matchingData;
 
-	cwd= changeToGraphDir(syncState->graphsDir);
+	cwd= changeToGraphsDir(syncState->graphsDir);
 
 	matchingData->messagePoints= malloc(syncState->traceNb * sizeof(FILE**));
 	for (i= 0; i < syncState->traceNb; i++)
@@ -634,7 +631,7 @@ static void openGraphDataFiles(SyncState* const syncState)
  */
 static void writeMessagePoint(FILE* stream, const Message* const message)
 {
-	LttCycleCount x, y;
+	uint64_t x, y;
 
 	if (message->inE->traceNum < message->outE->traceNum)
 	{
@@ -649,7 +646,7 @@ static void writeMessagePoint(FILE* stream, const Message* const message)
 		y= message->inE->cpuTime;
 	}
 
-	fprintf(stream, "%20llu %20llu\n", x, y);
+	fprintf(stream, "%20" PRIu64 " %20" PRIu64 "\n", x, y);
 }
 
 
@@ -702,8 +699,8 @@ static void closeGraphDataFiles(SyncState* const syncState)
  *   i:            first trace number
  *   j:            second trace number, garanteed to be larger than i
  */
-static void writeMatchingGraphsPlotsTCP(SyncState* const syncState, const
-	unsigned int i, const unsigned int j)
+static void writeMatchingGraphsPlotsTCPMessages(SyncState* const syncState,
+	const unsigned int i, const unsigned int j)
 {
 	fprintf(syncState->graphsStream,
 		"\t\"matching_tcp-%1$03d_to_%2$03d.data\" "