X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_matching_broadcast.c;h=1bc5d75e510492a5e18006ab97490d2cf154009e;hb=2f961b65e3422f23019286e9531b0a40070278ea;hp=ca5375b794bb618e0c4ce90d3d98d20d8012f0d8;hpb=c6356aa749f534f9bc0aa6315d41bff0e69a6ef9;p=lttv.git

diff --git a/lttv/lttv/sync/event_matching_broadcast.c b/lttv/lttv/sync/event_matching_broadcast.c
index ca5375b7..1bc5d75e 100644
--- a/lttv/lttv/sync/event_matching_broadcast.c
+++ b/lttv/lttv/sync/event_matching_broadcast.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_broadcast.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 initMatchingBroadcast(SyncState* const syncState);
 static void destroyMatchingBroadcast(SyncState* const syncState);
@@ -47,8 +43,6 @@ static void writeMatchingGraphsPlotsBroadcast(SyncState* const syncState, const
 	unsigned int i, const unsigned int j);
 
 // Functions specific to this module
-static void registerMatchingBroadcast() __attribute__((constructor (101)));
-
 static void partialDestroyMatchingBroadcast(SyncState* const syncState);
 
 static void openGraphDataFiles(SyncState* const syncState);
@@ -75,7 +69,7 @@ static MatchingModule matchingModuleBroadcast = {
 /*
  * Matching module registering function
  */
-static void registerMatchingBroadcast()
+void registerMatchingBroadcast()
 {
 	g_queue_push_tail(&matchingModules, &matchingModuleBroadcast);
 }
@@ -374,7 +368,7 @@ static void openGraphDataFiles(SyncState* const syncState)
 	MatchingGraphsBroadcast* graphs= ((MatchingDataBroadcast*)
 		syncState->matchingData)->graphs;
 
-	cwd= changeToGraphDir(syncState->graphsDir);
+	cwd= changeToGraphsDir(syncState->graphsDir);
 
 	graphs->accuracyPoints= malloc(syncState->traceNb * sizeof(FILE**));
 	graphs->pointsNb= malloc(syncState->traceNb * sizeof(unsigned int*));
@@ -430,7 +424,7 @@ static void writeAccuracyPoints(MatchingGraphsBroadcast* graphs, const
 			if (eventI->traceNum < eventJ->traceNum)
 			{
 				fprintf(graphs->accuracyPoints[eventJ->traceNum][eventI->traceNum],
-					"%20llu %20.9f\n", eventI->cpuTime,
+					"%20" PRIu64 " %20.9f\n", eventI->cpuTime,
 					wallTimeSub(&eventJ->wallTime, &eventI->wallTime));
 				graphs->pointsNb[eventJ->traceNum][eventI->traceNum]++;
 			}
@@ -494,7 +488,7 @@ static void writeMatchingGraphsPlotsBroadcast(SyncState* const syncState, const
 	{
 		fprintf(syncState->graphsStream,
 			"\t\"matching_broadcast-%03d_and_%03d.data\" "
-				"title \"Broadcast delays\" with points "
+				"title \"Broadcast differential delays\" with points "
 				"linecolor rgb \"black\" pointtype 6 pointsize 2, \\\n", i,
 				j);
 	}