#include <lttv/state.h>
#include <lttv/compiler.h>
#include <lttv/traceset.h>
+#include <lttv/trace.h>
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
+#include <babeltrace/babeltrace.h>
#define PREALLOCATED_EXECUTION_STACK 10
LTT_EVENT_STATEDUMP_END,
LTT_EVENT_FUNCTION_ENTRY,
LTT_EVENT_FUNCTION_EXIT,
- LTT_EVENT_THREAD_BRAND,
LTT_EVENT_REQUEST_ISSUE,
LTT_EVENT_REQUEST_COMPLETE,
LTT_EVENT_LIST_INTERRUPT,
LTTV_STATE_RUN,
LTTV_STATE_DEAD;
-GQuark
- LTTV_STATE_UNBRANDED;
-
LttvProcessType
LTTV_STATE_USER_THREAD,
LTTV_STATE_KERNEL_THREAD;
start_time = ltt_time_from_uint64(
bt_trace_handle_get_timestamp_begin(self->trace->traceset->context,
- self->trace->id));
+ self->trace->id,BT_CLOCK_REAL));
//lttv_process_trace_seek_time(&self->parent, ltt_time_zero);
guint64 address;
process = (LttvProcessState *)value;
- fprintf(fp," <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\" FREE_EVENTS=\"%u\">\n",
+ fprintf(fp," <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" CPU=\"%u\" FREE_EVENTS=\"%u\">\n",
process, process->pid, process->tgid, process->ppid,
g_quark_to_string(process->type),
process->creation_time.tv_sec,
process->insertion_time.tv_sec,
process->insertion_time.tv_nsec,
g_quark_to_string(process->name),
- g_quark_to_string(process->brand),
process->cpu, process->free_events);
for(i = 0 ; i < process->execution_stack->len; i++) {
//fprintf(fp, "%s", g_quark_to_string(process->name));
//fputc('\0', fp);
fwrite(&process->name, sizeof(process->name), 1, fp);
- //fprintf(fp, "%s", g_quark_to_string(process->brand));
//fputc('\0', fp);
- fwrite(&process->brand, sizeof(process->brand), 1, fp);
fwrite(&process->pid, sizeof(process->pid), 1, fp);
fwrite(&process->free_events, sizeof(process->free_events), 1, fp);
fwrite(&process->tgid, sizeof(process->tgid), 1, fp);
fwrite(&process->insertion_time, sizeof(process->insertion_time), 1, fp);
#if 0
- fprintf(fp," <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\" PROCESS_TYPE=%u>\n",
+ fprintf(fp," <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" CPU=\"%u\" PROCESS_TYPE=%u>\n",
process, process->pid, process->tgid, process->ppid,
g_quark_to_string(process->type),
process->creation_time.tv_sec,
process->insertion_time.tv_sec,
process->insertion_time.tv_nsec,
g_quark_to_string(process->name),
- g_quark_to_string(process->brand),
process->cpu);
#endif //0
res = fread(&tmp.type, sizeof(tmp.type), 1, fp);
res += fread(&tmp.name, sizeof(tmp.name), 1, fp);
- res += fread(&tmp.brand, sizeof(tmp.brand), 1, fp);
res += fread(&tmp.pid, sizeof(tmp.pid), 1, fp);
res += fread(&tmp.free_events, sizeof(tmp.free_events), 1, fp);
res += fread(&tmp.tgid, sizeof(tmp.tgid), 1, fp);
(gchar*)g_ptr_array_index(quarktable, tmp.type));
process->tgid = tmp.tgid;
process->ppid = tmp.ppid;
- process->brand = g_quark_from_string(
- (gchar*)g_ptr_array_index(quarktable, tmp.brand));
process->name =
g_quark_from_string((gchar*)g_ptr_array_index(quarktable, tmp.name));
process->free_events = tmp.free_events;
running_process = *(value.v_pointer);
g_free(running_process);
- /* free cpu resource states */
+ /* free cpu resources */
type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_CPUS_COUNT, &value);
g_assert(type == LTTV_UINT);
nb_cpus = *value.v_uint;
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_info("{ %u, %u, %s, %s, %s }\n",
+ g_info("{ %u, %u, %s, %s }\n",
process->pid,
process->ppid,
g_quark_to_string(process->name),
- g_quark_to_string(process->brand),
g_quark_to_string(process->state->s));
return;
}
process->execution_stack =
g_array_set_size(process->execution_stack, depth - 1);
+
process->state = &g_array_index(process->execution_stack, LttvExecutionState,
depth - 2);
process->state->change = lttv_event_get_timestamp(event);
+
+ if((process->state->t == LTTV_STATE_MODE_UNKNOWN) && (t == LTTV_STATE_SYSCALL)) {
+ //Force state at running
+ process->state->t = LTTV_STATE_USER_MODE;
+ process->state->s = LTTV_STATE_RUN;
+ }
}
struct search_result {
process->tgid = tgid;
process->cpu = cpu;
process->name = name;
- process->brand = LTTV_STATE_UNBRANDED;
//process->last_cpu = tfs->cpu_name;
//process->last_cpu_index = ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf);
process->type = LTTV_STATE_USER_THREAD;
ts = event->state;
nt = ts->name_tables;
- irq = lttv_event_get_long_unsigned(event, "irq");
+ irq = lttv_event_get_long(event, "irq");
expand_irq_table(ts, irq);
event = (LttvEvent *) call_data;
if (strcmp(lttv_traceset_get_name_from_event(event),
- "softirq_exit") != 0)
+ "softirq_entry") != 0)
return FALSE;
cpu = lttv_traceset_get_cpuid_from_event(event);
ts = event->state;
woken_pid = lttv_event_get_long(event, "tid");
- woken_cpu = lttv_event_get_long_unsigned(event, "target_cpu");
+ woken_cpu = lttv_event_get_long(event, "target_cpu");
timestamp = lttv_event_get_timestamp(event);
process = lttv_state_find_process_or_create(
guint pid_in, pid_out;
gint64 state_out;
+ //TODO ybrosseau 2012-07-13: manage this 20 in a constact or dynamically
+ char next_comm[20];
LttTime timestamp;
event = (LttvEvent *) call_data;
if (strcmp(lttv_traceset_get_name_from_event(event),
cpu = lttv_traceset_get_cpuid_from_event(event);
ts = event->state;
process = ts->running_process[cpu];
- pid_out = lttv_event_get_long_unsigned(event, "prev_tid");
- pid_in = lttv_event_get_long_unsigned(event, "next_tid");
+ pid_out = lttv_event_get_long(event, "prev_tid");
+ pid_in = lttv_event_get_long(event, "next_tid");
state_out = lttv_event_get_long(event, "prev_state");
+ strncpy(next_comm, lttv_event_get_string(event, "next_comm"), 20);
+ next_comm[20-1] = '\0';
+
timestamp = lttv_event_get_timestamp(event);
if(likely(process != NULL)) {
process->cpu = cpu;
// process->last_cpu_index = ltt_tracefile_num(((LttvTracefileContext*)s)->tf);
process->state->change = timestamp;
+ process->name = g_quark_from_string(next_comm);
/* update cpu status */
if(pid_in == 0)
/* Skip Parent PID param */
/* Child PID */
- child_pid = lttv_event_get_long_unsigned(event, "child_tid");
+ child_pid = lttv_event_get_long(event, "child_tid");
//ts->target_pid = child_pid;
/* Child TGID */
}
g_assert(child_process->name == LTTV_STATE_UNNAMED);
child_process->name = process->name;
- child_process->brand = process->brand;
return FALSE;
}
ts = event->state;
process = ts->running_process[cpu];
- pid = lttv_event_get_long_unsigned(event, "tid");
+ pid = lttv_event_get_long(event, "tid");
//s->parent.target_pid = pid;
// FIXME : Add this test in the "known state" section
process = ts->running_process[cpu];
/* PID of the process to release */
- release_pid = lttv_event_get_long_unsigned(event, "_tid");
+ release_pid = lttv_event_get_long(event, "_tid");
//s->parent.target_pid = release_pid;
g_assert(release_pid != 0);
process->name = g_quark_from_string(lttv_event_get_string(event,
"filename"));
- process->brand = LTTV_STATE_UNBRANDED;
//g_free(null_term_name);
return FALSE;
}
-#ifdef BABEL_CLEANUP
-static gboolean thread_brand(void *hook_data, void *call_data)
-{
- LttvTracefileState *s = (LttvTracefileState *)call_data;
- LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
- LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
- LttvTraceHook *th = (LttvTraceHook *)hook_data;
- gchar *name;
- guint cpu = s->cpu;
- LttvProcessState *process = ts->running_process[cpu];
-
- name = ltt_event_get_string(e, lttv_trace_get_hook_field(th, 0));
- process->brand = g_quark_from_string(name);
-
- return FALSE;
-}
-#endif
#if 0
// TODO We only have sys_open, without the FD
// manage to do somehting better
timestamp = lttv_event_get_timestamp(event);
/* PID */
- pid = lttv_event_get_long_unsigned(event, "tid");
+ pid = lttv_event_get_long(event, "tid");
//s->parent.target_pid = pid;
/* Parent PID */
- parent_pid = lttv_event_get_long_unsigned(event, "ppid");
+ parent_pid = lttv_event_get_long(event, "ppid");
/* Command name */
command = lttv_event_get_string(event, "name");
/* type */
- type = lttv_event_get_long_unsigned(event, "type");
+ type = lttv_event_get_long(event, "type");
//FIXME: type is rarely used, enum must match possible types.
/* Skip submode 5th param */
/* Skip status 6th param */
-
/* TGID */
- tgid = lttv_event_get_long_unsigned(event, "pid");
+ tgid = lttv_event_get_long(event, "pid");
if(pid == 0) {
nb_cpus = lttv_trace_get_num_cpu(ts->trace);
LttvAttributeValue value;
LttvHooks*event_hook;
+#ifdef BABEL_CLEANUP
LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
result = lttv_iattribute_find_by_path(attributes, "hooks/event",
LTTV_POINTER, &value);
g_assert(result);
event_hook = *(value.v_pointer);
+#endif
+ //TODO ybrosseau 2012-07-12: Validate that using traceset hooks instead of the global one is valid
+ //Use traceset hooks
+ event_hook = lttv_traceset_get_hooks(traceset);
g_assert(event_hook);
lttv_hooks_add(event_hook,syscall_entry , NULL, LTTV_PRIO_STATE);
lttv_hooks_add(event_hook,schedchange , NULL, LTTV_PRIO_STATE);
lttv_hooks_add(event_hook,sched_try_wakeup , NULL, LTTV_PRIO_STATE);
lttv_hooks_add(event_hook,process_exit , NULL, LTTV_PRIO_STATE);
- lttv_hooks_add(event_hook,process_free , NULL, LTTV_PRIO_STATE);
+ lttv_hooks_add(event_hook,process_free , NULL, LTTV_PRIO_STATE);
+ lttv_hooks_add(event_hook,process_fork , NULL, LTTV_PRIO_STATE);
lttv_hooks_add(event_hook,process_exec , NULL, LTTV_PRIO_STATE);
lttv_hooks_add(event_hook,enum_process_state , NULL, LTTV_PRIO_STATE);
lttv_hooks_add(event_hook,statedump_end , NULL, LTTV_PRIO_STATE);
FIELD_ARRAY(LTT_FIELD_FILENAME),
process_exec, NULL, &hooks);
- lttv_trace_find_hook(ts->parent.t,
- LTT_CHANNEL_USERSPACE,
- LTT_EVENT_THREAD_BRAND,
- FIELD_ARRAY(LTT_FIELD_NAME),
- thread_brand, NULL, &hooks);
-
/* statedump-related hooks */
lttv_trace_find_hook(ts->parent.t,
LTT_CHANNEL_TASK_STATE,
gint lttv_state_hook_remove_event_hooks(void *hook_data, void *call_data)
{
- //TODO ybrosseau 2012-05-11 Reactivate the remove
-#if 0
- LttvTracesetState *tss = (LttvTracesetState*)(call_data);
- lttv_state_remove_event_hooks(tss);
-#endif
+ LttvTraceset *traceset = (LttvTraceset*)(call_data);
+
+ lttv_state_remove_event_hooks(traceset);
+
return 0;
}
-#if 0
-void lttv_state_remove_event_hooks(LttvTracesetState *self)
+
+void lttv_state_remove_event_hooks(LttvTraceset *traceset)
{
- LttvTraceset *traceset = self->parent.ts;
guint i, j, k, nb_trace, nb_tracefile;
- LttvTraceState *ts;
+ //LttvTraceState *ts;
- LttvTracefileState *tfs;
+ //GArray *hooks;
- GArray *hooks;
+ //LttvTraceHook *th;
- LttvTraceHook *th;
+ //LttvAttributeValue val;
- LttvAttributeValue val;
+ LttvHooks*event_hook;
+ //TODO ybrosseau 2012-07-17 validate this. Reversed what's done in the add
+ event_hook = lttv_traceset_get_hooks(traceset);
+
+ g_assert(event_hook);
+
+ lttv_hooks_remove(event_hook,syscall_entry );
+ lttv_hooks_remove(event_hook,syscall_exit);
+ lttv_hooks_remove(event_hook,irq_entry );
+ lttv_hooks_remove(event_hook,irq_exit );
+ lttv_hooks_remove(event_hook,soft_irq_raise);
+ lttv_hooks_remove(event_hook,soft_irq_entry);
+ lttv_hooks_remove(event_hook,soft_irq_exit);
+ lttv_hooks_remove(event_hook,schedchange);
+ lttv_hooks_remove(event_hook,sched_try_wakeup);
+ lttv_hooks_remove(event_hook,process_exit);
+ lttv_hooks_remove(event_hook,process_free);
+ lttv_hooks_remove(event_hook,process_exec);
+ lttv_hooks_remove(event_hook,enum_process_state);
+ lttv_hooks_remove(event_hook,statedump_end);
+ lttv_hooks_remove(event_hook,enum_interrupt);
+#ifdef BABEL_CLEANUP
nb_trace = lttv_traceset_number(traceset);
for(i = 0 ; i < nb_trace ; i++) {
- ts = LTTV_TRACE_STATE(self->parent.traces[i]);
+ ts = lttv_traceset_get(i);
lttv_attribute_find(ts->parent.a, LTTV_STATE_HOOKS, LTTV_POINTER, &val);
hooks = *(val.v_pointer);
lttv_trace_hook_remove_all(&hooks);
g_array_free(hooks, TRUE);
}
-}
#endif
-#ifdef BABEL_CLEANUP
+}
+
+
static gboolean state_save_event_hook(void *hook_data, void *call_data)
{
guint *event_count = (guint*)hook_data;
else
*event_count = 0;
- LttvTracefileState *self = (LttvTracefileState *)call_data;
+ LttvEvent *event = (LttvEvent *)call_data;
- LttvTraceState *tcs = (LttvTraceState *)(self->parent.t_context);
+ LttvTraceset *traceset = lttv_trace_get_traceset(event->state->trace);
LttvAttribute *saved_states_tree, *saved_state_tree;
LttvAttributeValue value;
+ LttTime currentTime;
+ guint i;
+ currentTime = lttv_event_get_timestamp(event);
+ int nb_trace = lttv_traceset_number(traceset);
+ for(i = 0 ; i < nb_trace ; i++) {
- saved_states_tree = lttv_attribute_find_subdir(tcs->parent.t_a,
- LTTV_STATE_SAVED_STATES);
- saved_state_tree = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
- value = lttv_attribute_add(saved_states_tree,
- 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) = self->parent.timestamp;
- lttv_state_save(tcs, saved_state_tree);
- g_debug("Saving state at time %lu.%lu", self->parent.timestamp.tv_sec,
- self->parent.timestamp.tv_nsec);
+ LttvTrace *trace = lttv_traceset_get(traceset, i);
+ LttvTraceState *tstate = trace->state;
+ saved_states_tree = lttv_attribute_find_subdir(trace->a,
+ LTTV_STATE_SAVED_STATES);
+
+ saved_state_tree = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
+ value = lttv_attribute_add(saved_states_tree,
+ lttv_attribute_get_number(saved_states_tree), LTTV_GOBJECT);
+ *(value.v_gobject) = (GObject *)saved_state_tree;
- *(tcs->max_time_state_recomputed_in_seek) = self->parent.timestamp;
+ value = lttv_attribute_add(saved_state_tree, LTTV_STATE_TIME, LTTV_TIME);
+ *(value.v_time) = currentTime;
+
+ lttv_state_save(tstate, saved_state_tree);
+ g_debug("Saving state at time %lu.%lu", currentTime.tv_sec,
+ currentTime.tv_nsec);
+
+ *(tstate->max_time_state_recomputed_in_seek) = currentTime;
+ }
return FALSE;
}
static gboolean state_save_after_trace_hook(void *hook_data, void *call_data)
{
- LttvTraceState *tcs = (LttvTraceState *)(call_data);
+#warning "Would we move max_time to traceset"
+ LttvTrace *trace = (LttvTrace *)(call_data);
+ LttvTraceState *tcs = trace->state;
+ TimeInterval time_span = lttv_traceset_get_time_span_real(lttv_trace_get_traceset(trace));
- *(tcs->max_time_state_recomputed_in_seek) = tcs->parent.time_span.end_time;
+ *(tcs->max_time_state_recomputed_in_seek) = time_span.end_time;
return FALSE;
}
-
+#ifdef BABEL_CLEANUP
guint lttv_state_current_cpu(LttvTracefileState *tfs)
{
return tfs->cpu;
}
}
#endif //0
-#ifdef BABEL_CLEANUP
-void lttv_state_save_add_event_hooks(LttvTracesetState *self)
+
+void lttv_state_save_add_event_hooks(LttvTraceset *traceset)
{
- LttvTraceset *traceset = self->parent.ts;
guint i, j, nb_trace, nb_tracefile;
LttvTracefileState *tfs;
-
+
+ if(!traceset->has_precomputed_states) {
+ guint *event_count = g_new(guint, 1);
+
+ *event_count = 0;
+ lttv_hooks_add(traceset->event_hooks,
+ state_save_event_hook,
+ event_count,
+ LTTV_PRIO_STATE);
+
+#ifdef BABEL_CLEANUP
nb_trace = lttv_traceset_number(traceset);
for(i = 0 ; i < nb_trace ; i++) {
}
}
-
- lttv_process_traceset_begin(&self->parent,
- NULL, NULL, NULL, NULL, NULL);
+#endif
+ lttv_process_traceset_begin(traceset,
+ NULL, NULL, NULL, NULL, NULL);
+ }
}
gint lttv_state_save_hook_add_event_hooks(void *hook_data, void *call_data)
{
- LttvTracesetState *tss = (LttvTracesetState*)(call_data);
+ LttvTraceset *ts = (LttvTraceset*)(call_data);
- lttv_state_save_add_event_hooks(tss);
+ lttv_state_save_add_event_hooks(ts);
return 0;
}
-#endif
+
#if 0
void lttv_state_save_remove_event_hooks(LttvTracesetState *self)
}
}
#endif //0
-#ifdef BABEL_CLEANUP
-void lttv_state_save_remove_event_hooks(LttvTracesetState *self)
+
+void lttv_state_save_remove_event_hooks(LttvTraceset *traceset)
{
- LttvTraceset *traceset = self->parent.ts;
guint i, j, nb_trace, nb_tracefile;
LttvTracefileState *tfs;
LttvHooks *after_trace = lttv_hooks_new();
+ guint *event_count = NULL;
lttv_hooks_add(after_trace,
state_save_after_trace_hook,
LTTV_PRIO_STATE);
- lttv_process_traceset_end(&self->parent,
- NULL, after_trace, NULL, NULL, NULL);
+ lttv_process_traceset_end(traceset,
+ NULL, after_trace, NULL, NULL);
lttv_hooks_destroy(after_trace);
- nb_trace = lttv_traceset_number(traceset);
+ //nb_trace = lttv_traceset_number(traceset);
+
+ event_count = lttv_hooks_remove(traceset->event_hooks,
+ state_save_event_hook);
+
+ if(event_count) g_free(event_count);
+
+#ifdef BABEL_CLEANUP
for(i = 0 ; i < nb_trace ; i++) {
ts = (LttvTraceState *)self->parent.traces[i];
}
if(event_count) g_free(event_count);
}
+#endif
}
gint lttv_state_save_hook_remove_event_hooks(void *hook_data, void *call_data)
{
- LttvTracesetState *tss = (LttvTracesetState*)(call_data);
+ LttvTraceset *ts = (LttvTraceset*)(call_data);
- lttv_state_save_remove_event_hooks(tss);
+ lttv_state_save_remove_event_hooks(ts);
return 0;
}
-void lttv_state_traceset_seek_time_closest(LttvTracesetState *self, LttTime t)
+
+void lttv_state_traceset_seek_time(LttvTraceset *traceset, LttTime t)
+{
+ lttv_state_traceset_seek_time_closest(traceset,
+ t);
+ lttv_process_traceset_middle(traceset, t, G_MAXUINT,
+ NULL);
+}
+
+void lttv_state_traceset_seek_position(LttvTraceset *traceset, LttvTracesetPosition *position)
{
- LttvTraceset *traceset = self->parent.ts;
+ LttTime t = lttv_traceset_position_get_time(position);
+
+ lttv_state_traceset_seek_time_closest(traceset,
+ t);
+ lttv_process_traceset_middle(traceset,
+ ltt_time_infinite,
+ G_MAXUINT,
+ position);
+}
+void lttv_state_traceset_seek_time_closest(LttvTraceset *traceset, LttTime t)
+{
guint i, nb_trace;
int min_pos, mid_pos, max_pos;
guint call_rest = 0;
-
- LttvTraceState *tcs;
+ guint resto_start = 0;
+ guint resto_at = 0;
LttvAttributeValue value;
gboolean is_named;
LttvAttribute *saved_states_tree, *saved_state_tree, *closest_tree = NULL;
+
+ LttTime closest_tree_time, restored_time;
+ guint first_restored_time = 1;
//g_tree_destroy(self->parent.pqueue);
//self->parent.pqueue = g_tree_new(compare_tracefile);
- g_info("Entering seek_time_closest for time %lu.%lu", t.tv_sec, t.tv_nsec);
+ g_debug("Entering seek_time_closest for time %lu.%lu", t.tv_sec, t.tv_nsec);
nb_trace = lttv_traceset_number(traceset);
for(i = 0 ; i < nb_trace ; i++) {
- tcs = (LttvTraceState *)self->parent.traces[i];
- if(ltt_time_compare(t, *(tcs->max_time_state_recomputed_in_seek)) < 0) {
- saved_states_tree = lttv_attribute_find_subdir(tcs->parent.t_a,
+ LttvTrace *trace = lttv_traceset_get(traceset, i);
+ LttvTraceState *tstate = trace->state;
+
+ if(ltt_time_compare(t, *(tstate->max_time_state_recomputed_in_seek)) < 0) {
+ saved_states_tree = lttv_attribute_find_subdir(trace->a,
LTTV_STATE_SAVED_STATES);
min_pos = -1;
if(ltt_time_compare(*(value.v_time), t) < 0) {
min_pos = mid_pos;
closest_tree = saved_state_tree;
+ closest_tree_time = *(value.v_time);
}
else max_pos = mid_pos - 1;
/* restore the closest earlier saved state */
if(min_pos != -1) {
- lttv_state_restore(tcs, closest_tree);
- call_rest = 1;
+ if(first_restored_time || (ltt_time_compare(restored_time, closest_tree_time) == 0)) {
+ first_restored_time = 0;
+ lttv_state_restore(tstate, closest_tree);
+
+ restored_time = closest_tree_time;
+ call_rest = 1;
+ } else {
+ g_debug("State: restored time mismatch between traces");
+ resto_start = 1;
+ break;
+ }
+
}
/* 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);
+ resto_start = 1;
+ break;
}
}
/* We want to seek quickly without restoring/updating the state */
else {
- restore_init_state(tcs);
- lttv_process_trace_seek_time(&(tcs->parent), t);
+ resto_at = 1;
+ break;
}
}
- if(!call_rest) g_info("NOT Calling restore");
+
+ if(resto_start || resto_at) {
+ // Restore init state and seek so
+ for(i = 0 ; i < nb_trace ; i++) {
+
+ LttvTrace *trace = lttv_traceset_get(traceset, i);
+ LttvTraceState *tstate = trace->state;
+
+ restore_init_state(tstate);
+ }
+
+ // If t > max saved state
+ if(resto_at) {
+ lttv_process_traceset_seek_time(traceset, t);
+ } else if (resto_start) {
+ // If no saved state
+ lttv_process_traceset_seek_time(traceset, ltt_time_zero);
+ } else {
+ g_assert(FALSE);
+ }
+ g_info("NOT Calling restore");
+
+ } else {
+ // Seek at checkpoint
+ lttv_process_traceset_seek_time(traceset, restored_time);
+
+
+ }
+
+
}
-#endif
+
#ifdef BABEL_CLEANUP
static void traceset_state_instance_init (GTypeInstance *instance, gpointer g_class)
{
static void module_init(void)
{
LTTV_STATE_UNNAMED = g_quark_from_string("");
- LTTV_STATE_UNBRANDED = g_quark_from_string("");
LTTV_STATE_MODE_UNKNOWN = g_quark_from_string("MODE_UNKNOWN");
LTTV_STATE_USER_MODE = g_quark_from_string("USER_MODE");
LTTV_STATE_MAYBE_USER_MODE = g_quark_from_string("MAYBE_USER_MODE");
LTT_EVENT_STATEDUMP_END = g_quark_from_string("statedump_end");
LTT_EVENT_FUNCTION_ENTRY = g_quark_from_string("function_entry");
LTT_EVENT_FUNCTION_EXIT = g_quark_from_string("function_exit");
- LTT_EVENT_THREAD_BRAND = g_quark_from_string("thread_brand");
LTT_EVENT_REQUEST_ISSUE = g_quark_from_string("_blk_request_issue");
LTT_EVENT_REQUEST_COMPLETE = g_quark_from_string("_blk_request_complete");
LTT_EVENT_LIST_INTERRUPT = g_quark_from_string("interrupt");
projects / lttv.git / blobdiff