X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fprocesslist.c;h=4ecef3d2cb452dbca8e44f35efe53287144ab2a4;hb=4e4d11b3b1db254446f6cad04b3c3fa9b574851f;hp=080a92af9dc886cb66b6439bf6a7b91c3379e107;hpb=866fefbddc38ec2e13d4b18619f59961997c319f;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 080a92af..4ecef3d2 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c @@ -16,6 +16,10 @@ * MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -36,202 +40,70 @@ * 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, - N_COLUMNS -}; - gint process_sort_func ( GtkTreeModel *model, GtkTreeIter *it_a, GtkTreeIter *it_b, gpointer user_data) { - GValue a, b; + gchar *a_name; + guint a_pid, a_ppid, a_cpu; + gulong a_birth_s, a_birth_ns; + gulong a_trace; + + gchar *b_name; + guint b_pid, b_ppid, b_cpu; + gulong b_birth_s, b_birth_ns; + gulong b_trace; + + gtk_tree_model_get(model, + it_a, + 0, &a_name, + 1, &a_pid, + 2, &a_ppid, + 3, &a_cpu, + 4, &a_birth_s, + 5, &a_birth_ns, + 6, &a_trace, + -1); + + gtk_tree_model_get(model, + it_b, + 0, &b_name, + 1, &b_pid, + 2, &b_ppid, + 3, &b_cpu, + 4, &b_birth_s, + 5, &b_birth_ns, + 6, &b_trace, + -1); - memset(&a, 0, sizeof(GValue)); - memset(&b, 0, sizeof(GValue)); /* Order by PID */ - gtk_tree_model_get_value( model, - it_a, - PID_COLUMN, - &a); - - gtk_tree_model_get_value( model, - it_b, - PID_COLUMN, - &b); - - if(G_VALUE_TYPE(&a) == G_TYPE_UINT - && G_VALUE_TYPE(&b) == G_TYPE_UINT ) - { - { - - if(g_value_get_uint(&a) == 0 && g_value_get_uint(&b) == 0) { + if(a_pid == 0 && b_pid == 0) { + /* If 0, order by CPU */ + if(a_cpu > b_cpu) return 1; + if(a_cpu < b_cpu) return -1; - GValue cpua, cpub; + } else { /* if not 0, order by pid */ - 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; - } - } - } + if(a_pid > b_pid) return 1; + if(a_pid < b_pid) return -1; } - g_value_unset(&a); - g_value_unset(&b); - - /* Order by birth second */ - gtk_tree_model_get_value( model, - it_a, - BIRTH_S_COLUMN, - &a); - - gtk_tree_model_get_value( model, - it_b, - BIRTH_S_COLUMN, - &b); - - if(G_VALUE_TYPE(&a) == G_TYPE_ULONG - && G_VALUE_TYPE(&b) == G_TYPE_ULONG ) - { - if(g_value_get_ulong(&a) > g_value_get_ulong(&b)) - { - g_value_unset(&a); - g_value_unset(&b); - return 1; - } - if(g_value_get_ulong(&a) < g_value_get_ulong(&b)) - { - g_value_unset(&a); - g_value_unset(&b); - return 0; - } - - } - - g_value_unset(&a); - g_value_unset(&b); + if(a_birth_s > b_birth_s) return 1; + if(a_birth_s < b_birth_s) return -1; + /* Order by birth nanosecond */ - gtk_tree_model_get_value( model, - it_a, - BIRTH_NS_COLUMN, - &a); - - gtk_tree_model_get_value( model, - it_b, - BIRTH_NS_COLUMN, - &b); - - - if(G_VALUE_TYPE(&a) == G_TYPE_ULONG - && G_VALUE_TYPE(&b) == G_TYPE_ULONG ) - { - if(g_value_get_ulong(&a) > g_value_get_ulong(&b)) - { - g_value_unset(&a); - g_value_unset(&b); - return 1; - } - if(g_value_get_ulong(&a) < g_value_get_ulong(&b)) - { - g_value_unset(&a); - g_value_unset(&b); - return 0; - } - - } + if(a_birth_ns > b_birth_ns) return 1; + if(a_birth_ns < b_birth_ns) return -1; - g_value_unset(&a); - g_value_unset(&b); - /* Order by trace_num */ - gtk_tree_model_get_value( model, - it_a, - TRACE_COLUMN, - &a); - - gtk_tree_model_get_value( model, - it_b, - TRACE_COLUMN, - &b); - - if(G_VALUE_TYPE(&a) == G_TYPE_ULONG - && G_VALUE_TYPE(&b) == G_TYPE_ULONG ) - { - if(g_value_get_ulong(&a) > g_value_get_ulong(&b)) - { - g_value_unset(&a); - g_value_unset(&b); - return 1; - } - if(g_value_get_ulong(&a) < g_value_get_ulong(&b)) - { - g_value_unset(&a); - g_value_unset(&b); - return 0; - } - - } + if(a_trace > b_trace) return 1; + if(a_trace < b_trace) return -1; return 0; @@ -283,7 +155,7 @@ static void update_index_to_pixmap_each(ProcessInfo *key, } -static void update_index_to_pixmap(ProcessList *process_list) +void update_index_to_pixmap(ProcessList *process_list) { g_ptr_array_set_size(process_list->index_to_pixmap, g_hash_table_size(process_list->process_hash)); @@ -405,7 +277,6 @@ void copy_pixmap_to_screen(ProcessList *process_list, if(process_list->index_to_pixmap->len == 0) return; guint cell_height = process_list->cell_height; - //cell_height = 24; //FIXME /* Get indexes */ gint begin = floor(y/(double)cell_height); gint end = MIN(ceil((y+height)/(double)cell_height), @@ -463,20 +334,22 @@ ProcessList *processlist_construct(void) process_list->process_list_widget = gtk_tree_view_new_with_model (GTK_TREE_MODEL (process_list->list_store)); + g_object_unref (G_OBJECT (process_list->list_store)); - gtk_tree_sortable_set_sort_func( + gtk_tree_sortable_set_default_sort_func( GTK_TREE_SORTABLE(process_list->list_store), - PID_COLUMN, process_sort_func, NULL, NULL); - + + gtk_tree_sortable_set_sort_column_id( GTK_TREE_SORTABLE(process_list->list_store), - PID_COLUMN, + GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING); - + + process_list->process_hash = g_hash_table_new_full( process_list_hash_fct, process_list_equ_fct, destroy_hash_key, destroy_hash_data @@ -500,6 +373,11 @@ ProcessList *processlist_construct(void) NULL, &process_list->cell_height); + guint ypad; + g_object_get(G_OBJECT(renderer), "ypad", &ypad, NULL); + + process_list->cell_height += ypad; + column = gtk_tree_view_column_new_with_attributes ( "Process", renderer, "text", @@ -702,7 +580,6 @@ int processlist_add( ProcessList *process_list, hashed_process_data->height = process_list->cell_height; - //hashed_process_data->height = 24; // FIXME g_assert(hashed_process_data->height != 0); *height = hashed_process_data->height * process_list->number_of_process;