* MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <gtk/gtk.h>
#include <glib.h>
#include <string.h>
* 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;
-
- 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);
+ } else { /* if not 0, order by pid */
- 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;
}
-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));
gint x, gint y,
gint width, gint height)
{
- gint cell_height =
- get_cell_height(process_list,
- (GtkTreeView*)process_list->process_list_widget);
- cell_height = 24; //FIXME
+ if(process_list->index_to_pixmap->len == 0) return;
+ guint cell_height = process_list->cell_height;
+
/* Get indexes */
gint begin = floor(y/(double)cell_height);
gint end = MIN(ceil((y+height)/(double)cell_height),
process_list->index_to_pixmap->len);
gint i;
- g_warning("begin : %i, end : %i", begin,end);
+
for(i=begin; i<end; i++) {
g_assert(i<process_list->index_to_pixmap->len);
/* Render the pixmap to the screen */
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
* cell_renderer to the first column of the model */
/* Columns alignment : 0.0 : Left 0.5 : Center 1.0 : Right */
renderer = gtk_cell_renderer_text_new ();
+ process_list->renderer = renderer;
+
+ gtk_cell_renderer_get_size(renderer,
+ GTK_WIDGET(process_list->process_list_widget),
+ NULL,
+ NULL,
+ NULL,
+ 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",
BIRTH_NS_COLUMN, birth->tv_nsec,
TRACE_COLUMN, trace_num,
-1);
-
+ //gtk_tree_view_set_model(GTK_TREE_VIEW(process_list->process_list_widget),
+ // GTK_TREE_MODEL(process_list->list_store));
+ //gtk_container_resize_children(GTK_CONTAINER(process_list->process_list_widget));
+
g_hash_table_insert(process_list->process_hash,
(gpointer)Process_Info,
(gpointer)hashed_process_data);
process_list->number_of_process++;
- hashed_process_data->height = get_cell_height(process_list,
- (GtkTreeView*)process_list->process_list_widget);
- hashed_process_data->height = 24; // FIXME
+ hashed_process_data->height = process_list->cell_height;
+
g_assert(hashed_process_data->height != 0);
*height = hashed_process_data->height * process_list->number_of_process;
projects / lttv.git / blobdiff