X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Ftext%2Fsync_chain_batch.c;h=86d4a2aa710c7794e68029b4a52aff0de07d3f1e;hb=8d7d16dd4f5f6ae09f556a9b0b477baaa93d468c;hp=3dfc72878591cd7472c68829c08de0253f410166;hpb=d4721e1a5216f34570d7e10257f85601cb3991bc;p=lttv.git diff --git a/lttv/modules/text/sync_chain_batch.c b/lttv/modules/text/sync_chain_batch.c index 3dfc7287..86d4a2aa 100644 --- a/lttv/modules/text/sync_chain_batch.c +++ b/lttv/modules/text/sync_chain_batch.c @@ -54,7 +54,6 @@ struct TracesetChainState { SyncState* syncState; struct timeval startTime; struct rusage startUsage; - FILE* graphsStream; }; static LttvHooks* before_traceset, * before_trace, * event_hook, * after_traceset; @@ -124,7 +123,7 @@ static void init() "synchronization points", "none", LTTV_OPT_NONE, &optionEvalGraphs, NULL, NULL); - retval= snprintf(graphsDir, sizeof(graphsDir), "graphs-%d", getpid()); + retval= snprintf(graphsDir, sizeof(graphsDir), "eval-graphs-%d", getpid()); if (retval > sizeof(graphsDir) - 1) { graphsDir[sizeof(graphsDir) - 1]= '\0'; @@ -295,23 +294,14 @@ void setupSyncChain(LttvTracesetContext* const traceSetContext) syncState->stats= true; if (optionEvalGraphs) - { - syncState->graphs= optionEvalGraphsDir; - } - else - { - syncState->graphs= NULL; - } - - tracesetChainState->graphsStream= NULL; - if (syncState->graphs) { char* cwd; int graphsFp; // Create the graph directory right away in case the module initialization // functions have something to write in it. - cwd= changeToGraphDir(syncState->graphs); + 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 @@ -319,7 +309,7 @@ void setupSyncChain(LttvTracesetContext* const traceSetContext) { g_error(strerror(errno)); } - if ((tracesetChainState->graphsStream= fdopen(graphsFp, "w")) == NULL) + if ((syncState->graphsStream= fdopen(graphsFp, "w")) == NULL) { g_error(strerror(errno)); } @@ -331,6 +321,11 @@ void setupSyncChain(LttvTracesetContext* const traceSetContext) } free(cwd); } + else + { + syncState->graphsStream= NULL; + syncState->graphsDir= NULL; + } syncState->analysisData= NULL; result= g_queue_find_custom(&analysisModules, "eval", @@ -339,7 +334,8 @@ void setupSyncChain(LttvTracesetContext* const traceSetContext) syncState->analysisModule->initAnalysis(syncState); syncState->matchingData= NULL; - result= g_queue_find_custom(&matchingModules, "broadcast", &gcfCompareMatching); + result= g_queue_find_custom(&matchingModules, "distributor", + &gcfCompareMatching); syncState->matchingModule= (MatchingModule*) result->data; syncState->matchingModule->initMatching(syncState); @@ -363,6 +359,7 @@ void teardownSyncChain(LttvTracesetContext* const traceSetContext) SyncState* syncState; struct timeval endTime; struct rusage endUsage; + unsigned int i, j; int retval; tracesetChainState= g_hash_table_lookup(tracesetChainStates, traceSetContext); @@ -371,11 +368,9 @@ void teardownSyncChain(LttvTracesetContext* const traceSetContext) syncState->processingModule->finalizeProcessing(syncState); // Write graphs file - if (tracesetChainState->graphsStream != NULL) + if (optionEvalGraphs) { - unsigned int i, j; - - fprintf(tracesetChainState->graphsStream, + fprintf(syncState->graphsStream, "#!/usr/bin/gnuplot\n\n" "set terminal postscript eps color size 8in,6in\n"); @@ -384,45 +379,60 @@ void teardownSyncChain(LttvTracesetContext* const traceSetContext) { for (j= i + 1; j < syncState->traceNb; j++) { - long pos; + long pos1, pos2, trunc; - fprintf(tracesetChainState->graphsStream, + fprintf(syncState->graphsStream, "\nset output \"%03d-%03d.eps\"\n" "plot \\\n", i, j); + pos1= ftell(syncState->graphsStream); - syncState->processingModule->writeProcessingGraphsPlots(tracesetChainState->graphsStream, - syncState, i, j); + if (syncState->analysisModule->writeAnalysisGraphsPlots) + { + syncState->analysisModule->writeAnalysisGraphsPlots(syncState, + i, j); + } - // Remove the ", \\\n" from the last graph plot line - fflush(tracesetChainState->graphsStream); - pos= ftell(tracesetChainState->graphsStream); - if (ftruncate(fileno(tracesetChainState->graphsStream), pos - 4) == -1) + fflush(syncState->graphsStream); + pos2= ftell(syncState->graphsStream); + if (pos1 != pos2) + { + // Remove the ", \\\n" from the last graph plot line + trunc= pos2 - 4; + } + else + { + // Remove the "plot \\\n" line to avoid creating an invalid + // gnuplot script + trunc= pos2 - 7; + } + + if (ftruncate(fileno(syncState->graphsStream), trunc) == -1) { g_error(strerror(errno)); } - if (fseek(tracesetChainState->graphsStream, 0, SEEK_END) == -1) + if (fseek(syncState->graphsStream, 0, SEEK_END) == -1) { g_error(strerror(errno)); } - fprintf(tracesetChainState->graphsStream, + fprintf(syncState->graphsStream, "\nset output \"%1$03d-%2$03d.eps\"\n" - "set key inside right bottom\n" - "set title \"\"\n" - "set xlabel \"Clock %1$u\"\n" - "set xtics nomirror\n" - "set ylabel \"Clock %2$u\"\n" - "set ytics nomirror\n", i, j); - - syncState->processingModule->writeProcessingGraphsOptions(tracesetChainState->graphsStream, - syncState, i, j); - - fprintf(tracesetChainState->graphsStream, - "replot\n"); + "set title \"\"\n", i, j); + + if (syncState->analysisModule->writeAnalysisGraphsOptions) + { + syncState->analysisModule->writeAnalysisGraphsOptions(syncState, + i, j); + } + + if (pos1 != pos2) + { + fprintf(syncState->graphsStream, "replot\n"); + } } } - if (fclose(tracesetChainState->graphsStream) != 0) + if (fclose(syncState->graphsStream) != 0) { g_error(strerror(errno)); } @@ -432,6 +442,27 @@ void teardownSyncChain(LttvTracesetContext* const traceSetContext) { syncState->processingModule->printProcessingStats(syncState); } + if (syncState->matchingModule->printMatchingStats != NULL) + { + syncState->matchingModule->printMatchingStats(syncState); + } + if (syncState->analysisModule->printAnalysisStats != NULL) + { + syncState->analysisModule->printAnalysisStats(syncState); + } + + printf("Resulting synchronization factors:\n"); + for (i= 0; i < syncState->traceNb; i++) + { + LttTrace* t; + + t= traceSetContext->traces[i]->t; + + printf("\ttrace %u drift= %g offset= %g (%f) start time= %ld.%09ld\n", + i, t->drift, t->offset, (double) tsc_to_uint64(t->freq_scale, + t->start_freq, t->offset) / NANOSECONDS_PER_SECOND, + t->start_time_from_tsc.tv_sec, t->start_time_from_tsc.tv_nsec); + } syncState->processingModule->destroyProcessing(syncState); if (syncState->matchingModule != NULL)