X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fprocesslist.c;h=924d8c52501b795eb673f579433b98304250ff9f;hb=4b7dc462963cae143ed66dd82a3d88a792f91b61;hp=bc12c7d27c65965c0f43cbccd7b93057094adb0f;hpb=b9a010a28d9625c9d31968aa44f1a553daccb294;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c index bc12c7d2..924d8c52 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c @@ -18,6 +18,8 @@ #include #include +#include +#include #include "processlist.h" #include "drawitem.h" @@ -30,11 +32,15 @@ * Methods to synchronize process list * *****************************************************************************/ +static __inline guint get_cpu_number_from_name(GQuark name); + /* Enumeration of the columns */ enum { PROCESS_COLUMN, PID_COLUMN, + PPID_COLUMN, + CPU_COLUMN, BIRTH_S_COLUMN, BIRTH_NS_COLUMN, TRACE_COLUMN, @@ -66,17 +72,61 @@ gint process_sort_func ( GtkTreeModel *model, if(G_VALUE_TYPE(&a) == G_TYPE_UINT && G_VALUE_TYPE(&b) == G_TYPE_UINT ) { - if(g_value_get_uint(&a) > g_value_get_uint(&b)) - { - g_value_unset(&a); - g_value_unset(&b); - return 1; - } - if(g_value_get_uint(&a) < g_value_get_uint(&b)) { - g_value_unset(&a); - g_value_unset(&b); - return 0; + + if(g_value_get_uint(&a) == 0 && g_value_get_uint(&b) == 0) { + + GValue cpua, cpub; + + memset(&cpua, 0, sizeof(GValue)); + memset(&cpub, 0, sizeof(GValue)); + + /* If 0, order by CPU */ + gtk_tree_model_get_value( model, + it_a, + CPU_COLUMN, + &cpua); + + gtk_tree_model_get_value( model, + it_b, + CPU_COLUMN, + &cpub); + + if(G_VALUE_TYPE(&cpua) == G_TYPE_UINT + && G_VALUE_TYPE(&cpub) == G_TYPE_UINT ) + { + if(g_value_get_uint(&cpua) > g_value_get_uint(&cpub)) + { + g_value_unset(&cpua); + g_value_unset(&cpub); + return 1; + } + if(g_value_get_uint(&cpua) < g_value_get_uint(&cpub)) + { + g_value_unset(&cpua); + g_value_unset(&cpub); + return 0; + } + } + + g_value_unset(&cpua); + g_value_unset(&cpub); + + } else { /* if not 0, order by pid */ + + if(g_value_get_uint(&a) > g_value_get_uint(&b)) + { + g_value_unset(&a); + g_value_unset(&b); + return 1; + } + if(g_value_get_uint(&a) < g_value_get_uint(&b)) + { + g_value_unset(&a); + g_value_unset(&b); + return 0; + } + } } } @@ -138,13 +188,12 @@ gint process_sort_func ( GtkTreeModel *model, g_value_unset(&b); return 1; } - // Final condition - //if(g_value_get_ulong(&a) < g_value_get_ulong(&b)) - //{ - // g_value_unset(&a); - // g_value_unset(&b); - // return 0; - //} + if(g_value_get_ulong(&a) < g_value_get_ulong(&b)) + { + g_value_unset(&a); + g_value_unset(&b); + return 0; + } } @@ -180,31 +229,34 @@ gint process_sort_func ( GtkTreeModel *model, } - - return 0; } -guint hash_fct(gconstpointer key) +static guint process_list_hash_fct(gconstpointer key) { - return ((ProcessInfo*)key)->pid; + guint pid = ((ProcessInfo*)key)->pid; + return ((pid>>8 ^ pid>>4 ^ pid>>2 ^ pid) ^ ((ProcessInfo*)key)->cpu); } -gboolean equ_fct(gconstpointer a, gconstpointer b) +static gboolean process_list_equ_fct(gconstpointer a, gconstpointer b) { - if(((ProcessInfo*)a)->pid != ((ProcessInfo*)b)->pid) + const ProcessInfo *pa = (const ProcessInfo*)a; + const ProcessInfo *pb = (const ProcessInfo*)b; + + if(pa->pid != pb->pid) return 0; -// g_critical("compare %u and %u",((ProcessInfo*)a)->pid,((ProcessInfo*)b)->pid); - if(((ProcessInfo*)a)->birth.tv_sec != ((ProcessInfo*)b)->birth.tv_sec) + + if((pa->pid == 0 && (pa->cpu != pb->cpu))) + return 0; + + if(pa->birth.tv_sec != pb->birth.tv_sec) return 0; -// g_critical("compare %u and %u",((ProcessInfo*)a)->birth.tv_sec,((ProcessInfo*)b)->birth.tv_sec); - if(((ProcessInfo*)a)->birth.tv_nsec != ((ProcessInfo*)b)->birth.tv_nsec) + if(pa->birth.tv_nsec != pb->birth.tv_nsec) return 0; -// g_critical("compare %u and %u",((ProcessInfo*)a)->birth.tv_nsec,((ProcessInfo*)b)->birth.tv_nsec); - if(((ProcessInfo*)a)->trace_num != ((ProcessInfo*)b)->trace_num) + if(pa->trace_num != pb->trace_num) return 0; return 1; @@ -225,11 +277,14 @@ ProcessList *processlist_construct(void) ProcessList* process_list = g_new(ProcessList,1); process_list->number_of_process = 0; + process_list->cell_height_cache = -1; /* Create the Process list */ process_list->list_store = gtk_list_store_new ( N_COLUMNS, G_TYPE_STRING, G_TYPE_UINT, + G_TYPE_UINT, + G_TYPE_UINT, G_TYPE_ULONG, G_TYPE_ULONG, G_TYPE_ULONG); @@ -253,7 +308,7 @@ ProcessList *processlist_construct(void) GTK_SORT_ASCENDING); process_list->process_hash = g_hash_table_new_full( - hash_fct, equ_fct, + process_list_hash_fct, process_list_equ_fct, destroy_hash_key, destroy_hash_data ); @@ -285,6 +340,21 @@ ProcessList *processlist_construct(void) gtk_tree_view_append_column ( GTK_TREE_VIEW (process_list->process_list_widget), column); + column = gtk_tree_view_column_new_with_attributes ( "PPID", + renderer, + "text", + PPID_COLUMN, + NULL); + gtk_tree_view_append_column ( + GTK_TREE_VIEW (process_list->process_list_widget), column); + + column = gtk_tree_view_column_new_with_attributes ( "CPU", + renderer, + "text", + CPU_COLUMN, + NULL); + gtk_tree_view_append_column ( + GTK_TREE_VIEW (process_list->process_list_widget), column); column = gtk_tree_view_column_new_with_attributes ( "Birth sec", renderer, @@ -338,40 +408,12 @@ static gboolean remove_hash_item(ProcessInfo *process_info, HashedProcessData *hashed_process_data, ProcessList *process_list) { - GtkTreePath *tree_path; GtkTreeIter iter; - tree_path = gtk_tree_row_reference_get_path( - hashed_process_data->row_ref); - - gtk_tree_model_get_iter ( - GTK_TREE_MODEL(process_list->list_store), - &iter, tree_path); - - gtk_tree_path_free(tree_path); + iter = hashed_process_data->y_iter; gtk_list_store_remove (process_list->list_store, &iter); -#if 0 - g_free(hashed_process_data->draw_context->previous->modify_under); - g_free(hashed_process_data->draw_context->previous->modify_middle); - g_free(hashed_process_data->draw_context->previous->modify_over); - g_free(hashed_process_data->draw_context->previous->under); - g_free(hashed_process_data->draw_context->previous->middle); - g_free(hashed_process_data->draw_context->previous->over); - g_free(hashed_process_data->draw_context->previous); - g_free(hashed_process_data->draw_context->current->modify_under); - g_free(hashed_process_data->draw_context->current->modify_middle); - g_free(hashed_process_data->draw_context->current->modify_over); - g_free(hashed_process_data->draw_context->current->under); - g_free(hashed_process_data->draw_context->current->middle); - g_free(hashed_process_data->draw_context->current->over); - g_free(hashed_process_data->draw_context->current); - g_free(hashed_process_data->draw_context); - g_free(hashed_process_data); -#endif //0 - - return TRUE; /* remove the element from the hash table */ } @@ -393,18 +435,19 @@ GtkWidget *processlist_get_widget(ProcessList *process_list) -gint get_cell_height(GtkTreeView *tree_view) +static __inline gint get_cell_height(ProcessList *process_list, GtkTreeView *tree_view) { - gint height; - GtkTreeViewColumn *Column = gtk_tree_view_get_column(tree_view, 0); - //GList *Render_List = gtk_tree_view_column_get_cell_renderers(Column); - //GtkCellRenderer *Renderer = g_list_first(Render_List)->data; + gint height = process_list->cell_height_cache; + if(height != -1) return height; + else { + GtkTreeViewColumn *Column = gtk_tree_view_get_column(tree_view, 0); - //g_list_free(Render_List); - gtk_tree_view_column_cell_get_size(Column, NULL, NULL, NULL, NULL, &height); - //g_critical("cell 0 height : %u",height); + gtk_tree_view_column_cell_get_size(Column, NULL, NULL, NULL, NULL, + &process_list->cell_height_cache); + } + - return height; + return process_list->cell_height_cache; } void destroy_hash_key(gpointer key) @@ -419,18 +462,24 @@ void destroy_hash_data(gpointer data) int processlist_add( ProcessList *process_list, guint pid, + guint cpu, + guint ppid, LttTime *birth, guint trace_num, const gchar *name, guint *height, HashedProcessData **pm_hashed_process_data) { - GtkTreeIter iter ; ProcessInfo *Process_Info = g_new(ProcessInfo, 1); HashedProcessData *hashed_process_data = g_new(HashedProcessData, 1); *pm_hashed_process_data = hashed_process_data; Process_Info->pid = pid; + if(pid == 0) + Process_Info->cpu = cpu; + else + Process_Info->cpu = 0; + Process_Info->ppid = ppid; Process_Info->birth = *birth; Process_Info->trace_num = trace_num; @@ -440,74 +489,31 @@ int processlist_add( ProcessList *process_list, * If it is created after state update, this value (0) will be * overriden by the new state before anything is drawn. */ - hashed_process_data->x = 0; + hashed_process_data->x.over = 0; + hashed_process_data->x.middle = 0; + hashed_process_data->x.under = 0; -#if 0 - hashed_process_data->draw_context = g_new(DrawContext, 1); - hashed_process_data->draw_context->drawable = NULL; - hashed_process_data->draw_context->gc = NULL; - hashed_process_data->draw_context->pango_layout = NULL; - hashed_process_data->draw_context->current = g_new(DrawInfo,1); - hashed_process_data->draw_context->current->over = g_new(ItemInfo,1); - hashed_process_data->draw_context->current->over->x = -1; - hashed_process_data->draw_context->current->over->y = -1; - hashed_process_data->draw_context->current->middle = g_new(ItemInfo,1); - hashed_process_data->draw_context->current->middle->x = -1; - hashed_process_data->draw_context->current->middle->y = -1; - hashed_process_data->draw_context->current->under = g_new(ItemInfo,1); - hashed_process_data->draw_context->current->under->x = -1; - hashed_process_data->draw_context->current->under->y = -1; - hashed_process_data->draw_context->current->modify_over = g_new(ItemInfo,1); - hashed_process_data->draw_context->current->modify_over->x = -1; - hashed_process_data->draw_context->current->modify_over->y = -1; - hashed_process_data->draw_context->current->modify_middle = g_new(ItemInfo,1); - hashed_process_data->draw_context->current->modify_middle->x = -1; - hashed_process_data->draw_context->current->modify_middle->y = -1; - hashed_process_data->draw_context->current->modify_under = g_new(ItemInfo,1); - hashed_process_data->draw_context->current->modify_under->x = -1; - hashed_process_data->draw_context->current->modify_under->y = -1; - hashed_process_data->draw_context->current->status = LTTV_STATE_UNNAMED; - hashed_process_data->draw_context->previous = g_new(DrawInfo,1); - hashed_process_data->draw_context->previous->over = g_new(ItemInfo,1); - hashed_process_data->draw_context->previous->over->x = -1; - hashed_process_data->draw_context->previous->over->y = -1; - hashed_process_data->draw_context->previous->middle = g_new(ItemInfo,1); - hashed_process_data->draw_context->previous->middle->x = -1; - hashed_process_data->draw_context->previous->middle->y = -1; - hashed_process_data->draw_context->previous->under = g_new(ItemInfo,1); - hashed_process_data->draw_context->previous->under->x = -1; - hashed_process_data->draw_context->previous->under->y = -1; - hashed_process_data->draw_context->previous->modify_over = g_new(ItemInfo,1); - hashed_process_data->draw_context->previous->modify_over->x = -1; - hashed_process_data->draw_context->previous->modify_over->y = -1; - hashed_process_data->draw_context->previous->modify_middle = g_new(ItemInfo,1); - hashed_process_data->draw_context->previous->modify_middle->x = -1; - hashed_process_data->draw_context->previous->modify_middle->y = -1; - hashed_process_data->draw_context->previous->modify_under = g_new(ItemInfo,1); - hashed_process_data->draw_context->previous->modify_under->x = -1; - hashed_process_data->draw_context->previous->modify_under->y = -1; - hashed_process_data->draw_context->previous->status = LTTV_STATE_UNNAMED; -#endif //0 - /* Add a new row to the model */ - gtk_list_store_append ( process_list->list_store, &iter); - //g_critical ( "iter before : %s", gtk_tree_path_to_string ( - // gtk_tree_model_get_path ( - // GTK_TREE_MODEL(process_list->list_store), - // &iter))); - gtk_list_store_set ( process_list->list_store, &iter, + gtk_list_store_append ( process_list->list_store, + &hashed_process_data->y_iter); + + gtk_list_store_set ( process_list->list_store, &hashed_process_data->y_iter, PROCESS_COLUMN, name, PID_COLUMN, pid, + PPID_COLUMN, ppid, + CPU_COLUMN, get_cpu_number_from_name(cpu), BIRTH_S_COLUMN, birth->tv_sec, BIRTH_NS_COLUMN, birth->tv_nsec, TRACE_COLUMN, trace_num, -1); +#if 0 hashed_process_data->row_ref = gtk_tree_row_reference_new ( GTK_TREE_MODEL(process_list->list_store), gtk_tree_model_get_path( GTK_TREE_MODEL(process_list->list_store), &iter)); - g_hash_table_insert( process_list->process_hash, +#endif //0 + g_hash_table_insert(process_list->process_hash, (gpointer)Process_Info, (gpointer)hashed_process_data); @@ -517,16 +523,16 @@ int processlist_add( ProcessList *process_list, // &iter))); process_list->number_of_process++; - *height = get_cell_height(GTK_TREE_VIEW(process_list->process_list_widget)) + *height = get_cell_height(process_list, + GTK_TREE_VIEW(process_list->process_list_widget)) * process_list->number_of_process ; - return 0; - } int processlist_remove( ProcessList *process_list, guint pid, + guint cpu, LttTime *birth, guint trace_num) { @@ -536,6 +542,10 @@ int processlist_remove( ProcessList *process_list, GtkTreeIter iter; Process_Info.pid = pid; + if(pid == 0) + Process_Info.cpu = cpu; + else + Process_Info.cpu = 0; Process_Info.birth = *birth; Process_Info.trace_num = trace_num; @@ -545,36 +555,10 @@ int processlist_remove( ProcessList *process_list, process_list->process_hash, &Process_Info)) { - GtkTreePath *tree_path; - - tree_path = gtk_tree_row_reference_get_path( - hashed_process_data->row_ref); - - gtk_tree_model_get_iter ( - GTK_TREE_MODEL(process_list->list_store), - &iter, tree_path); - - gtk_tree_path_free(tree_path); + iter = hashed_process_data->y_iter; gtk_list_store_remove (process_list->list_store, &iter); -#if 0 - g_free(hashed_process_data->draw_context->previous->modify_under); - g_free(hashed_process_data->draw_context->previous->modify_middle); - g_free(hashed_process_data->draw_context->previous->modify_over); - g_free(hashed_process_data->draw_context->previous->under); - g_free(hashed_process_data->draw_context->previous->middle); - g_free(hashed_process_data->draw_context->previous->over); - g_free(hashed_process_data->draw_context->previous); - g_free(hashed_process_data->draw_context->current->modify_under); - g_free(hashed_process_data->draw_context->current->modify_middle); - g_free(hashed_process_data->draw_context->current->modify_over); - g_free(hashed_process_data->draw_context->current->under); - g_free(hashed_process_data->draw_context->current->middle); - g_free(hashed_process_data->draw_context->current->over); - g_free(hashed_process_data->draw_context->current); - g_free(hashed_process_data->draw_context); - g_free(hashed_process_data); -#endif //0 + g_hash_table_remove(process_list->process_hash, &Process_Info); @@ -589,13 +573,14 @@ int processlist_remove( ProcessList *process_list, guint processlist_get_height(ProcessList *process_list) { - return get_cell_height(GTK_TREE_VIEW(process_list->process_list_widget)) + return get_cell_height(process_list, + GTK_TREE_VIEW(process_list->process_list_widget)) * process_list->number_of_process ; } -gint processlist_get_process_pixels( ProcessList *process_list, - guint pid, LttTime *birth, guint trace_num, +__inline gint processlist_get_process_pixels( ProcessList *process_list, + guint pid, guint cpu, LttTime *birth, guint trace_num, guint *y, guint *height, HashedProcessData **pm_hashed_process_data) @@ -606,6 +591,10 @@ gint processlist_get_process_pixels( ProcessList *process_list, HashedProcessData *hashed_process_data = NULL; Process_Info.pid = pid; + if(pid == 0) + Process_Info.cpu = cpu; + else + Process_Info.cpu = 0; Process_Info.birth = *birth; Process_Info.trace_num = trace_num; @@ -614,11 +603,12 @@ gint processlist_get_process_pixels( ProcessList *process_list, process_list->process_hash, &Process_Info)) { - tree_path = gtk_tree_row_reference_get_path( - hashed_process_data->row_ref); + tree_path = gtk_tree_model_get_path( + GTK_TREE_MODEL(process_list->list_store), + &hashed_process_data->y_iter); path_indices = gtk_tree_path_get_indices (tree_path); - *height = get_cell_height( + *height = get_cell_height(process_list, GTK_TREE_VIEW(process_list->process_list_widget)); *y = *height * path_indices[0]; *pm_hashed_process_data = hashed_process_data; @@ -633,7 +623,7 @@ gint processlist_get_process_pixels( ProcessList *process_list, } -gint processlist_get_pixels_from_data( ProcessList *process_list, +__inline gint processlist_get_pixels_from_data( ProcessList *process_list, ProcessInfo *process_info, HashedProcessData *hashed_process_data, guint *y, @@ -642,11 +632,11 @@ gint processlist_get_pixels_from_data( ProcessList *process_list, gint *path_indices; GtkTreePath *tree_path; - tree_path = gtk_tree_row_reference_get_path( - hashed_process_data->row_ref); + tree_path = gtk_tree_model_get_path(GTK_TREE_MODEL(process_list->list_store), + &hashed_process_data->y_iter); path_indices = gtk_tree_path_get_indices (tree_path); - *height = get_cell_height( + *height = get_cell_height(process_list, GTK_TREE_VIEW(process_list->process_list_widget)); *y = *height * path_indices[0]; gtk_tree_path_free(tree_path); @@ -654,3 +644,22 @@ gint processlist_get_pixels_from_data( ProcessList *process_list, return 0; } + +static __inline guint get_cpu_number_from_name(GQuark name) +{ + const gchar *string; + char *begin; + guint cpu; + + string = g_quark_to_string(name); + + begin = strrchr(string, '/'); + begin++; + + g_assert(begin != '\0'); + + cpu = strtoul(begin, NULL, 10); + + return cpu; +} +