X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_processing_lttng_standard.c;h=d37d357c659a4b4333aef66676cce36bafd085af;hb=e2793cfa2a24ec3d0fcfb58d7f75dfcf0a79556c;hp=876dac0858c501838e3c108b88af9194c094f527;hpb=2bd5afbbc47668069bd04972cd4d1bb298c22233;p=lttv.git diff --git a/lttv/lttv/sync/event_processing_lttng_standard.c b/lttv/lttv/sync/event_processing_lttng_standard.c index 876dac08..d37d357c 100644 --- a/lttv/lttv/sync/event_processing_lttng_standard.c +++ b/lttv/lttv/sync/event_processing_lttng_standard.c @@ -1,28 +1,24 @@ /* This file is part of the Linux Trace Toolkit viewer - * Copyright (C) 2009 Benjamin Poirier + * Copyright (C) 2009, 2010 Benjamin Poirier * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License Version 2 as - * published by the Free Software Foundation; + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 2.1 of the License, or (at + * your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . */ -#define _ISOC99_SOURCE - #ifdef HAVE_CONFIG_H #include #endif -#include #include #include #include @@ -44,7 +40,7 @@ static void initProcessingLTTVStandard(SyncState* const syncState, ...); static void destroyProcessingLTTVStandard(SyncState* const syncState); -static void finalizeProcessingLTTVStandard(SyncState* const syncState); +static AllFactors* finalizeProcessingLTTVStandard(SyncState* const syncState); static void printProcessingStatsLTTVStandard(SyncState* const syncState); static void writeProcessingGraphVariablesLTTVStandard(SyncState* const syncState, const unsigned int i); @@ -54,7 +50,6 @@ static void writeProcessingTraceTimeOptionsLTTVStandard(SyncState* const syncState, const unsigned int i, const unsigned int j); // Functions specific to this module -static void registerProcessingLTTVStandard() __attribute__((constructor (102))); static gboolean processEventLTTVStandard(void* hookData, void* callData); static void partialDestroyProcessingLTTVStandard(SyncState* const syncState); @@ -76,7 +71,7 @@ static ProcessingModule processingModuleLTTVStandard = { /* * Processing Module registering function */ -static void registerProcessingLTTVStandard() +void registerProcessingLTTVStandard() { g_queue_push_tail(&processingModules, &processingModuleLTTVStandard); @@ -168,83 +163,19 @@ static void initProcessingLTTVStandard(SyncState* const syncState, ...) * * Args: * syncState container for synchronization data. + * + * Returns: + * AllFactors synchronization factors for each trace pair */ -static void finalizeProcessingLTTVStandard(SyncState* const syncState) +static AllFactors* finalizeProcessingLTTVStandard(SyncState* const syncState) { - unsigned int i; - GArray* factors; - double minOffset, minDrift; - unsigned int refFreqTrace; ProcessingDataLTTVStandard* processingData; processingData= (ProcessingDataLTTVStandard*) syncState->processingData; partialDestroyProcessingLTTVStandard(syncState); - factors= syncState->matchingModule->finalizeMatching(syncState); - - /* The offsets are adjusted so the lowest one is 0. This is done because - * of a Lttv specific limitation: events cannot have negative times. By - * having non-negative offsets, events cannot be moved backwards to - * negative times. - */ - minOffset= 0; - for (i= 0; i < syncState->traceNb; i++) - { - minOffset= MIN(g_array_index(factors, Factors, i).offset, minOffset); - } - - for (i= 0; i < syncState->traceNb; i++) - { - g_array_index(factors, Factors, i).offset-= minOffset; - } - - /* Because the timestamps are corrected at the TSC level (not at the - * LttTime level) all trace frequencies must be made equal. We choose to - * use the frequency of the system with the lowest drift - */ - minDrift= INFINITY; - refFreqTrace= 0; - for (i= 0; i < syncState->traceNb; i++) - { - if (g_array_index(factors, Factors, i).drift < minDrift) - { - minDrift= g_array_index(factors, Factors, i).drift; - refFreqTrace= i; - } - } - g_assert(syncState->traceNb == 0 || minDrift != INFINITY); - - // Write the factors to the LttTrace structures - for (i= 0; i < syncState->traceNb; i++) - { - LttTrace* t; - Factors* traceFactors; - - t= processingData->traceSetContext->traces[i]->t; - traceFactors= &g_array_index(factors, Factors, i); - - t->drift= traceFactors->drift; - t->offset= traceFactors->offset; - t->start_freq= - processingData->traceSetContext->traces[refFreqTrace]->t->start_freq; - t->freq_scale= - processingData->traceSetContext->traces[refFreqTrace]->t->freq_scale; - t->start_time_from_tsc = - ltt_time_from_uint64(tsc_to_uint64(t->freq_scale, t->start_freq, - t->drift * t->start_tsc + t->offset)); - } - - g_array_free(factors, TRUE); - - lttv_traceset_context_compute_time_span(processingData->traceSetContext, - &processingData->traceSetContext->time_span); - - g_debug("traceset start %ld.%09ld end %ld.%09ld", - processingData->traceSetContext->time_span.start_time.tv_sec, - processingData->traceSetContext->time_span.start_time.tv_nsec, - processingData->traceSetContext->time_span.end_time.tv_sec, - processingData->traceSetContext->time_span.end_time.tv_nsec); + return syncState->matchingModule->finalizeMatching(syncState); }