X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fprocesslist.c;h=d273167dd11d8b29aaff4fb34bb5e7a109b4f0ed;hb=0e9000a1e3f30faefd65533a792ccdc2255bbcab;hp=9bedbc99f4c5cbe815d34edc73e917e49731b467;hpb=e72908ed8d4eeefde92f303b49d375b58476833a;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 9bedbc99..d273167d 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c @@ -32,7 +32,7 @@ * Methods to synchronize process list * *****************************************************************************/ -static __inline guint get_cpu_number_from_name(GQuark name); +//static __inline__ guint get_cpu_number_from_name(GQuark name); /* Enumeration of the columns */ enum @@ -279,6 +279,8 @@ ProcessList *processlist_construct(void) process_list->number_of_process = 0; process_list->cell_height_cache = -1; + process_list->current_hash_data = NULL; + /* Create the Process list */ process_list->list_store = gtk_list_store_new ( N_COLUMNS, G_TYPE_STRING, @@ -414,6 +416,11 @@ static gboolean remove_hash_item(ProcessInfo *process_info, gtk_list_store_remove (process_list->list_store, &iter); + if(process_list->current_hash_data != NULL) { + if(hashed_process_data == + process_list->current_hash_data[process_info->cpu]) + process_list->current_hash_data[process_info->cpu] = NULL; + } return TRUE; /* remove the element from the hash table */ } @@ -435,7 +442,7 @@ GtkWidget *processlist_get_widget(ProcessList *process_list) -static __inline gint get_cell_height(ProcessList *process_list, GtkTreeView *tree_view) +static __inline__ gint get_cell_height(ProcessList *process_list, GtkTreeView *tree_view) { gint height = process_list->cell_height_cache; if(height != -1) return height; @@ -468,11 +475,13 @@ int processlist_add( ProcessList *process_list, guint trace_num, const gchar *name, guint *height, + ProcessInfo **pm_process_info, HashedProcessData **pm_hashed_process_data) { ProcessInfo *Process_Info = g_new(ProcessInfo, 1); HashedProcessData *hashed_process_data = g_new(HashedProcessData, 1); *pm_hashed_process_data = hashed_process_data; + *pm_process_info = Process_Info; Process_Info->pid = pid; if(pid == 0) @@ -491,10 +500,14 @@ int processlist_add( ProcessList *process_list, */ hashed_process_data->x.over = 0; hashed_process_data->x.over_used = FALSE; + hashed_process_data->x.over_marked = FALSE; hashed_process_data->x.middle = 0; hashed_process_data->x.middle_used = FALSE; + hashed_process_data->x.middle_marked = FALSE; hashed_process_data->x.under = 0; hashed_process_data->x.under_used = FALSE; + hashed_process_data->x.under_marked = FALSE; + hashed_process_data->next_good_time = ltt_time_zero; /* Add a new row to the model */ gtk_list_store_append ( process_list->list_store, @@ -504,7 +517,7 @@ int processlist_add( ProcessList *process_list, PROCESS_COLUMN, name, PID_COLUMN, pid, PPID_COLUMN, ppid, - CPU_COLUMN, get_cpu_number_from_name(cpu), + CPU_COLUMN, cpu, BIRTH_S_COLUMN, birth->tv_sec, BIRTH_NS_COLUMN, birth->tv_nsec, TRACE_COLUMN, trace_num, @@ -539,32 +552,37 @@ int processlist_remove( ProcessList *process_list, LttTime *birth, guint trace_num) { - ProcessInfo Process_Info; + ProcessInfo process_info; gint *path_indices; HashedProcessData *hashed_process_data; GtkTreeIter iter; - Process_Info.pid = pid; + process_info.pid = pid; if(pid == 0) - Process_Info.cpu = cpu; + process_info.cpu = cpu; else - Process_Info.cpu = 0; - Process_Info.birth = *birth; - Process_Info.trace_num = trace_num; + process_info.cpu = 0; + process_info.birth = *birth; + process_info.trace_num = trace_num; if(hashed_process_data = (HashedProcessData*)g_hash_table_lookup( process_list->process_hash, - &Process_Info)) + &process_info)) { iter = hashed_process_data->y_iter; gtk_list_store_remove (process_list->list_store, &iter); g_hash_table_remove(process_list->process_hash, - &Process_Info); - + &process_info); + + if(process_list->current_hash_data != NULL) { + if(hashed_process_data == process_list->current_hash_data[cpu]) { + process_list->current_hash_data[cpu] = NULL; + } + } process_list->number_of_process--; return 0; @@ -574,45 +592,45 @@ int processlist_remove( ProcessList *process_list, } -guint processlist_get_height(ProcessList *process_list) +__inline__ guint processlist_get_height(ProcessList *process_list) { return get_cell_height(process_list, - GTK_TREE_VIEW(process_list->process_list_widget)) + (GtkTreeView*)process_list->process_list_widget) * process_list->number_of_process ; } -__inline gint processlist_get_process_pixels( ProcessList *process_list, +__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) { - ProcessInfo Process_Info; + ProcessInfo process_info; gint *path_indices; GtkTreePath *tree_path; HashedProcessData *hashed_process_data = NULL; - Process_Info.pid = pid; + process_info.pid = pid; if(pid == 0) - Process_Info.cpu = cpu; + process_info.cpu = cpu; else - Process_Info.cpu = 0; - Process_Info.birth = *birth; - Process_Info.trace_num = trace_num; + process_info.cpu = 0; + process_info.birth = *birth; + process_info.trace_num = trace_num; if(hashed_process_data = (HashedProcessData*)g_hash_table_lookup( process_list->process_hash, - &Process_Info)) + &process_info)) { tree_path = gtk_tree_model_get_path( - GTK_TREE_MODEL(process_list->list_store), + (GtkTreeModel*)process_list->list_store, &hashed_process_data->y_iter); path_indices = gtk_tree_path_get_indices (tree_path); *height = get_cell_height(process_list, - GTK_TREE_VIEW(process_list->process_list_widget)); + (GtkTreeView*)process_list->process_list_widget); *y = *height * path_indices[0]; *pm_hashed_process_data = hashed_process_data; gtk_tree_path_free(tree_path); @@ -626,8 +644,7 @@ __inline gint processlist_get_process_pixels( ProcessList *process_list, } -__inline gint processlist_get_pixels_from_data( ProcessList *process_list, - ProcessInfo *process_info, +__inline__ gint processlist_get_pixels_from_data( ProcessList *process_list, HashedProcessData *hashed_process_data, guint *y, guint *height) @@ -635,12 +652,12 @@ __inline gint processlist_get_pixels_from_data( ProcessList *process_list, gint *path_indices; GtkTreePath *tree_path; - tree_path = gtk_tree_model_get_path(GTK_TREE_MODEL(process_list->list_store), + tree_path = gtk_tree_model_get_path((GtkTreeModel*)process_list->list_store, &hashed_process_data->y_iter); path_indices = gtk_tree_path_get_indices (tree_path); *height = get_cell_height(process_list, - GTK_TREE_VIEW(process_list->process_list_widget)); + (GtkTreeView*)process_list->process_list_widget); *y = *height * path_indices[0]; gtk_tree_path_free(tree_path); @@ -648,7 +665,8 @@ __inline gint processlist_get_pixels_from_data( ProcessList *process_list, } -static __inline guint get_cpu_number_from_name(GQuark name) +#if 0 +static __inline__ guint get_cpu_number_from_name(GQuark name) { const gchar *string; char *begin; @@ -665,4 +683,4 @@ static __inline guint get_cpu_number_from_name(GQuark name) return cpu; } - +#endif //0