Move some functions around to improve overall structure
authorBenjamin Poirier <benjamin.poirier@polymtl.ca>
Wed, 25 Nov 2009 20:57:01 +0000 (15:57 -0500)
committerBenjamin Poirier <benjamin.poirier@polymtl.ca>
Fri, 18 Dec 2009 19:04:17 +0000 (14:04 -0500)
Signed-off-by: Benjamin Poirier <benjamin.poirier@polymtl.ca>
lttv/lttv/Makefile.am
lttv/lttv/sync/event_analysis_chull.c
lttv/lttv/sync/event_analysis_eval.c
lttv/lttv/sync/event_matching_broadcast.c
lttv/lttv/sync/event_matching_tcp.c
lttv/lttv/sync/graph_functions.c
lttv/lttv/sync/graph_functions.h
lttv/lttv/sync/sync_chain.c [new file with mode: 0644]
lttv/lttv/sync/sync_chain.h
lttv/lttv/sync/sync_chain_lttv.c
lttv/modules/text/sync_chain_batch.c

index d468e7edbd34457f56478ace620c7021ad4a6dc2..e98dcbf4bfd8a8d96174138e0079eeeaf2e85e48 100644 (file)
@@ -55,6 +55,7 @@ lttv_real_SOURCES = \
        traceset.c\
        filter.c\
        print.c\
+       sync/sync_chain.c\
        sync/sync_chain_lttv.c\
        sync/graph_functions.c\
        sync/data_structures.c\
index c080235ce009e1713900a6f9bc7541fab306c987..b89f89ca01c643a267f88d2f2f2e0ccc86e92419 100644 (file)
@@ -192,7 +192,7 @@ static void openGraphFiles(SyncState* const syncState)
 
        analysisData= (AnalysisDataCHull*) syncState->analysisData;
 
-       cwd= changeToGraphDir(syncState->graphsDir);
+       cwd= changeToGraphsDir(syncState->graphsDir);
 
        analysisData->graphsData->hullPoints= malloc(syncState->traceNb *
                sizeof(FILE**));
index 88d732bb4bbace6ec012a687a3f3faf49776db7b..29b1b4493009eabdb2552174a81d289689e1462b 100644 (file)
@@ -309,7 +309,7 @@ static AnalysisHistogramEval* constructAnalysisHistogramEval(const char* const
        convertIP(saddr, rttKey->saddr);
        convertIP(daddr, rttKey->daddr);
 
-       cwd= changeToGraphDir(graphsDir);
+       cwd= changeToGraphsDir(graphsDir);
 
        for (i= 0; i < sizeof(loopValues) / sizeof(*loopValues); i++)
        {
@@ -1846,7 +1846,7 @@ static void writeAnalysisTraceTimeBackPlotsEval(SyncState* const syncState,
                snprintf(fileName, 40, "analysis_eval_accuracy-%03u_and_%03u.data", i, j);
                fileName[sizeof(fileName) - 1]= '\0';
 
-               cwd= changeToGraphDir(syncState->graphsDir);
+               cwd= changeToGraphsDir(syncState->graphsDir);
 
                if ((fp= fopen(fileName, "w")) == NULL)
                {
index ff45a8a71b7729848a6ef61d2918629211063482..1f3ec560b15a5caf322bd4be231e3c20d6f6926e 100644 (file)
@@ -369,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*));
index e9cdce925bf66630bd17db015b52e8a2b4dd0a40..8d4d8e322c484d4b453b2c47ec1bdd266b12b49d 100644 (file)
@@ -586,7 +586,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++)
index 48b66a3cd4bbb54b1945e870dbec53711dd1600d..6bd28b8091ed26354b1d7a308934543ac0556c3f 100644 (file)
@@ -21,6 +21,9 @@
 #endif
 
 #include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "graph_functions.h"
 
 
+/*
+ * Create the directory used to hold graphs and the header of the gnuplot
+ * script.
+ *
+ * Args:
+ *   graphsDir:    name of directory
+ *
+ * Returns:
+ *   The current working directory before the execution of the function. The
+ *   string must be free'd by the caller.
+ */
+FILE* createGraphsDir(const char* const graphsDir)
+{
+       char* cwd;
+       int graphsFp;
+       FILE* result;
+       int retval;
+
+       cwd= changeToGraphsDir(graphsDir);
+
+       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 ((result= fdopen(graphsFp, "w")) == NULL)
+       {
+               g_error(strerror(errno));
+       }
+
+       fprintf(result,
+               "#!/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);
+
+       return result;
+}
+
+
+/*
+ * Change to the directory used to hold graphs. Create it if necessary.
+ *
+ * Args:
+ *   graphsDir:    name of directory
+ *
+ * Returns:
+ *   The current working directory before the execution of the function. The
+ *   string must be free'd by the caller.
+ */
+char* changeToGraphsDir(const char* const graphsDir)
+{
+       int retval;
+       char* cwd;
+
+       cwd= getcwd(NULL, 0);
+       if (cwd == NULL)
+       {
+               g_error(strerror(errno));
+       }
+       while ((retval= chdir(graphsDir)) != 0)
+       {
+               if (errno == ENOENT)
+               {
+                       retval= mkdir(graphsDir, 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;
+}
+
+
+/*
+ * Call each graph variable, option and plot line function of each module to
+ * produce a gnuplot script.
+ *
+ * Args:
+ *   syncState:    container for synchronization data
+ */
 void writeGraphsScript(SyncState* const syncState)
 {
        unsigned int i, j, k, l, m;
index 55f9a13b6e4dfe6046d012f5405d1ea2b2cf866a..65517088556b71b85e0a5defa3bed737e472dbdc 100644 (file)
@@ -42,6 +42,8 @@ typedef struct
 } GraphFunctions;
 
 
+FILE* createGraphsDir(const char* const graphsDir);
+char* changeToGraphsDir(const char* const graphsDir);
 void writeGraphsScript(struct _SyncState* const syncState);
 
 #endif
diff --git a/lttv/lttv/sync/sync_chain.c b/lttv/lttv/sync/sync_chain.c
new file mode 100644 (file)
index 0000000..3059350
--- /dev/null
@@ -0,0 +1,123 @@
+/* This file is part of the Linux Trace Toolkit viewer
+ * Copyright (C) 2009 Benjamin Poirier <benjamin.poirier@polymtl.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License Version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <unistd.h>
+
+#include "sync_chain.h"
+
+
+GQueue processingModules= G_QUEUE_INIT;
+GQueue matchingModules= G_QUEUE_INIT;
+GQueue analysisModules= G_QUEUE_INIT;
+GQueue moduleOptions= G_QUEUE_INIT;
+
+
+/*
+ * 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);
+}
index c64fa93ef29dbd3a28f2de68c0788a28d1cbf52f..ee81308f1638d52c1b476ea32d5f7e682058b09c 100644 (file)
@@ -68,7 +68,6 @@ extern GQueue moduleOptions;
 
 void syncTraceset(LttvTracesetContext* const traceSetContext);
 
-char* changeToGraphDir(const char* const graphs);
 void timeDiff(struct timeval* const end, const struct timeval* const start);
 
 gint gcfCompareProcessing(gconstpointer a, gconstpointer b);
index c2ec05def08908d92221c089041a55999e9b439f..58ef078df37e4eca867023816bfbfabe53f737d4 100644 (file)
@@ -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()
  *
index 55ec91056f6397c1b8e1e997204e072136165946..c88b13c5962623fdf3491829d9e1c0bf4f91ae8a 100644 (file)
@@ -295,35 +295,10 @@ void setupSyncChain(LttvTracesetContext* const traceSetContext)
 
        if (optionEvalGraphs)
        {
-               char* cwd;
-               int graphsFp;
-
                // Create the graph directory right away in case the module initialization
                // functions have something to write in it.
                syncState->graphsDir= optionEvalGraphsDir;
-               cwd= changeToGraphDir(optionEvalGraphsDir);
-
-               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
        {
This page took 0.032911 seconds and 4 git commands to generate.