X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.c;h=55bd4e056c23b1cbb4c2e0ed9ff5ece030c6db51;hb=1d1df11d0582bef07ef2b33e8e82a75b08f32be4;hp=20d4184a43c29c01a972bbb57ad0396dd11a5f54;hpb=dbd243b1b5f764129ae8bcf95432df750bec4a8b;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c index 20d4184a..55bd4e05 100644 --- a/ltt/branches/poly/lttv/lttv/state.c +++ b/ltt/branches/poly/lttv/lttv/state.c @@ -26,6 +26,8 @@ #include #include +#define PREALLOCATED_EXECUTION_STACK 10 + LttvExecutionMode LTTV_STATE_MODE_UNKNOWN, LTTV_STATE_USER_MODE, @@ -97,21 +99,26 @@ void lttv_state_state_saved_free(LttvTraceState *self, guint process_hash(gconstpointer key) { - return ((const LttvProcessState *)key)->pid; + guint pid = ((const LttvProcessState *)key)->pid; + return (pid>>8 ^ pid>>4 ^ pid>>2 ^ pid) ; } +/* If the hash table hash function is well distributed, + * the process_equal should compare different pid */ gboolean process_equal(gconstpointer a, gconstpointer b) { const LttvProcessState *process_a, *process_b; - + gboolean ret = TRUE; + process_a = (const LttvProcessState *)a; process_b = (const LttvProcessState *)b; + + if(likely(process_a->pid != process_b->pid)) ret = FALSE; + else if(likely(process_a->pid == 0 && + process_a->last_cpu != process_b->last_cpu)) ret = FALSE; - 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; + return ret; } @@ -136,6 +143,7 @@ restore_init_state(LttvTraceState *self) tfcs->process = lttv_state_create_process(tfcs, NULL,0); tfcs->process->state->s = LTTV_STATE_RUN; tfcs->process->last_cpu = tfcs->cpu_name; + tfcs->process->last_cpu_index = ((LttvTracefileContext*)tfcs)->index; } } @@ -321,8 +329,8 @@ static void copy_process_state(gpointer key, gpointer value,gpointer user_data) process = (LttvProcessState *)value; new_process = g_new(LttvProcessState, 1); *new_process = *process; - new_process->execution_stack = g_array_new(FALSE, FALSE, - sizeof(LttvExecutionState)); + new_process->execution_stack = g_array_sized_new(FALSE, FALSE, + sizeof(LttvExecutionState), PREALLOCATED_EXECUTION_STACK); g_array_set_size(new_process->execution_stack,process->execution_stack->len); for(i = 0 ; i < process->execution_stack->len; i++) { g_array_index(new_process->execution_stack, LttvExecutionState, i) = @@ -776,6 +784,7 @@ lttv_state_create_process(LttvTracefileState *tfs, LttvProcessState *parent, process->pid = pid; process->last_cpu = tfs->cpu_name; + process->last_cpu_index = ((LttvTracefileContext*)tfs)->index; g_warning("Process %u, core %p", process->pid, process); g_hash_table_insert(tcs->processes, process, process); @@ -800,8 +809,9 @@ lttv_state_create_process(LttvTracefileState *tfs, LttvProcessState *parent, 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)); + process->last_cpu_index = ((LttvTracefileContext*)tfs)->index; + process->execution_stack = g_array_sized_new(FALSE, FALSE, + sizeof(LttvExecutionState), PREALLOCATED_EXECUTION_STACK); g_array_set_size(process->execution_stack, 1); es = process->state = &g_array_index(process->execution_stack, LttvExecutionState, 0); @@ -834,7 +844,7 @@ 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); + if(unlikely(process == NULL)) process = lttv_state_create_process(tfs, NULL, pid); return process; } @@ -958,7 +968,7 @@ static gboolean schedchange(void *hook_data, void *call_data) pid_out = ltt_event_get_unsigned(s->parent.e, h->f2); state_out = ltt_event_get_unsigned(s->parent.e, h->f3); - if(s->process != NULL) { + if(likely(s->process != NULL)) { /* We could not know but it was not the idle process executing. This should only happen at the beginning, before the first schedule @@ -966,14 +976,14 @@ static gboolean schedchange(void *hook_data, void *call_data) is missing. It is not obvious how we could, after the fact, compensate the wrongly attributed statistics. */ - if(s->process->pid != pid_out) { + if(unlikely(s->process->pid != pid_out)) { g_assert(s->process->pid == 0); } - if(s->process->state->s == LTTV_STATE_EXIT) { + if(unlikely(s->process->state->s == LTTV_STATE_EXIT)) { s->process->state->s = LTTV_STATE_ZOMBIE; } else { - if(state_out == 0) s->process->state->s = LTTV_STATE_WAIT_CPU; + if(unlikely(state_out == 0)) s->process->state->s = LTTV_STATE_WAIT_CPU; else s->process->state->s = LTTV_STATE_WAIT; } /* FIXME : we do not remove process here, because the kernel * still has them : they may be zombies. We need to know @@ -988,6 +998,7 @@ static gboolean schedchange(void *hook_data, void *call_data) 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->last_cpu_index = ((LttvTracefileContext*)s)->index; s->process->state->change = s->parent.timestamp; return FALSE; } @@ -1005,7 +1016,7 @@ static gboolean process_fork(LttvTraceHook *trace_hook, LttvTracefileState *s) zombie_process = lttv_state_find_process(s, child_pid); - if(zombie_process != NULL) { + if(unlikely(zombie_process != NULL)) { /* Reutilisation of PID. Only now we are sure that the old PID * has been released. FIXME : sould know when release_task happens instead. */ @@ -1020,7 +1031,7 @@ static gboolean process_fork(LttvTraceHook *trace_hook, LttvTracefileState *s) static gboolean process_exit(LttvTraceHook *trace_hook, LttvTracefileState *s) { - if(s->process != NULL) { + if(likely(s->process != NULL)) { s->process->state->s = LTTV_STATE_EXIT; } return FALSE;