* MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <gtk/gtk.h>
+#include <gdk/gdk.h>
#include <glib.h>
#include <string.h>
#include <stdlib.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)
/* Preallocated Size of the index_to_pixmap array */
#define ALLOCATE_PROCESSES 1000
* 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,
gpointer user_data)
{
gchar *a_name;
- guint a_pid, a_ppid, a_cpu;
+ gchar *a_brand;
+ guint a_pid, a_tgid, a_ppid, a_cpu;
gulong a_birth_s, a_birth_ns;
- gulong a_trace;
+ guint a_trace;
gchar *b_name;
- guint b_pid, b_ppid, b_cpu;
+ gchar *b_brand;
+ guint b_pid, b_tgid, b_ppid, b_cpu;
gulong b_birth_s, b_birth_ns;
- gulong b_trace;
+ guint 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,
+ PROCESS_COLUMN, &a_name,
+ BRAND_COLUMN, &a_brand,
+ PID_COLUMN, &a_pid,
+ TGID_COLUMN, &a_tgid,
+ PPID_COLUMN, &a_ppid,
+ CPU_COLUMN, &a_cpu,
+ BIRTH_S_COLUMN, &a_birth_s,
+ BIRTH_NS_COLUMN, &a_birth_ns,
+ TRACE_COLUMN, &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,
+ PROCESS_COLUMN, &b_name,
+ BRAND_COLUMN, &b_brand,
+ PID_COLUMN, &b_pid,
+ TGID_COLUMN, &b_tgid,
+ PPID_COLUMN, &b_ppid,
+ CPU_COLUMN, &b_cpu,
+ BIRTH_S_COLUMN, &b_birth_s,
+ BIRTH_NS_COLUMN, &b_birth_ns,
+ TRACE_COLUMN, &b_trace,
-1);
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 0;
+ if(a_cpu < b_cpu) return -1;
} else { /* if not 0, order by pid */
if(a_pid > b_pid) return 1;
- if(a_pid < b_pid) return 0;
+ if(a_pid < b_pid) return -1;
}
/* Order by birth second */
if(a_birth_s > b_birth_s) return 1;
- if(a_birth_s < b_birth_s) return 0;
+ if(a_birth_s < b_birth_s) return -1;
/* Order by birth nanosecond */
if(a_birth_ns > b_birth_ns) return 1;
- if(a_birth_ns < b_birth_ns) return 0;
+ if(a_birth_ns < b_birth_ns) return -1;
/* Order by trace_num */
if(a_trace > b_trace) return 1;
- if(a_trace < b_trace) return 0;
+ if(a_trace < b_trace) return -1;
return 0;
if(likely(pa->pid != pb->pid))
ret = FALSE;
- else if(likely((pa->pid == 0 && (pa->cpu != pb->cpu))))
+ if(likely((pa->pid == 0 && (pa->cpu != pb->cpu))))
ret = FALSE;
- else if(unlikely(ltt_time_compare(pa->birth, pb->birth) != 0))
+ if(unlikely(ltt_time_compare(pa->birth, pb->birth) != 0))
ret = FALSE;
- else if(unlikely(pa->trace_num != pb->trace_num))
+ if(unlikely(pa->trace_num != pb->trace_num))
ret = FALSE;
return ret;
void destroy_hash_data(gpointer data);
+gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
+{
+ ControlFlowData *control_flow_data =
+ (ControlFlowData*)g_object_get_data(
+ G_OBJECT(widget),
+ "control_flow_data");
+ Drawing_t *drawing = control_flow_data->drawing;
+ unsigned int cell_height =
+ get_cell_height(GTK_TREE_VIEW(control_flow_data->process_list->process_list_widget));
+
+ switch(event->direction) {
+ case GDK_SCROLL_UP:
+ gtk_adjustment_set_value(control_flow_data->v_adjust,
+ gtk_adjustment_get_value(control_flow_data->v_adjust) - cell_height);
+ break;
+ case GDK_SCROLL_DOWN:
+ gtk_adjustment_set_value(control_flow_data->v_adjust,
+ gtk_adjustment_get_value(control_flow_data->v_adjust) + cell_height);
+ break;
+ default:
+ g_error("should only scroll up and down.");
+ }
+ return TRUE;
+}
+
+
static void update_index_to_pixmap_each(ProcessInfo *key,
HashedProcessData *value,
ProcessList *process_list)
}
-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));
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),
g_assert(i<process_list->index_to_pixmap->len);
/* Render the pixmap to the screen */
GdkPixmap *pixmap =
- (GdkPixmap*)g_ptr_array_index(process_list->index_to_pixmap, i);
+ //(GdkPixmap*)g_ptr_array_index(process_list->index_to_pixmap, i);
+ GDK_PIXMAP(g_ptr_array_index(process_list->index_to_pixmap, i));
gdk_draw_drawable (dest,
gc,
/* Create the Process list */
process_list->list_store = gtk_list_store_new ( N_COLUMNS,
G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_UINT,
G_TYPE_UINT,
G_TYPE_UINT,
G_TYPE_UINT,
G_TYPE_ULONG,
G_TYPE_ULONG,
- G_TYPE_ULONG);
+ G_TYPE_UINT);
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
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);
-
+ /* Add a temporary row to the model to get the cell size when the first
+ * real process is added. */
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ path = gtk_tree_path_new_first();
+ gtk_tree_model_get_iter (gtk_tree_view_get_model(GTK_TREE_VIEW(process_list->process_list_widget)), &iter, path);
+ gtk_list_store_append(process_list->list_store, &iter);
+
+ process_list->cell_height = 0; // not ready to get size yet.
+
column = gtk_tree_view_column_new_with_attributes ( "Process",
renderer,
"text",
PROCESS_COLUMN,
NULL);
gtk_tree_view_column_set_alignment (column, 0.0);
- gtk_tree_view_column_set_fixed_width (column, 45);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+ gtk_tree_view_column_set_resizable(column, TRUE);
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 ( "Brand",
+ renderer,
+ "text",
+ BRAND_COLUMN,
+ NULL);
+ gtk_tree_view_column_set_alignment (column, 0.0);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+ gtk_tree_view_column_set_resizable(column, TRUE);
+ gtk_tree_view_append_column (
+ GTK_TREE_VIEW (process_list->process_list_widget), column);
+
column = gtk_tree_view_column_new_with_attributes ( "PID",
renderer,
"text",
PID_COLUMN,
NULL);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+ gtk_tree_view_column_set_resizable(column, TRUE);
+ gtk_tree_view_append_column (
+ GTK_TREE_VIEW (process_list->process_list_widget), column);
+
+ column = gtk_tree_view_column_new_with_attributes ( "TGID",
+ renderer,
+ "text",
+ TGID_COLUMN,
+ NULL);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+ gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_append_column (
GTK_TREE_VIEW (process_list->process_list_widget), column);
"text",
PPID_COLUMN,
NULL);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+ gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_append_column (
GTK_TREE_VIEW (process_list->process_list_widget), column);
"text",
CPU_COLUMN,
NULL);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+ gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_append_column (
GTK_TREE_VIEW (process_list->process_list_widget), column);
"text",
BIRTH_S_COLUMN,
NULL);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+ gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_append_column (
GTK_TREE_VIEW (process_list->process_list_widget), column);
"text",
BIRTH_NS_COLUMN,
NULL);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+ gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_append_column (
GTK_TREE_VIEW (process_list->process_list_widget), column);
"text",
TRACE_COLUMN,
NULL);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+ gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_append_column (
GTK_TREE_VIEW (process_list->process_list_widget), column);
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;
+ process_list->current_hash_data[process_info->trace_num][process_info->cpu]))
+ process_list->current_hash_data[process_info->trace_num][process_info->cpu] = NULL;
}
return TRUE; /* remove the element from the hash table */
}
g_free(data);
}
+
+void processlist_set_name(ProcessList *process_list,
+ GQuark name,
+ HashedProcessData *hashed_process_data)
+{
+ gtk_list_store_set ( process_list->list_store, &hashed_process_data->y_iter,
+ PROCESS_COLUMN, g_quark_to_string(name),
+ -1);
+}
+
+void processlist_set_brand(ProcessList *process_list,
+ GQuark brand,
+ HashedProcessData *hashed_process_data)
+{
+ gtk_list_store_set ( process_list->list_store, &hashed_process_data->y_iter,
+ BRAND_COLUMN, g_quark_to_string(brand),
+ -1);
+}
+
+void processlist_set_tgid(ProcessList *process_list,
+ guint tgid,
+ HashedProcessData *hashed_process_data)
+{
+ gtk_list_store_set ( process_list->list_store, &hashed_process_data->y_iter,
+ TGID_COLUMN, tgid,
+ -1);
+}
+
+void processlist_set_ppid(ProcessList *process_list,
+ guint ppid,
+ HashedProcessData *hashed_process_data)
+{
+ gtk_list_store_set ( process_list->list_store, &hashed_process_data->y_iter,
+ PPID_COLUMN, ppid,
+ -1);
+}
+
+
int processlist_add( ProcessList *process_list,
Drawing_t *drawing,
guint pid,
+ guint tgid,
guint cpu,
guint ppid,
LttTime *birth,
guint trace_num,
- const gchar *name,
+ GQuark name,
+ GQuark brand,
guint *height,
ProcessInfo **pm_process_info,
HashedProcessData **pm_hashed_process_data)
HashedProcessData *hashed_process_data = g_new(HashedProcessData, 1);
*pm_hashed_process_data = hashed_process_data;
*pm_process_info = Process_Info;
-
+
Process_Info->pid = pid;
+ Process_Info->tgid = tgid;
if(pid == 0)
Process_Info->cpu = cpu;
else
hashed_process_data->x.under_marked = FALSE;
hashed_process_data->next_good_time = ltt_time_zero;
+ if (process_list->cell_height == 0) {
+ GtkTreePath *path;
+ GdkRectangle rect;
+ GtkTreeIter iter;
+
+ path = gtk_tree_path_new_first();
+ gtk_tree_model_get_iter (gtk_tree_view_get_model(GTK_TREE_VIEW(process_list->process_list_widget)), &iter, path);
+ gtk_tree_view_get_background_area(
+ GTK_TREE_VIEW(process_list->process_list_widget),
+ path, NULL, &rect);
+ gtk_list_store_remove(process_list->list_store, &iter);
+ gtk_tree_path_free (path);
+ process_list->cell_height = rect.height;
+ }
+
/* Add a new row to the model */
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,
+ PROCESS_COLUMN, g_quark_to_string(name),
+ BRAND_COLUMN, g_quark_to_string(brand),
PID_COLUMN, pid,
+ TGID_COLUMN, tgid,
PPID_COLUMN, ppid,
CPU_COLUMN, cpu,
BIRTH_S_COLUMN, birth->tv_sec,
(gpointer)hashed_process_data);
process_list->number_of_process++;
+#if 0
+ GtkTreePath *path;
+ GdkRectangle rect;
+ gtk_widget_queue_draw(process_list->process_list_widget);
+ path = gtk_tree_path_new_first();
+ gtk_tree_view_get_background_area(GTK_TREE_VIEW(process_list->process_list_widget),
+ path, NULL, &rect);
+ gtk_tree_path_free (path);
+ process_list->cell_height = rect.height;
+#endif //0
- hashed_process_data->height = process_list->cell_height;
- //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;
&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;
+ if(likely(hashed_process_data == process_list->current_hash_data[trace_num][cpu])) {
+ process_list->current_hash_data[trace_num][cpu] = NULL;
}
}