X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fsync_chain_lttv.c;h=640042d1c61c92e583a9972874d998ab28578357;hb=1ed11971aebed2cf6c9b9f212adb36c50487266f;hp=fbbf7dfed4f59ba8a3518151a66b00a993217f56;hpb=fafb0a2998296c564cbc26c2c0fa5142b181b332;p=lttv.git diff --git a/lttv/lttv/sync/sync_chain_lttv.c b/lttv/lttv/sync/sync_chain_lttv.c index fbbf7dfe..640042d1 100644 --- a/lttv/lttv/sync/sync_chain_lttv.c +++ b/lttv/lttv/sync/sync_chain_lttv.c @@ -34,38 +34,28 @@ #include #include "sync_chain.h" +#include "sync_chain_lttv.h" static void init(); static void destroy(); -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", .hasArg= NO_ARG, - {.present= false}, .optionHelp= "synchronize the time between the traces", }; -static char graphsDir[20]; static ModuleOption optionSyncStats= { .longName= "sync-stats", .hasArg= NO_ARG, - {.present= false}, .optionHelp= "print statistics about the time synchronization", }; static ModuleOption optionSyncNull= { .longName= "sync-null", .hasArg= NO_ARG, - {.present= false}, .optionHelp= "read the events but do not perform any processing", }; static GString* analysisModulesNames; @@ -77,15 +67,16 @@ static ModuleOption optionSyncAnalysis= { static ModuleOption optionSyncGraphs= { .longName= "sync-graphs", .hasArg= NO_ARG, - {.present= false}, .optionHelp= "output gnuplot graph showing synchronization points", }; +static char graphsDir[20]; static ModuleOption optionSyncGraphsDir= { .longName= "sync-graphs-dir", .hasArg= REQUIRED_ARG, .optionHelp= "specify the directory where to store the graphs", }; + /* * Module init function * @@ -101,10 +92,10 @@ static void init() { int retval; - g_debug("\t\t\tXXXX sync init\n"); + g_debug("Sync init"); g_assert(g_queue_get_length(&analysisModules) > 0); - optionSyncAnalysis.arg = ((AnalysisModule*) + optionSyncAnalysis.arg= ((AnalysisModule*) g_queue_peek_head(&analysisModules))->name; analysisModulesNames= g_string_new(""); g_queue_foreach(&analysisModules, &gfAppendAnalysisName, @@ -129,7 +120,6 @@ static void init() g_queue_push_head(&moduleOptions, &optionSync); g_queue_foreach(&moduleOptions, &gfAddModuleOption, NULL); - } @@ -138,7 +128,7 @@ static void init() */ static void destroy() { - g_debug("\t\t\tXXXX sync destroy\n"); + g_debug("Sync destroy"); g_queue_foreach(&moduleOptions, &gfRemoveModuleOption, NULL); g_string_free(analysisModulesNames, TRUE); @@ -181,7 +171,6 @@ void syncTraceset(LttvTracesetContext* const traceSetContext) // Initialize data structures syncState= malloc(sizeof(SyncState)); - syncState->traceNb= lttv_traceset_number(traceSetContext->ts); if (optionSyncStats.present) { @@ -192,37 +181,12 @@ void syncTraceset(LttvTracesetContext* const traceSetContext) syncState->stats= false; } - if (optionSyncGraphs.present) + if (!optionSyncNull.present && 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 { @@ -262,12 +226,12 @@ void syncTraceset(LttvTracesetContext* const traceSetContext) g_error("Analysis module '%s' not found", optionSyncAnalysis.arg); } + syncState->processingModule->initProcessing(syncState, traceSetContext); if (!optionSyncNull.present) { - syncState->analysisModule->initAnalysis(syncState); syncState->matchingModule->initMatching(syncState); + syncState->analysisModule->initAnalysis(syncState); } - syncState->processingModule->initProcessing(syncState, traceSetContext); // Process traceset lttv_process_traceset_seek_time(traceSetContext, ltt_time_zero); @@ -278,7 +242,7 @@ void syncTraceset(LttvTracesetContext* const traceSetContext) syncState->processingModule->finalizeProcessing(syncState); // Write graphs file - if (optionSyncGraphs.present) + if (!optionSyncNull.present && optionSyncGraphs.present) { writeGraphsScript(syncState); @@ -288,21 +252,10 @@ void syncTraceset(LttvTracesetContext* const traceSetContext) } } - if (syncState->processingModule->printProcessingStats != NULL) - { - syncState->processingModule->printProcessingStats(syncState); - } - if (syncState->matchingModule->printMatchingStats != NULL) + if (!optionSyncNull.present && optionSyncStats.present) { - syncState->matchingModule->printMatchingStats(syncState); - } - if (syncState->analysisModule->printAnalysisStats != NULL) - { - syncState->analysisModule->printAnalysisStats(syncState); - } + printStats(syncState); - if (optionSyncStats.present) - { printf("Resulting synchronization factors:\n"); for (i= 0; i < syncState->traceNb; i++) { @@ -349,154 +302,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() - * - * Concatenate analysis module names. - * - * Args: - * data: AnalysisModule* - * user_data: GString*, concatenated names - */ -static void gfAppendAnalysisName(gpointer data, gpointer user_data) -{ - g_string_append((GString*) user_data, ((AnalysisModule*) data)->name); - g_string_append((GString*) 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() * @@ -506,18 +311,33 @@ char* changeToGraphDir(const char* const graphs) */ static void gfAddModuleOption(gpointer data, gpointer user_data) { - ModuleOption* option; + ModuleOption* option= data; LttvOptionType conversion[]= { [NO_ARG]= LTTV_OPT_NONE, + [OPTIONAL_ARG]= LTTV_OPT_NONE, [REQUIRED_ARG]= LTTV_OPT_STRING, }; + size_t fieldOffset[]= { + [NO_ARG]= offsetof(ModuleOption, present), + [REQUIRED_ARG]= offsetof(ModuleOption, arg), + }; + static const char* argHelpNone= "none"; g_assert_cmpuint(sizeof(conversion) / sizeof(*conversion), ==, HAS_ARG_COUNT); - option= (ModuleOption*) data; - lttv_option_add(option->longName, '\0', option->optionHelp, - option->argHelp ? option->argHelp : argHelpNone, - conversion[option->hasArg], &option->arg, NULL, NULL); + if (option->hasArg == OPTIONAL_ARG) + { + g_warning("Parameters with optional arguments not supported by the " + "lttv option scheme, parameter '%s' will not be available", + option->longName); + } + else + { + lttv_option_add(option->longName, '\0', option->optionHelp, + option->argHelp ? option->argHelp : argHelpNone, + conversion[option->hasArg], (void*) option + fieldOffset[option->hasArg], + NULL, NULL); + } }