* Methods to synchronize process list *
*****************************************************************************/
-static guint get_cpu_number_from_name(GQuark name);
+//static inline guint get_cpu_number_from_name(GQuark name);
/* Enumeration of the columns */
enum
}
-guint hash_fct(gconstpointer key)
+static guint process_list_hash_fct(gconstpointer key)
{
- return ((ProcessInfo*)key)->pid;
+ guint pid = ((const ProcessInfo*)key)->pid;
+ return ((pid>>8 ^ pid>>4 ^ pid>>2 ^ pid) ^ ((const ProcessInfo*)key)->cpu);
}
-gboolean equ_fct(gconstpointer a, gconstpointer b)
+/* If hash is good, should be different */
+static gboolean process_list_equ_fct(gconstpointer a, gconstpointer b)
{
const ProcessInfo *pa = (const ProcessInfo*)a;
const ProcessInfo *pb = (const ProcessInfo*)b;
-
- if(pa->pid != pb->pid)
- return 0;
-
- if((pa->pid == 0 && (pa->cpu != pb->cpu)))
- return 0;
-
- if(pa->birth.tv_sec != pb->birth.tv_sec)
- return 0;
-
- if(pa->birth.tv_nsec != pb->birth.tv_nsec)
- return 0;
-
- if(pa->trace_num != pb->trace_num)
- return 0;
-
- return 1;
+
+ gboolean ret = TRUE;
+
+ if(likely(pa->pid != pb->pid))
+ ret = FALSE;
+ else if(likely((pa->pid == 0 && (pa->cpu != pb->cpu))))
+ ret = FALSE;
+ else if(unlikely(ltt_time_compare(pa->birth, pb->birth) != 0))
+ ret = FALSE;
+ else if(unlikely(pa->trace_num != pb->trace_num))
+ ret = FALSE;
+
+ return ret;
}
void destroy_hash_key(gpointer key);
ProcessList* process_list = g_new(ProcessList,1);
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,
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
);
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(likely(process_list->current_hash_data != NULL)) {
+ if(likely(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 */
}
}
-
-gint get_cell_height(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;
-
- //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);
-
- return height;
-}
-
void destroy_hash_key(gpointer key)
{
g_free(key);
guint trace_num,
const gchar *name,
guint *height,
+ ProcessInfo **pm_process_info,
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;
+ *pm_process_info = Process_Info;
Process_Info->pid = pid;
if(pid == 0)
* overriden by the new state before anything is drawn.
*/
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, &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),
+ CPU_COLUMN, 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));
+#endif //0
g_hash_table_insert(process_list->process_hash,
(gpointer)Process_Info,
(gpointer)hashed_process_data);
// &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,
LttTime *birth,
guint trace_num)
{
- ProcessInfo Process_Info;
- gint *path_indices;
+ ProcessInfo process_info;
HashedProcessData *hashed_process_data;
GtkTreeIter iter;
- Process_Info.pid = pid;
- Process_Info.cpu = cpu;
- Process_Info.birth = *birth;
- Process_Info.trace_num = trace_num;
+ 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;
- if(hashed_process_data =
+ hashed_process_data =
(HashedProcessData*)g_hash_table_lookup(
process_list->process_hash,
- &Process_Info))
+ &process_info);
+ if(likely(hashed_process_data != NULL))
{
- 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);
g_hash_table_remove(process_list->process_hash,
- &Process_Info);
-
- process_list->number_of_process--;
+ &process_info);
- return 0;
- } else {
- return 1;
- }
-}
-
-
-guint processlist_get_height(ProcessList *process_list)
-{
- return get_cell_height(GTK_TREE_VIEW(process_list->process_list_widget))
- * process_list->number_of_process ;
-}
-
-
-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;
- gint *path_indices;
- GtkTreePath *tree_path;
- HashedProcessData *hashed_process_data = NULL;
-
- Process_Info.pid = pid;
- Process_Info.cpu = cpu;
- Process_Info.birth = *birth;
- Process_Info.trace_num = trace_num;
+ if(likely(process_list->current_hash_data != NULL)) {
+ if(likely(hashed_process_data == process_list->current_hash_data[cpu])) {
+ process_list->current_hash_data[cpu] = NULL;
+ }
+ }
+ process_list->number_of_process--;
- if(hashed_process_data =
- (HashedProcessData*)g_hash_table_lookup(
- process_list->process_hash,
- &Process_Info))
- {
- tree_path = gtk_tree_row_reference_get_path(
- hashed_process_data->row_ref);
- path_indices = gtk_tree_path_get_indices (tree_path);
-
- *height = get_cell_height(
- GTK_TREE_VIEW(process_list->process_list_widget));
- *y = *height * path_indices[0];
- *pm_hashed_process_data = hashed_process_data;
- gtk_tree_path_free(tree_path);
-
return 0;
} else {
- *pm_hashed_process_data = hashed_process_data;
return 1;
}
-
}
-gint processlist_get_pixels_from_data( ProcessList *process_list,
- ProcessInfo *process_info,
- HashedProcessData *hashed_process_data,
- guint *y,
- guint *height)
+#if 0
+static inline guint get_cpu_number_from_name(GQuark name)
{
- gint *path_indices;
- GtkTreePath *tree_path;
-
- tree_path = gtk_tree_row_reference_get_path(
- hashed_process_data->row_ref);
- path_indices = gtk_tree_path_get_indices (tree_path);
-
- *height = get_cell_height(
- GTK_TREE_VIEW(process_list->process_list_widget));
- *y = *height * path_indices[0];
- gtk_tree_path_free(tree_path);
-
- return 0;
-
-}
-
-static guint get_cpu_number_from_name(GQuark name)
-{
- /* remember / */
const gchar *string;
char *begin;
guint cpu;
return cpu;
}
-
+#endif //0
projects / lttv.git / blobdiff