#include <gtk/gtk.h>
#include <glib.h>
+#include <string.h>
+#include <stdlib.h>
#include "processlist.h"
#include "drawitem.h"
+#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
+#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
+
+
/*****************************************************************************
* 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,
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;
+ }
+ }
}
}
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;
+ }
}
}
-
-
return 0;
}
-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)
{
- if(((ProcessInfo*)a)->pid != ((ProcessInfo*)b)->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)
- 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)
- 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)
- return 0;
-
- return 1;
+ const ProcessInfo *pa = (const ProcessInfo*)a;
+ const ProcessInfo *pb = (const ProcessInfo*)b;
+
+ 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,
G_TYPE_STRING,
G_TYPE_UINT,
+ G_TYPE_UINT,
+ G_TYPE_UINT,
G_TYPE_ULONG,
G_TYPE_ULONG,
G_TYPE_ULONG);
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_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
);
gtk_tree_view_column_set_fixed_width (column, 45);
gtk_tree_view_append_column (
GTK_TREE_VIEW (process_list->process_list_widget), column);
-
+
+ process_list->button = column->button;
+
column = gtk_tree_view_column_new_with_attributes ( "PID",
renderer,
"text",
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,
return process_list;
}
+
void processlist_destroy(ProcessList *process_list)
{
+ g_debug("processlist_destroy %p", process_list);
g_hash_table_destroy(process_list->process_hash);
process_list->process_hash = NULL;
g_free(process_list);
+ g_debug("processlist_destroy end");
}
-GtkWidget *processlist_get_widget(ProcessList *process_list)
+static gboolean remove_hash_item(ProcessInfo *process_info,
+ HashedProcessData *hashed_process_data,
+ ProcessList *process_list)
{
- return process_list->process_list_widget;
+ GtkTreeIter iter;
+
+ 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 */
}
+void processlist_clear(ProcessList *process_list)
+{
+ g_info("processlist_clear %p", process_list);
+
+ g_hash_table_foreach_remove(process_list->process_hash,
+ (GHRFunc)remove_hash_item,
+ (gpointer)process_list);
+ process_list->number_of_process = 0;
+}
-gint get_cell_height(GtkTreeView *tree_view)
+GtkWidget *processlist_get_widget(ProcessList *process_list)
{
- 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;
+ return process_list->process_list_widget;
}
+
void destroy_hash_key(gpointer key)
{
g_free(key);
int processlist_add( ProcessList *process_list,
guint pid,
+ guint cpu,
+ guint ppid,
LttTime *birth,
guint trace_num,
- gchar *name,
+ 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)
+ Process_Info->cpu = cpu;
+ else
+ Process_Info->cpu = 0;
+ Process_Info->ppid = ppid;
Process_Info->birth = *birth;
Process_Info->trace_num = trace_num;
-
- 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;
+
+ /* When we create it from before state update, we are sure that the
+ * last event occured before the beginning of the global area.
+ *
+ * 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.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, 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);
// &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)
{
- ProcessInfo Process_Info;
- gint *path_indices;
+ ProcessInfo process_info;
HashedProcessData *hashed_process_data;
GtkTreeIter iter;
- Process_Info.pid = pid;
- 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))
{
- gtk_tree_model_get_iter (
- GTK_TREE_MODEL(process_list->list_store),
- &iter,
- gtk_tree_row_reference_get_path(
- (GtkTreeRowReference*)hashed_process_data->row_ref)
- );
+ iter = hashed_process_data->y_iter;
gtk_list_store_remove (process_list->list_store, &iter);
- 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);
-
g_hash_table_remove(process_list->process_hash,
- &Process_Info);
-
+ &process_info);
+
+ 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--;
return 0;
}
-guint processlist_get_height(ProcessList *process_list)
+#if 0
+static inline guint get_cpu_number_from_name(GQuark name)
{
- 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, 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.birth = *birth;
- Process_Info.trace_num = trace_num;
-
- 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;
- return 0;
- } else {
- *pm_hashed_process_data = hashed_process_data;
- return 1;
- }
-
-}
+ const gchar *string;
+ char *begin;
+ guint cpu;
+ string = g_quark_to_string(name);
-gint processlist_get_pixels_from_data( ProcessList *process_list,
- ProcessInfo *process_info,
- HashedProcessData *hashed_process_data,
- guint *y,
- guint *height)
-{
- 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);
+ begin = strrchr(string, '/');
+ begin++;
- *height = get_cell_height(
- GTK_TREE_VIEW(process_list->process_list_widget));
- *y = *height * path_indices[0];
+ g_assert(begin != '\0');
- return 0;
+ cpu = strtoul(begin, NULL, 10);
+ return cpu;
}
+#endif //0
projects / lttv.git / blobdiff