Move some functions around to improve overall structure

[lttv.git] / lttv / lttv / sync / event_matching_broadcast.c

diff --git a/lttv/lttv/sync/event_matching_broadcast.c b/lttv/lttv/sync/event_matching_broadcast.c
index 98bab58abd69fd26b828aff9488f9508715b3f83..1f3ec560b15a5caf322bd4be231e3c20d6f6926e 100644 (file)
--- a/lttv/lttv/sync/event_matching_broadcast.c
+++ b/lttv/lttv/sync/event_matching_broadcast.c
@@ -31,11 +31,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);
@@ -54,7 +49,6 @@ static void partialDestroyMatchingBroadcast(SyncState* const syncState);
 static void openGraphDataFiles(SyncState* const syncState);
 static void writeAccuracyPoints(MatchingGraphsBroadcast* graphs, const
        Broadcast* const broadcast);
-void gfAddToArray(gpointer data, gpointer user_data);
 static void closeGraphDataFiles(SyncState* const syncState);
 
 
@@ -67,8 +61,9 @@ static MatchingModule matchingModuleBroadcast = {
        .matchEvent= &matchEventBroadcast,
        .finalizeMatching= &finalizeMatchingBroadcast,
        .printMatchingStats= &printMatchingStatsBroadcast,
-       .writeMatchingGraphsPlots= &writeMatchingGraphsPlotsBroadcast,
-       .writeMatchingGraphsOptions= NULL,
+       .graphFunctions= {
+               .writeTraceTimeForePlots= &writeMatchingGraphsPlotsBroadcast,
+       }
 };
 
 
@@ -374,7 +369,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*));
@@ -418,7 +413,7 @@ static void writeAccuracyPoints(MatchingGraphsBroadcast* graphs, const
        unsigned int eventNb= broadcast->events->length;
 
        events= g_array_sized_new(FALSE, FALSE, sizeof(Event*), eventNb);
-       g_queue_foreach(broadcast->events, &gfAddToArray, events);
+       g_queue_foreach(broadcast->events, &gfAddEventToArray, events);
 
        for (i= 0; i < eventNb; i++)
        {
@@ -430,25 +425,14 @@ static void writeAccuracyPoints(MatchingGraphsBroadcast* graphs, const
                        if (eventI->traceNum < eventJ->traceNum)
                        {
                                fprintf(graphs->accuracyPoints[eventJ->traceNum][eventI->traceNum],
-                                       "%20llu %20lld\n", eventI->cpuTime, (int64_t) eventJ->cpuTime -
-                                       eventI->cpuTime);
+                                       "%20llu %20.9f\n", eventI->cpuTime,
+                                       wallTimeSub(&eventJ->wallTime, &eventI->wallTime));
                                graphs->pointsNb[eventJ->traceNum][eventI->traceNum]++;
                        }
                }
        }
-}
-
 
-/*
- * A GFunc for g_queue_foreach()
- *
- * Args:
- *   data          Event*, event to add
- *   user_data     GArray*, array to add to
- */
-void gfAddToArray(gpointer data, gpointer user_data)
-{
-       g_array_append_val((GArray*) user_data, data);
+       g_array_free(events, TRUE);
 }
 
 
@@ -505,7 +489,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);
        }