From 68573dd0176817ad827ed9e292faaa933f0093bc Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Fri, 6 Jul 2012 15:12:00 -0400 Subject: [PATCH] Change function name lttv_traceset_create_position to lttv_traceset_create_current_position Signed-off-by: Francis Deslauriers Signed-off-by: Yannick Brosseau --- lttv/lttv/state.c | 2 +- lttv/lttv/traceset-process.c | 9 ++++----- lttv/lttv/traceset.c | 2 +- lttv/lttv/traceset.h | 2 +- lttv/modules/gui/detailedevents/events.c | 20 ++++++++++---------- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/lttv/lttv/state.c b/lttv/lttv/state.c index 954d4f1b..40f95c41 100644 --- a/lttv/lttv/state.c +++ b/lttv/lttv/state.c @@ -1460,7 +1460,7 @@ void lttv_state_save(LttvTraceState *self, LttvAttribute *container) /* Save the current position */ value = lttv_attribute_add(container, LTTV_STATE_POSITION, LTTV_POINTER); - *(value.v_pointer) = lttv_traceset_create_position(lttv_trace_get_traceset(self->trace)); + *(value.v_pointer) = lttv_traceset_create_current_position(lttv_trace_get_traceset(self->trace)); #ifdef BABEL_CLEANUP nb_tracefile = self->parent.tracefiles->len; diff --git a/lttv/lttv/traceset-process.c b/lttv/lttv/traceset-process.c index 8ce68981..edb7463b 100644 --- a/lttv/lttv/traceset-process.c +++ b/lttv/lttv/traceset-process.c @@ -79,7 +79,7 @@ guint lttv_process_traceset_middle(LttvTraceset *traceset, break; } - currentPos = lttv_traceset_create_position(traceset); + currentPos = lttv_traceset_create_current_position(traceset); if(lttv_traceset_position_compare(currentPos,end_position ) == 0){ lttv_traceset_destroy_position(currentPos); break; @@ -214,7 +214,6 @@ guint lttv_process_traceset_seek_n_forward(LttvTraceset *traceset, LttvFilter *filter3, gpointer data) { - struct bt_ctf_event *bt_event; unsigned count = 0; while(count < n) { if(bt_iter_next(bt_ctf_get_iter(traceset->iter)) < 0) { @@ -242,13 +241,13 @@ guint lttv_process_traceset_seek_n_backward(LttvTraceset *ts, LttvTracesetPosition *initialPos, *previousPos, *currentPos; /*Save initial position of the traceset*/ - initialPos = lttv_traceset_create_position (ts); + initialPos = lttv_traceset_create_current_position (ts); /*Get the timespan of the initial position*/ initialTimeStamp = lttv_traceset_position_get_timestamp(initialPos); /* * Create a position before the initial timestamp according - * to the ratio of nanosecond/nanosecond hopefully before the + * to the ratio of nanosecond/event hopefully before the * the desired seek position */ while(1){ @@ -267,7 +266,7 @@ guint lttv_process_traceset_seek_n_backward(LttvTraceset *ts, if((ret = lttv_traceset_position_compare(currentPos,initialPos)) == 1){ bt_iter_next(bt_ctf_get_iter(ts->iter)); lttv_traceset_destroy_position(currentPos); - currentPos = lttv_traceset_create_position(ts); + currentPos = lttv_traceset_create_current_position(ts); count++; } }while(ret != 0); diff --git a/lttv/lttv/traceset.c b/lttv/lttv/traceset.c index b10564c5..2c99c061 100644 --- a/lttv/lttv/traceset.c +++ b/lttv/lttv/traceset.c @@ -421,7 +421,7 @@ guint lttv_trace_get_num_cpu(LttvTrace *t) return 24; } -LttvTracesetPosition *lttv_traceset_create_position(LttvTraceset *traceset) +LttvTracesetPosition *lttv_traceset_create_current_position(LttvTraceset *traceset) { LttvTracesetPosition *traceset_pos; diff --git a/lttv/lttv/traceset.h b/lttv/lttv/traceset.h index 19fd5633..462fb99a 100644 --- a/lttv/lttv/traceset.h +++ b/lttv/lttv/traceset.h @@ -111,7 +111,7 @@ void lttv_traceset_remove(LttvTraceset *s, unsigned i); LttvAttribute *lttv_traceset_attribute(LttvTraceset *s); /* Take a position snapshot */ -LttvTracesetPosition *lttv_traceset_create_position(LttvTraceset *traceset); +LttvTracesetPosition *lttv_traceset_create_current_position(LttvTraceset *traceset); /* Destroy position snapshot */ void lttv_traceset_destroy_position(LttvTracesetPosition *traceset_pos); diff --git a/lttv/modules/gui/detailedevents/events.c b/lttv/modules/gui/detailedevents/events.c index ac131149..7d034f0d 100644 --- a/lttv/modules/gui/detailedevents/events.c +++ b/lttv/modules/gui/detailedevents/events.c @@ -233,11 +233,11 @@ gui_events(LttvPluginTab *ptab) GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); event_viewer_data->currently_selected_position = - lttv_traceset_create_position(ts); + lttv_traceset_create_current_position(ts); event_viewer_data->first_event = - lttv_traceset_create_position(ts); + lttv_traceset_create_current_position(ts); event_viewer_data->last_event = - lttv_traceset_create_position(ts); + lttv_traceset_create_current_position(ts); event_viewer_data->main_win_filter = lttvwindow_get_filter(tab); event_viewer_data->update_cursor = TRUE; @@ -1416,7 +1416,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) /* Save the first event position */ - event_viewer_data->first_event = lttv_traceset_create_position(ts); + event_viewer_data->first_event = lttv_traceset_create_current_position(ts); time = ltt_time_from_uint64(lttv_traceset_position_get_timestamp( event_viewer_data->first_event)); @@ -1472,7 +1472,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) event_viewer_data->pos->len - 1); event_viewer_data->last_event = cur_pos; } else - event_viewer_data->last_event =lttv_traceset_create_position(ts); + event_viewer_data->last_event =lttv_traceset_create_current_position(ts); gtk_adjustment_set_value(event_viewer_data->vadjust_c, event_viewer_data->previous_value); @@ -1544,7 +1544,7 @@ int event_hook(void *hook_data, void *call_data) GString *desc = g_string_new(""); GString *name = g_string_new(""); - LttvTracesetPosition *pos = lttv_traceset_create_position(traceState->trace->traceset); + LttvTracesetPosition *pos = lttv_traceset_create_current_position(traceState->trace->traceset); lttv_event_to_string(e, desc, TRUE, FALSE); lttv_event_get_name(e,name); @@ -1666,7 +1666,7 @@ gboolean update_current_time(void * hook_data, void * call_data) lttv_traceset_seek_to_position(currentPosition); event_viewer_data->currently_selected_position = - lttv_traceset_create_position(ts); + lttv_traceset_create_current_position(ts); } @@ -1739,11 +1739,11 @@ gboolean traceset_changed(void * hook_data, void * call_data) lttv_traceset_destroy_position(event_viewer_data->last_event); event_viewer_data->currently_selected_position = - lttv_traceset_create_position(ts); + lttv_traceset_create_current_position(ts); event_viewer_data->first_event = - lttv_traceset_create_position(ts); + lttv_traceset_create_current_position(ts); event_viewer_data->last_event = - lttv_traceset_create_position(ts); + lttv_traceset_create_current_position(ts); get_events(event_viewer_data->vadjust_c->value, event_viewer_data); #endif //babel_cleanup -- 2.34.1