X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Ftext%2Fsync_chain_batch.c;h=10ee5f093af37babe16d9bef2c1c4949507a6f27;hb=b9ce0bad7daf7c0a2333c91fdb1e35d602afe17f;hp=86f3c657b27680cc977cafff86078c5a217dc477;hpb=cdce23b31002139312fbf30f7afa0808a825d841;p=lttv.git diff --git a/lttv/modules/text/sync_chain_batch.c b/lttv/modules/text/sync_chain_batch.c index 86f3c657..10ee5f09 100644 --- a/lttv/modules/text/sync_chain_batch.c +++ b/lttv/modules/text/sync_chain_batch.c @@ -12,8 +12,8 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -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'; @@ -285,71 +284,48 @@ void setupSyncChain(LttvTracesetContext* const traceSetContext) struct TracesetChainState* tracesetChainState; SyncState* syncState; GList* result; - int retval; tracesetChainState= g_hash_table_lookup(tracesetChainStates, traceSetContext); syncState= malloc(sizeof(SyncState)); tracesetChainState->syncState= syncState; syncState->traceNb= lttv_traceset_number(traceSetContext->ts); + // Statistics are always on with eval syncState->stats= true; if (optionEvalGraphs) { - syncState->graphs= optionEvalGraphsDir; + // Create the graph directory right away in case the module initialization + // functions have something to write in it. + syncState->graphsDir= optionEvalGraphsDir; + syncState->graphsStream= createGraphsDir(syncState->graphsDir); } else { - syncState->graphs= NULL; + syncState->graphsStream= NULL; + syncState->graphsDir= NULL; } - syncState->processingData= NULL; - result= g_queue_find_custom(&processingModules, "LTTV-standard", - &gcfCompareProcessing); - syncState->processingModule= (ProcessingModule*) result->data; - - tracesetChainState->graphsStream= NULL; - if (syncState->graphs && - syncState->processingModule->writeProcessingGraphsPlots != NULL) - { - 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); - - 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 ((tracesetChainState->graphsStream= fdopen(graphsFp, "w")) == NULL) - { - g_error(strerror(errno)); - } - - retval= chdir(cwd); - if (retval == -1) - { - g_error(strerror(errno)); - } - free(cwd); - } - - syncState->matchingData= NULL; - result= g_queue_find_custom(&matchingModules, "broadcast", &gcfCompareMatching); - syncState->matchingModule= (MatchingModule*) result->data; + syncState->reductionData= NULL; + syncState->reductionModule= NULL; syncState->analysisData= NULL; result= g_queue_find_custom(&analysisModules, "eval", &gcfCompareAnalysis); syncState->analysisModule= (AnalysisModule*) result->data; + syncState->analysisModule->initAnalysis(syncState); - syncState->processingModule->initProcessing(syncState, traceSetContext); + syncState->matchingData= NULL; + result= g_queue_find_custom(&matchingModules, "distributor", + &gcfCompareMatching); + syncState->matchingModule= (MatchingModule*) result->data; syncState->matchingModule->initMatching(syncState); - syncState->analysisModule->initAnalysis(syncState); + + syncState->processingData= NULL; + result= g_queue_find_custom(&processingModules, "LTTV-standard", + &gcfCompareProcessing); + syncState->processingModule= (ProcessingModule*) result->data; + syncState->processingModule->initProcessing(syncState, traceSetContext); } @@ -365,75 +341,25 @@ void teardownSyncChain(LttvTracesetContext* const traceSetContext) SyncState* syncState; struct timeval endTime; struct rusage endUsage; - int retval; tracesetChainState= g_hash_table_lookup(tracesetChainStates, traceSetContext); syncState= tracesetChainState->syncState; - syncState->processingModule->finalizeProcessing(syncState); + freeAllFactors(syncState->processingModule->finalizeProcessing(syncState), + syncState->traceNb); // Write graphs file - if (tracesetChainState->graphsStream != NULL) + if (optionEvalGraphs) { - unsigned int i, j; + writeGraphsScript(syncState); - fprintf(tracesetChainState->graphsStream, - "#!/usr/bin/gnuplot\n\n" - "set terminal postscript eps color size 8in,6in\n"); - - // Cover the upper triangular matrix, i is the reference node. - for (i= 0; i < syncState->traceNb; i++) + if (fclose(syncState->graphsStream) != 0) { - for (j= i + 1; j < syncState->traceNb; j++) - { - long pos; - - fprintf(tracesetChainState->graphsStream, - "\nset output \"%03d-%03d.eps\"\n" - "plot \\\n", i, j); - - syncState->processingModule->writeProcessingGraphsPlots(tracesetChainState->graphsStream, - 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) - { - g_error(strerror(errno)); - } - if (fseek(tracesetChainState->graphsStream, 0, SEEK_END) == -1) - { - g_error(strerror(errno)); - } - - fprintf(tracesetChainState->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"); - } - } - - if (fclose(tracesetChainState->graphsStream) != 0) - { - g_error(strerror(errno)); + g_error("%s", strerror(errno)); } } - if (syncState->processingModule->printProcessingStats != NULL) - { - syncState->processingModule->printProcessingStats(syncState); - } + printStats(syncState); syncState->processingModule->destroyProcessing(syncState); if (syncState->matchingModule != NULL) @@ -444,11 +370,15 @@ void teardownSyncChain(LttvTracesetContext* const traceSetContext) { syncState->analysisModule->destroyAnalysis(syncState); } + if (syncState->reductionModule != NULL) + { + syncState->reductionModule->destroyReduction(syncState); + } free(syncState); gettimeofday(&endTime, 0); - retval= getrusage(RUSAGE_SELF, &endUsage); + getrusage(RUSAGE_SELF, &endUsage); timeDiff(&endTime, &tracesetChainState->startTime); timeDiff(&endUsage.ru_utime, &tracesetChainState->startUsage.ru_utime);