X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmain%2Fstate.c;h=c69d6a6a8088f5a52286c2e335ce1af7f1844b44;hb=ef35d837107818630444baf59ed7307c974e37c0;hp=f9d123e03a5f8d3051a9b4c337b817f577d3cd09;hpb=9444deaec7e79ec8da6fb4b8edf05babb17cd883;p=lttv.git diff --git a/ltt/branches/poly/lttv/main/state.c b/ltt/branches/poly/lttv/main/state.c index f9d123e0..c69d6a6a 100644 --- a/ltt/branches/poly/lttv/main/state.c +++ b/ltt/branches/poly/lttv/main/state.c @@ -17,6 +17,8 @@ */ +#include +#include #include #include #include @@ -48,6 +50,7 @@ static GQuark LTTV_STATE_PROCESS, LTTV_STATE_EVENT, LTTV_STATE_SAVED_STATES, + LTTV_STATE_SAVED_STATES_TIME, LTTV_STATE_TIME, LTTV_STATE_HOOKS; @@ -58,8 +61,6 @@ static void free_name_tables(LttvTraceState *tcs); static void lttv_state_free_process_table(GHashTable *processes); -static LttvProcessState *create_process(LttvTracefileState *tfs, - LttvProcessState *parent, guint pid); void lttv_state_save(LttvTraceState *self, LttvAttribute *container) { @@ -80,41 +81,58 @@ void lttv_state_saved_state_free(LttvTraceState *self, } +guint process_hash(gconstpointer key) +{ + return ((LttvProcessState *)key)->pid; +} + + +gboolean process_equal(gconstpointer a, gconstpointer b) +{ + LttvProcessState *process_a, *process_b; + + process_a = (LttvProcessState *)a; + process_b = (LttvProcessState *)b; + + if(process_a->pid != process_b->pid) return FALSE; + if(process_a->pid == 0 && + process_a->last_cpu != process_b->last_cpu) return FALSE; + return TRUE; +} + + static void restore_init_state(LttvTraceState *self) { - guint i, nb_control, nb_per_cpu, nb_tracefile; + guint i, nb_tracefile; LttvTracefileState *tfcs; LttTime null_time = {0,0}; if(self->processes != NULL) lttv_state_free_process_table(self->processes); - self->processes = g_hash_table_new(g_direct_hash, g_direct_equal); + self->processes = g_hash_table_new(process_hash, process_equal); self->nb_event = 0; - nb_control = ltt_trace_control_tracefile_number(self->parent.t); - nb_per_cpu = ltt_trace_per_cpu_tracefile_number(self->parent.t); - nb_tracefile = nb_control + nb_per_cpu; - for(i = 0 ; i < nb_tracefile ; i++) { - if(i < nb_control) { - tfcs = LTTV_TRACEFILE_STATE(self->parent.control_tracefiles[i]); - } - else { - tfcs = LTTV_TRACEFILE_STATE(self->parent.per_cpu_tracefiles[i - nb_control]); - } + nb_tracefile = ltt_trace_control_tracefile_number(self->parent.t) + + ltt_trace_per_cpu_tracefile_number(self->parent.t); + for(i = 0 ; i < nb_tracefile ; i++) { + tfcs = LTTV_TRACEFILE_STATE(self->parent.tracefiles[i]); tfcs->parent.timestamp = null_time; tfcs->saved_position = 0; - tfcs->process = create_process(tfcs, NULL,0); + tfcs->process = lttv_state_create_process(tfcs, NULL,0); + tfcs->process->state->s = LTTV_STATE_RUN; + tfcs->process->last_cpu = tfcs->cpu_name; } } +static LttTime time_zero = {0,0}; static void init(LttvTracesetState *self, LttvTraceset *ts) { - guint i, j, nb_trace, nb_control, nb_per_cpu, nb_tracefile; + guint i, j, nb_trace, nb_tracefile; LttvTraceContext *tc; @@ -122,6 +140,8 @@ init(LttvTracesetState *self, LttvTraceset *ts) LttvTracefileState *tfcs; + LttvAttributeValue v; + LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_CONTEXT_TYPE))-> init((LttvTracesetContext *)self, ts); @@ -129,21 +149,22 @@ init(LttvTracesetState *self, LttvTraceset *ts) for(i = 0 ; i < nb_trace ; i++) { tc = self->parent.traces[i]; tcs = (LttvTraceState *)tc; - tcs->save_interval = 100000; - tcs->recompute_state_in_seek = TRUE; - tcs->saved_state_ready = FALSE; + tcs->save_interval = 50000; + lttv_attribute_find(tcs->parent.t_a, LTTV_STATE_SAVED_STATES_TIME, + LTTV_POINTER, &v); + if(*(v.v_pointer) == NULL) { + *(v.v_pointer) = g_new(LttTime,1); + *((LttTime *)*(v.v_pointer)) = time_zero; + } + tcs->max_time_state_recomputed_in_seek = (LttTime *)*(v.v_pointer); + fill_name_tables(tcs); - nb_control = ltt_trace_control_tracefile_number(tc->t); - nb_per_cpu = ltt_trace_per_cpu_tracefile_number(tc->t); - nb_tracefile = nb_control + nb_per_cpu; + nb_tracefile = ltt_trace_control_tracefile_number(tc->t) + + ltt_trace_per_cpu_tracefile_number(tc->t); + for(j = 0 ; j < nb_tracefile ; j++) { - if(j < nb_control) { - tfcs = LTTV_TRACEFILE_STATE(tc->control_tracefiles[j]); - } - else { - tfcs = LTTV_TRACEFILE_STATE(tc->per_cpu_tracefiles[j - nb_control]); - } + tfcs = LTTV_TRACEFILE_STATE(tc->tracefiles[j]); tfcs->cpu_name= g_quark_from_string(ltt_tracefile_name(tfcs->parent.tf)); } tcs->processes = NULL; @@ -155,7 +176,7 @@ init(LttvTracesetState *self, LttvTraceset *ts) static void fini(LttvTracesetState *self) { - guint i, j, nb_trace, nb_tracefile; + guint i, j, nb_trace; LttvTraceState *tcs; @@ -194,6 +215,76 @@ new_tracefile_context(LttvTracesetContext *self) } +/* Write the process state of the trace */ + +static void write_process_state(gpointer key, gpointer value, + gpointer user_data) +{ + LttvProcessState *process; + + LttvExecutionState *es; + + FILE *fp = (FILE *)user_data; + + guint i; + + process = (LttvProcessState *)value; + fprintf(fp, +" \n", + process->pid, process->ppid, process->creation_time.tv_sec, + process->creation_time.tv_nsec, g_quark_to_string(process->name), + g_quark_to_string(process->last_cpu)); + + for(i = 0 ; i < process->execution_stack->len; i++) { + es = &g_array_index(process->execution_stack, LttvExecutionState, i); + fprintf(fp, " t), g_quark_to_string(es->n), + es->entry.tv_sec, es->entry.tv_nsec); + fprintf(fp, " CHANGE_S=%lu CHANGE_NS=%lu STATUS=\"%s\"/>\n", + es->change.tv_sec, es->change.tv_nsec, g_quark_to_string(es->s)); + } + fprintf(fp, " \n"); +} + + +void lttv_state_write(LttvTraceState *self, LttTime t, FILE *fp) +{ + guint i, nb_tracefile, nb_block, nb_event; + + LttvTracefileState *tfcs; + + LttTracefile *tf; + + LttEventPosition *ep; + + ep = ltt_event_position_new(); + + fprintf(fp,"\n", t.tv_sec, t.tv_nsec); + + g_hash_table_foreach(self->processes, write_process_state, fp); + + nb_tracefile = ltt_trace_control_tracefile_number(self->parent.t) + + ltt_trace_per_cpu_tracefile_number(self->parent.t); + + for(i = 0 ; i < nb_tracefile ; i++) { + tfcs = (LttvTracefileState *)self->parent.tracefiles[i]; + fprintf(fp, " process->pid, tfcs->parent.timestamp.tv_sec, + tfcs->parent.timestamp.tv_nsec); + if(tfcs->parent.e == NULL) fprintf(fp,"/>\n"); + else { + ltt_event_position(tfcs->parent.e, ep); + ltt_event_position_get(ep, &nb_block, &nb_event, &tf); + fprintf(fp, " BLOCK=%u EVENT=%u/>\n", nb_block, nb_event); + } + } + g_free(ep); + fprintf(fp,""); +} + + +/* Copy each process from an existing hash table to a new one */ + static void copy_process_state(gpointer key, gpointer value,gpointer user_data) { LttvProcessState *process, *new_process; @@ -214,14 +305,13 @@ static void copy_process_state(gpointer key, gpointer value,gpointer user_data) } new_process->state = &g_array_index(new_process->execution_stack, LttvExecutionState, new_process->execution_stack->len - 1); - g_hash_table_insert(new_processes, GUINT_TO_POINTER(new_process->pid), - new_process); + g_hash_table_insert(new_processes, new_process, new_process); } static GHashTable *lttv_state_copy_process_table(GHashTable *processes) { - GHashTable *new_processes = g_hash_table_new(g_direct_hash, g_direct_equal); + GHashTable *new_processes = g_hash_table_new(process_hash, process_equal); g_hash_table_foreach(processes, copy_process_state, new_processes); return new_processes; @@ -236,7 +326,7 @@ static GHashTable *lttv_state_copy_process_table(GHashTable *processes) static void state_save(LttvTraceState *self, LttvAttribute *container) { - guint i, nb_control, nb_per_cpu, nb_tracefile; + guint i, nb_tracefile; LttvTracefileState *tfcs; @@ -257,16 +347,11 @@ static void state_save(LttvTraceState *self, LttvAttribute *container) LTTV_POINTER); *(value.v_pointer) = lttv_state_copy_process_table(self->processes); - nb_control = ltt_trace_control_tracefile_number(self->parent.t); - nb_per_cpu = ltt_trace_per_cpu_tracefile_number(self->parent.t); - nb_tracefile = nb_control + nb_per_cpu; + nb_tracefile = ltt_trace_control_tracefile_number(self->parent.t) + + ltt_trace_per_cpu_tracefile_number(self->parent.t); for(i = 0 ; i < nb_tracefile ; i++) { - if(i < nb_control) - tfcs = (LttvTracefileState *)self->parent.control_tracefiles[i]; - else tfcs = (LttvTracefileState *) - self->parent.per_cpu_tracefiles[i - nb_control]; - + tfcs = (LttvTracefileState *)self->parent.tracefiles[i]; tracefile_tree = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL); value = lttv_attribute_add(tracefiles_tree, i, LTTV_GOBJECT); @@ -281,6 +366,12 @@ static void state_save(LttvTraceState *self, LttvAttribute *container) ep = ltt_event_position_new(); ltt_event_position(tfcs->parent.e, ep); *(value.v_pointer) = ep; + + guint nb_block, nb_event; + LttTracefile *tf; + ltt_event_position_get(ep, &nb_block, &nb_event, &tf); + g_debug("Block %u event %u time %lu.%lu", nb_block, nb_event, + tfcs->parent.timestamp.tv_sec, tfcs->parent.timestamp.tv_nsec); } } } @@ -288,7 +379,7 @@ static void state_save(LttvTraceState *self, LttvAttribute *container) static void state_restore(LttvTraceState *self, LttvAttribute *container) { - guint i, nb_control, nb_per_cpu, nb_tracefile; + guint i, nb_tracefile, pid; LttvTracefileState *tfcs; @@ -311,16 +402,11 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container) lttv_state_free_process_table(self->processes); self->processes = lttv_state_copy_process_table(*(value.v_pointer)); - nb_control = ltt_trace_control_tracefile_number(self->parent.t); - nb_per_cpu = ltt_trace_per_cpu_tracefile_number(self->parent.t); - nb_tracefile = nb_control + nb_per_cpu; + nb_tracefile = ltt_trace_control_tracefile_number(self->parent.t) + + ltt_trace_per_cpu_tracefile_number(self->parent.t); for(i = 0 ; i < nb_tracefile ; i++) { - if(i < nb_control) tfcs = (LttvTracefileState *) - self->parent.control_tracefiles[i]; - else tfcs = (LttvTracefileState *) - self->parent.per_cpu_tracefiles[i - nb_control]; - + tfcs = (LttvTracefileState *)self->parent.tracefiles[i]; type = lttv_attribute_get(tracefiles_tree, i, &name, &value); g_assert(type == LTTV_GOBJECT); tracefile_tree = *((LttvAttribute **)(value.v_gobject)); @@ -328,7 +414,9 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container) type = lttv_attribute_get_by_name(tracefile_tree, LTTV_STATE_PROCESS, &value); g_assert(type == LTTV_UINT); - tfcs->process = lttv_state_find_process(tfcs, *(value.v_uint)); + pid = *(value.v_uint); + tfcs->process = lttv_state_find_process_or_create(tfcs, pid); + type = lttv_attribute_get_by_name(tracefile_tree, LTTV_STATE_EVENT, &value); g_assert(type == LTTV_POINTER); @@ -345,7 +433,7 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container) static void state_saved_free(LttvTraceState *self, LttvAttribute *container) { - guint i, nb_control, nb_per_cpu, nb_tracefile; + guint i, nb_tracefile; LttvTracefileState *tfcs; @@ -370,16 +458,11 @@ static void state_saved_free(LttvTraceState *self, LttvAttribute *container) *(value.v_pointer) = NULL; lttv_attribute_remove_by_name(container, LTTV_STATE_PROCESSES); - nb_control = ltt_trace_control_tracefile_number(self->parent.t); - nb_per_cpu = ltt_trace_per_cpu_tracefile_number(self->parent.t); - nb_tracefile = nb_control + nb_per_cpu; + nb_tracefile = ltt_trace_control_tracefile_number(self->parent.t) + + ltt_trace_per_cpu_tracefile_number(self->parent.t); for(i = 0 ; i < nb_tracefile ; i++) { - if(i < nb_control) tfcs = (LttvTracefileState *) - self->parent.control_tracefiles[i]; - else tfcs = (LttvTracefileState *) - self->parent.per_cpu_tracefiles[i - nb_control]; - + tfcs = (LttvTracefileState *)self->parent.tracefiles[i]; type = lttv_attribute_get(tracefiles_tree, i, &name, &value); g_assert(type == LTTV_GOBJECT); tracefile_tree = *((LttvAttribute **)(value.v_gobject)); @@ -513,12 +596,12 @@ static void pop_state(LttvTracefileState *tfs, LttvExecutionMode t) guint depth = process->execution_stack->len - 1; if(process->state->t != t){ - g_warning("Different execution mode type (%d.%09d): ignore it\n", + g_info("Different execution mode type (%d.%09d): ignore it\n", tfs->parent.timestamp.tv_sec, tfs->parent.timestamp.tv_nsec); - g_warning("process state has %s when pop_int is %s\n", + g_info("process state has %s when pop_int is %s\n", g_quark_to_string(process->state->t), g_quark_to_string(t)); - g_warning("{ %u, %u, %s, %s }\n", + g_info("{ %u, %u, %s, %s }\n", process->pid, process->ppid, g_quark_to_string(process->name), @@ -527,7 +610,7 @@ static void pop_state(LttvTracefileState *tfs, LttvExecutionMode t) } if(depth == 0){ - g_warning("Trying to pop last state on stack (%d.%09d): ignore it\n", + g_info("Trying to pop last state on stack (%d.%09d): ignore it\n", tfs->parent.timestamp.tv_sec, tfs->parent.timestamp.tv_nsec); return; } @@ -540,8 +623,9 @@ static void pop_state(LttvTracefileState *tfs, LttvExecutionMode t) } -static LttvProcessState *create_process(LttvTracefileState *tfs, - LttvProcessState *parent, guint pid) +LttvProcessState * +lttv_state_create_process(LttvTracefileState *tfs, LttvProcessState *parent, + guint pid) { LttvProcessState *process = g_new(LttvProcessState, 1); @@ -555,22 +639,31 @@ static LttvProcessState *create_process(LttvTracefileState *tfs, tcs = (LttvTraceState *)tc = tfs->parent.t_context; - g_hash_table_insert(tcs->processes, GUINT_TO_POINTER(pid), process); process->pid = pid; + process->last_cpu = tfs->cpu_name; + g_hash_table_insert(tcs->processes, process, process); if(parent) { process->ppid = parent->pid; process->name = parent->name; + process->creation_time = tfs->parent.timestamp; } + + /* No parent. This process exists but we are missing all information about + its creation. The birth time is set to zero but we remember the time of + insertion */ + else { process->ppid = 0; process->name = LTTV_STATE_UNNAMED; + process->creation_time = ltt_time_zero; } - process->creation_time = tfs->parent.timestamp; + process->insertion_time = tfs->parent.timestamp; sprintf(buffer,"%d-%lu.%lu",pid, process->creation_time.tv_sec, process->creation_time.tv_nsec); process->pid_time = g_quark_from_string(buffer); + process->last_cpu = tfs->cpu_name; process->execution_stack = g_array_new(FALSE, FALSE, sizeof(LttvExecutionState)); g_array_set_size(process->execution_stack, 1); @@ -586,13 +679,33 @@ static LttvProcessState *create_process(LttvTracefileState *tfs, } +LttvProcessState * +lttv_state_find_process_from_trace(LttvTraceState *ts, GQuark cpu, guint pid) +{ + LttvProcessState key; + LttvProcessState *process; + + key.pid = pid; + key.last_cpu = cpu; + process = g_hash_table_lookup(ts->processes, &key); + return process; +} + + LttvProcessState *lttv_state_find_process(LttvTracefileState *tfs, guint pid) { - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; - LttvProcessState *process = g_hash_table_lookup(ts->processes, - GUINT_TO_POINTER(pid)); - if(process == NULL) process = create_process(tfs, NULL, pid); + LttvTraceState *ts =(LttvTraceState *)tfs->parent.t_context; + return lttv_state_find_process_from_trace(ts, tfs->cpu_name, pid); +} + + +LttvProcessState * +lttv_state_find_process_or_create(LttvTracefileState *tfs, guint pid) +{ + LttvProcessState *process = lttv_state_find_process(tfs, pid); + + if(process == NULL) process = lttv_state_create_process(tfs, NULL, pid); return process; } @@ -600,8 +713,11 @@ LttvProcessState *lttv_state_find_process(LttvTracefileState *tfs, static void exit_process(LttvTracefileState *tfs, LttvProcessState *process) { LttvTraceState *ts = LTTV_TRACE_STATE(tfs->parent.t_context); + LttvProcessState key; - g_hash_table_remove(ts->processes, GUINT_TO_POINTER(process->pid)); + key.pid = process->pid; + key.last_cpu = process->last_cpu; + g_hash_table_remove(ts->processes, &key); g_array_free(process->execution_stack, TRUE); g_free(process); } @@ -719,8 +835,9 @@ static gboolean schedchange(void *hook_data, void *call_data) s->process->state->change = s->parent.timestamp; } - s->process = lttv_state_find_process(s, pid_in); + s->process = lttv_state_find_process_or_create(s, pid_in); s->process->state->s = LTTV_STATE_RUN; + s->process->last_cpu = s->cpu_name; s->process->state->change = s->parent.timestamp; return FALSE; } @@ -735,7 +852,7 @@ static gboolean process_fork(void *hook_data, void *call_data) guint child_pid; child_pid = ltt_event_get_unsigned(s->parent.e, f); - create_process(s, s->process, child_pid); + lttv_state_create_process(s, s->process, child_pid); return FALSE; } @@ -755,7 +872,7 @@ void lttv_state_add_event_hooks(LttvTracesetState *self) { LttvTraceset *traceset = self->parent.ts; - guint i, j, k, nb_trace, nb_control, nb_per_cpu, nb_tracefile; + guint i, j, k, nb_trace, nb_tracefile; LttvTraceState *ts; @@ -806,16 +923,11 @@ void lttv_state_add_event_hooks(LttvTracesetState *self) /* Add these hooks to each before_event_by_id hooks list */ - nb_control = ltt_trace_control_tracefile_number(ts->parent.t); - nb_per_cpu = ltt_trace_per_cpu_tracefile_number(ts->parent.t); - nb_tracefile = nb_control + nb_per_cpu; + nb_tracefile = ltt_trace_control_tracefile_number(ts->parent.t) + + ltt_trace_per_cpu_tracefile_number(ts->parent.t); + for(j = 0 ; j < nb_tracefile ; j++) { - if(j < nb_control) { - tfs = LTTV_TRACEFILE_STATE(ts->parent.control_tracefiles[j]); - } - else { - tfs = LTTV_TRACEFILE_STATE(ts->parent.per_cpu_tracefiles[j-nb_control]); - } + tfs = LTTV_TRACEFILE_STATE(ts->parent.tracefiles[j]); for(k = 0 ; k < hooks->len ; k++) { hook = g_array_index(hooks, LttvTraceHook, k); @@ -833,7 +945,7 @@ void lttv_state_remove_event_hooks(LttvTracesetState *self) { LttvTraceset *traceset = self->parent.ts; - guint i, j, k, nb_trace, nb_control, nb_per_cpu, nb_tracefile; + guint i, j, k, nb_trace, nb_tracefile; LttvTraceState *ts; @@ -853,16 +965,11 @@ void lttv_state_remove_event_hooks(LttvTracesetState *self) /* Add these hooks to each before_event_by_id hooks list */ - nb_control = ltt_trace_control_tracefile_number(ts->parent.t); - nb_per_cpu = ltt_trace_per_cpu_tracefile_number(ts->parent.t); - nb_tracefile = nb_control + nb_per_cpu; + nb_tracefile = ltt_trace_control_tracefile_number(ts->parent.t) + + ltt_trace_per_cpu_tracefile_number(ts->parent.t); + for(j = 0 ; j < nb_tracefile ; j++) { - if(j < nb_control) { - tfs = LTTV_TRACEFILE_STATE(ts->parent.control_tracefiles[j]); - } - else { - tfs = LTTV_TRACEFILE_STATE(ts->parent.per_cpu_tracefiles[j-nb_control]); - } + tfs = LTTV_TRACEFILE_STATE(ts->parent.tracefiles[j]); for(k = 0 ; k < hooks->len ; k++) { hook = g_array_index(hooks, LttvTraceHook, k); @@ -876,15 +983,17 @@ void lttv_state_remove_event_hooks(LttvTracesetState *self) } -static gboolean block_end(void *hook_data, void *call_data) +static gboolean block_start(void *hook_data, void *call_data) { - LttvTracefileState *tfcs = (LttvTracefileState *)call_data; + LttvTracefileState *self = (LttvTracefileState *)call_data; - LttvTraceState *tcs = (LttvTraceState *)(tfcs->parent.t_context); + LttvTracefileState *tfcs; - LttEventPosition *ep = ltt_event_position_new(); + LttvTraceState *tcs = (LttvTraceState *)(self->parent.t_context); - guint nb_block, nb_event; + LttEventPosition *ep; + + guint i, nb_block, nb_event, nb_tracefile; LttTracefile *tf; @@ -892,11 +1001,22 @@ static gboolean block_end(void *hook_data, void *call_data) LttvAttributeValue value; - ltt_event_position(tfcs->parent.e, ep); + ep = ltt_event_position_new(); + nb_tracefile = ltt_trace_control_tracefile_number(tcs->parent.t) + + ltt_trace_per_cpu_tracefile_number(tcs->parent.t); + + /* Count the number of events added since the last block end in any + tracefile. */ + + for(i = 0 ; i < nb_tracefile ; i++) { + tfcs = (LttvTracefileState *)tcs->parent.tracefiles[i]; + ltt_event_position(tfcs->parent.e, ep); + ltt_event_position_get(ep, &nb_block, &nb_event, &tf); + tcs->nb_event += nb_event - tfcs->saved_position; + tfcs->saved_position = nb_event; + } + g_free(ep); - ltt_event_position_get(ep, &nb_block, &nb_event, &tf); - tcs->nb_event += nb_event - tfcs->saved_position; - tfcs->saved_position = 0; if(tcs->nb_event >= tcs->save_interval) { saved_states_tree = lttv_attribute_find_subdir(tcs->parent.t_a, LTTV_STATE_SAVED_STATES); @@ -905,45 +1025,68 @@ static gboolean block_end(void *hook_data, void *call_data) lttv_attribute_get_number(saved_states_tree), LTTV_GOBJECT); *(value.v_gobject) = (GObject *)saved_state_tree; value = lttv_attribute_add(saved_state_tree, LTTV_STATE_TIME, LTTV_TIME); - *(value.v_time) = tfcs->parent.timestamp; + *(value.v_time) = self->parent.timestamp; lttv_state_save(tcs, saved_state_tree); tcs->nb_event = 0; + g_debug("Saving state at time %lu.%lu", self->parent.timestamp.tv_sec, + self->parent.timestamp.tv_nsec); } + *(tcs->max_time_state_recomputed_in_seek) = self->parent.timestamp; return FALSE; } +static gboolean block_end(void *hook_data, void *call_data) +{ + LttvTracefileState *self = (LttvTracefileState *)call_data; + + LttvTraceState *tcs = (LttvTraceState *)(self->parent.t_context); + + LttTracefile *tf; + + LttEventPosition *ep; + + guint nb_block, nb_event; + + ep = ltt_event_position_new(); + ltt_event_position(self->parent.e, ep); + ltt_event_position_get(ep, &nb_block, &nb_event, &tf); + tcs->nb_event += nb_event - self->saved_position + 1; + self->saved_position = 0; + *(tcs->max_time_state_recomputed_in_seek) = self->parent.timestamp; + g_free(ep); +} + + void lttv_state_save_add_event_hooks(LttvTracesetState *self) { LttvTraceset *traceset = self->parent.ts; - guint i, j, k, nb_trace, nb_control, nb_per_cpu, nb_tracefile; + guint i, j, k, nb_trace, nb_tracefile; LttvTraceState *ts; LttvTracefileState *tfs; - LttvTraceHook hook; + LttvTraceHook hook_start, hook_end; nb_trace = lttv_traceset_number(traceset); for(i = 0 ; i < nb_trace ; i++) { ts = (LttvTraceState *)self->parent.traces[i]; + lttv_trace_find_hook(ts->parent.t, "core","block_start",NULL, + NULL, NULL, block_start, &hook_start); lttv_trace_find_hook(ts->parent.t, "core","block_end",NULL, - NULL, NULL, block_end, &hook); + NULL, NULL, block_end, &hook_end); - nb_control = ltt_trace_control_tracefile_number(ts->parent.t); - nb_per_cpu = ltt_trace_per_cpu_tracefile_number(ts->parent.t); - nb_tracefile = nb_control + nb_per_cpu; - for(j = 0 ; j < nb_tracefile ; j++) { - if(j < nb_control) { - tfs = LTTV_TRACEFILE_STATE(ts->parent.control_tracefiles[j]); - } - else { - tfs =LTTV_TRACEFILE_STATE(ts->parent.per_cpu_tracefiles[j-nb_control]); - } + nb_tracefile = ltt_trace_control_tracefile_number(ts->parent.t) + + ltt_trace_per_cpu_tracefile_number(ts->parent.t); + for(j = 0 ; j < nb_tracefile ; j++) { + tfs = LTTV_TRACEFILE_STATE(ts->parent.tracefiles[j]); + lttv_hooks_add(lttv_hooks_by_id_find(tfs->parent.after_event_by_id, + hook_start.id), hook_start.h, NULL); lttv_hooks_add(lttv_hooks_by_id_find(tfs->parent.after_event_by_id, - hook.id), hook.h, NULL); + hook_end.id), hook_end.h, NULL); } } } @@ -953,33 +1096,32 @@ void lttv_state_save_remove_event_hooks(LttvTracesetState *self) { LttvTraceset *traceset = self->parent.ts; - guint i, j, k, nb_trace, nb_control, nb_per_cpu, nb_tracefile; + guint i, j, k, nb_trace, nb_tracefile; LttvTraceState *ts; LttvTracefileState *tfs; - LttvTraceHook hook; + LttvTraceHook hook_start, hook_end; nb_trace = lttv_traceset_number(traceset); for(i = 0 ; i < nb_trace ; i++) { ts = LTTV_TRACE_STATE(self->parent.traces[i]); + lttv_trace_find_hook(ts->parent.t, "core","block_start",NULL, + NULL, NULL, block_start, &hook_start); + lttv_trace_find_hook(ts->parent.t, "core","block_end",NULL, - NULL, NULL, block_end, &hook); + NULL, NULL, block_end, &hook_end); - nb_control = ltt_trace_control_tracefile_number(ts->parent.t); - nb_per_cpu = ltt_trace_per_cpu_tracefile_number(ts->parent.t); - nb_tracefile = nb_control + nb_per_cpu; - for(j = 0 ; j < nb_tracefile ; j++) { - if(j < nb_control) { - tfs = LTTV_TRACEFILE_STATE(ts->parent.control_tracefiles[j]); - } - else { - tfs =LTTV_TRACEFILE_STATE(ts->parent.per_cpu_tracefiles[j-nb_control]); - } + nb_tracefile = ltt_trace_control_tracefile_number(ts->parent.t) + + ltt_trace_per_cpu_tracefile_number(ts->parent.t); + for(j = 0 ; j < nb_tracefile ; j++) { + tfs = LTTV_TRACEFILE_STATE(ts->parent.tracefiles[j]); + lttv_hooks_remove_data(lttv_hooks_by_id_find( + tfs->parent.after_event_by_id, hook_start.id), hook_start.h, NULL); lttv_hooks_remove_data(lttv_hooks_by_id_find( - tfs->parent.after_event_by_id, hook.id), hook.h, NULL); + tfs->parent.after_event_by_id, hook_end.id), hook_end.h, NULL); } } } @@ -1007,11 +1149,12 @@ void lttv_state_traceset_seek_time_closest(LttvTracesetState *self, LttTime t) for(i = 0 ; i < nb_trace ; i++) { tcs = (LttvTraceState *)self->parent.traces[i]; - if(tcs->recompute_state_in_seek) { - if(tcs->saved_state_available) { - saved_states_tree = lttv_attribute_find_subdir(tcs->parent.t_a, - LTTV_STATE_SAVED_STATES); - min_pos = -1; + if(ltt_time_compare(t, *(tcs->max_time_state_recomputed_in_seek)) < 0) { + saved_states_tree = lttv_attribute_find_subdir(tcs->parent.t_a, + LTTV_STATE_SAVED_STATES); + min_pos = -1; + + if(saved_states_tree) { max_pos = lttv_attribute_get_number(saved_states_tree) - 1; mid_pos = max_pos / 2; while(min_pos < max_pos) { @@ -1029,12 +1172,12 @@ void lttv_state_traceset_seek_time_closest(LttvTracesetState *self, LttTime t) mid_pos = (min_pos + max_pos + 1) / 2; } + } - /* restore the closest earlier saved state */ - if(min_pos != -1) lttv_state_restore(tcs, closest_tree); + /* restore the closest earlier saved state */ + if(min_pos != -1) lttv_state_restore(tcs, closest_tree); - } - /* There is no saved state yet we want to have it. Restart at T0 */ + /* There is no saved state, yet we want to have it. Restart at T0 */ else { restore_init_state(tcs); lttv_process_trace_seek_time(&(tcs->parent), ltt_time_zero); @@ -1089,7 +1232,7 @@ lttv_traceset_state_get_type(void) (GClassInitFunc) traceset_state_class_init, /* class_init */ NULL, /* class_finalize */ NULL, /* class_data */ - sizeof (LttvTracesetContext), + sizeof (LttvTracesetState), 0, /* n_preallocs */ (GInstanceInitFunc) traceset_state_instance_init /* instance_init */ }; @@ -1198,7 +1341,7 @@ lttv_tracefile_state_get_type(void) } -void lttv_state_init(int argc, char **argv) +static void module_init() { LTTV_STATE_UNNAMED = g_quark_from_string("unnamed"); LTTV_STATE_MODE_UNKNOWN = g_quark_from_string("unknown execution mode"); @@ -1218,14 +1361,19 @@ void lttv_state_init(int argc, char **argv) LTTV_STATE_PROCESS = g_quark_from_string("process"); LTTV_STATE_EVENT = g_quark_from_string("event"); LTTV_STATE_SAVED_STATES = g_quark_from_string("saved states"); + LTTV_STATE_SAVED_STATES_TIME = g_quark_from_string("saved states time"); LTTV_STATE_TIME = g_quark_from_string("time"); LTTV_STATE_HOOKS = g_quark_from_string("saved state hooks"); } -void lttv_state_destroy() +static void module_destroy() { } +LTTV_MODULE("state", "State computation", \ + "Update the system state, possibly saving it at intervals", \ + module_init, module_destroy) +