Update FSF address

[lttv.git] / lttv / modules / text / sync_chain_batch.c

diff --git a/lttv/modules/text/sync_chain_batch.c b/lttv/modules/text/sync_chain_batch.c
index 55abb676c946678a29fcd552c6d1a1f5f6fe6f2d..10ee5f093af37babe16d9bef2c1c4949507a6f27 100644 (file)
--- 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
@@ -284,7 +284,6 @@ 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));
@@ -307,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);
@@ -339,13 +341,12 @@ 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);
        syncState= tracesetChainState->syncState;
 
-       syncState->processingModule->finalizeProcessing(syncState);
+       freeAllFactors(syncState->processingModule->finalizeProcessing(syncState),
+               syncState->traceNb);
 
        // Write graphs file
        if (optionEvalGraphs)
@@ -354,25 +355,12 @@ void teardownSyncChain(LttvTracesetContext* const traceSetContext)
 
                if (fclose(syncState->graphsStream) != 0)
                {
-                       g_error(strerror(errno));
+                       g_error("%s", strerror(errno));
                }
        }
 
        printStats(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)
        {
@@ -382,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);