Move some functions around to improve overall structure

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

diff --git a/lttv/lttv/sync/sync_chain_lttv.c b/lttv/lttv/sync/sync_chain_lttv.c
index c2ec05def08908d92221c089041a55999e9b439f..58ef078df37e4eca867023816bfbfabe53f737d4 100644 (file)
--- a/lttv/lttv/sync/sync_chain_lttv.c
+++ b/lttv/lttv/sync/sync_chain_lttv.c
@@ -43,11 +43,6 @@ static void gfAppendAnalysisName(gpointer data, gpointer user_data);
 static void gfAddModuleOption(gpointer data, gpointer user_data);
 static void gfRemoveModuleOption(gpointer data, gpointer user_data);
 
-GQueue processingModules= G_QUEUE_INIT;
-GQueue matchingModules= G_QUEUE_INIT;
-GQueue analysisModules= G_QUEUE_INIT;
-GQueue moduleOptions= G_QUEUE_INIT;
-
 static char* argHelpNone= "none";
 static ModuleOption optionSync= {
        .longName= "sync",
@@ -194,35 +189,10 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 
        if (optionSyncGraphs.present)
        {
-               char* cwd;
-               int graphsFp;
-
                // Create the graph directory right away in case the module initialization
                // functions have something to write in it.
                syncState->graphsDir= optionSyncGraphsDir.arg;
-               cwd= changeToGraphDir(optionSyncGraphsDir.arg);
-
-               if ((graphsFp= open("graphs.gnu", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR |
-                               S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH
-                               | S_IWOTH | S_IXOTH)) == -1)
-               {
-                       g_error(strerror(errno));
-               }
-               if ((syncState->graphsStream= fdopen(graphsFp, "w")) == NULL)
-               {
-                       g_error(strerror(errno));
-               }
-
-               fprintf(syncState->graphsStream,
-                       "#!/usr/bin/gnuplot\n\n"
-                       "set terminal postscript eps color size 8in,6in\n");
-
-               retval= chdir(cwd);
-               if (retval == -1)
-               {
-                       g_error(strerror(errno));
-               }
-               free(cwd);
+               syncState->graphsStream= createGraphsDir(syncState->graphsDir);
        }
        else
        {
@@ -349,97 +319,6 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 }
 
 
-/*
- * Calculate the elapsed time between two timeval values
- *
- * Args:
- *   end:          end time, result is also stored in this structure
- *   start:        start time
- */
-void timeDiff(struct timeval* const end, const struct timeval* const start)
-{
-               if (end->tv_usec >= start->tv_usec)
-               {
-                       end->tv_sec-= start->tv_sec;
-                       end->tv_usec-= start->tv_usec;
-               }
-               else
-               {
-                       end->tv_sec= end->tv_sec - start->tv_sec - 1;
-                       end->tv_usec= end->tv_usec - start->tv_usec + 1e6;
-               }
-}
-
-
-/*
- * A GCompareFunc for g_slist_find_custom()
- *
- * Args:
- *   a:            ProcessingModule*, element's data
- *   b:            char*, user data to compare against
- *
- * Returns:
- *   0 if the processing module a's name is b
- */
-gint gcfCompareProcessing(gconstpointer a, gconstpointer b)
-{
-       const ProcessingModule* processingModule;
-       const char* name;
-
-       processingModule= (const ProcessingModule*) a;
-       name= (const char*) b;
-
-       return strncmp(processingModule->name, name,
-               strlen(processingModule->name) + 1);
-}
-
-
-/*
- * A GCompareFunc for g_slist_find_custom()
- *
- * Args:
- *   a:            MatchingModule*, element's data
- *   b:            char*, user data to compare against
- *
- * Returns:
- *   0 if the matching module a's name is b
- */
-gint gcfCompareMatching(gconstpointer a, gconstpointer b)
-{
-       const MatchingModule* matchingModule;
-       const char* name;
-
-       matchingModule= (const MatchingModule*) a;
-       name= (const char*) b;
-
-       return strncmp(matchingModule->name, name, strlen(matchingModule->name) +
-               1);
-}
-
-
-/*
- * A GCompareFunc for g_slist_find_custom()
- *
- * Args:
- *   a:            AnalysisModule*, element's data
- *   b:            char*, user data to compare against
- *
- * Returns:
- *   0 if the analysis module a's name is b
- */
-gint gcfCompareAnalysis(gconstpointer a, gconstpointer b)
-{
-       const AnalysisModule* analysisModule;
-       const char* name;
-
-       analysisModule= (const AnalysisModule*) a;
-       name= (const char*) b;
-
-       return strncmp(analysisModule->name, name, strlen(analysisModule->name) +
-               1);
-}
-
-
 /*
  * A GFunc for g_queue_foreach()
  *
@@ -456,47 +335,6 @@ static void gfAppendAnalysisName(gpointer data, gpointer user_data)
 }
 
 
-/*
- * Change to the directory used to hold graphs. Create it if necessary.
- *
- * Args:
- *   graph:        name of directory
- *
- * Returns:
- *   The current working directory before the execution of the function. The
- *   string must be free'd by the caller.
- */
-char* changeToGraphDir(const char* const graphs)
-{
-       int retval;
-       char* cwd;
-
-       cwd= getcwd(NULL, 0);
-       if (cwd == NULL)
-       {
-               g_error(strerror(errno));
-       }
-       while ((retval= chdir(graphs)) != 0)
-       {
-               if (errno == ENOENT)
-               {
-                       retval= mkdir(graphs, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP |
-                               S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH);
-                       if (retval != 0)
-                       {
-                               g_error(strerror(errno));
-                       }
-               }
-               else
-               {
-                       g_error(strerror(errno));
-               }
-       }
-
-       return cwd;
-}
-
-
 /*
  * A GFunc for g_queue_foreach()
  *