X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Ftext%2Fsync_chain_batch.c;h=10ee5f093af37babe16d9bef2c1c4949507a6f27;hb=b9ce0bad7daf7c0a2333c91fdb1e35d602afe17f;hp=11c4f6368919f3e48b5da1c9ce1d30ddb0e0548f;hpb=0a87ec9a018cc9731ce3b04309eaa4dcc77df6d2;p=lttv.git diff --git a/lttv/modules/text/sync_chain_batch.c b/lttv/modules/text/sync_chain_batch.c index 11c4f636..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 @@ -306,6 +306,9 @@ void setupSyncChain(LttvTracesetContext* const traceSetContext) syncState->graphsDir= NULL; } + syncState->reductionData= NULL; + syncState->reductionModule= NULL; + syncState->analysisData= NULL; result= g_queue_find_custom(&analysisModules, "eval", &gcfCompareAnalysis); @@ -338,12 +341,12 @@ 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; - freeAllFactors(syncState->processingModule->finalizeProcessing(syncState)); + freeAllFactors(syncState->processingModule->finalizeProcessing(syncState), + syncState->traceNb); // Write graphs file if (optionEvalGraphs) @@ -352,7 +355,7 @@ void teardownSyncChain(LttvTracesetContext* const traceSetContext) if (fclose(syncState->graphsStream) != 0) { - g_error(strerror(errno)); + g_error("%s", strerror(errno)); } } @@ -367,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);