gnome-system-monitor-01-solaris.diff revision 9822
9595N/Adiff -Nrup gnome-system-monitor-2.17.6/src/callbacks.h gnome-system-monitor-2.17.6.mod/src/callbacks.h
9595N/A--- gnome-system-monitor-2.17.6/src/callbacks.h 2007-01-18 07:44:46.000000000 +0800
9595N/A+++ gnome-system-monitor-2.17.6.mod/src/callbacks.h 2007-01-24 17:09:38.201397000 +0800
9595N/A@@ -25,63 +25,62 @@
8403N/A #include "procman.h"
8403N/A #include <libgnomevfs/gnome-vfs.h>
8403N/A
8403N/A-
9595N/A-void cb_show_memory_maps (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
9595N/A-void cb_show_open_files (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
9595N/A-void cb_show_lsof(GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8403N/A-void cb_renice (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
9595N/A-void cb_end_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8403N/A-void cb_kill_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8403N/A-void cb_edit_preferences (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8403N/A-
9370N/A-void cb_help_contents (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
9370N/A-void cb_about (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
9370N/A-
9595N/A-void cb_app_exit (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-gboolean cb_app_delete (GtkWidget *window, GdkEventAny *event, gpointer data) G_GNUC_INTERNAL;
8405N/A-
9595N/A-void cb_end_process_button_pressed (GtkButton *button, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_logout (GtkButton *button, gpointer data) G_GNUC_INTERNAL;
8405N/A-
9370N/A-void cb_info_button_pressed (GtkButton *button, gpointer user_data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_cpu_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
8405N/A-void cb_mem_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
8405N/A-void cb_swap_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
8405N/A-void cb_net_in_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
8405N/A-void cb_net_out_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
8405N/A-void cb_bg_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
8405N/A-void cb_frame_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_row_selected (GtkTreeSelection *selection, gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-gboolean cb_tree_popup_menu (GtkWidget *widget, gpointer data) G_GNUC_INTERNAL;
8405N/A-gboolean cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event,
8405N/A- gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-
8405N/A-void cb_change_current_page (GtkNotebook *nb,
8405N/A- gint num, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_switch_page (GtkNotebook *nb, GtkNotebookPage *page,
8405N/A- gint num, gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-gint cb_update_disks (gpointer data) G_GNUC_INTERNAL;
8405N/A-gint cb_timeout (gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_volume_mounted_or_unmounted(GnomeVFSVolumeMonitor *vfsvolumemonitor,
8405N/A- GnomeVFSVolume *vol,
8405N/A- gpointer procdata) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_radio_processes(GtkAction *action,
8405N/A- GtkRadioAction *current,
8405N/A- gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-
8405N/A-
8405N/A-void cb_kill_sigstop(GtkAction *action,
8405N/A- gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_kill_sigcont(GtkAction *action,
9370N/A- gpointer data) G_GNUC_INTERNAL;
9370N/A-
9370N/A+G_GNUC_INTERNAL void cb_show_memory_maps (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_show_open_files (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_show_lsof(GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_renice (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_end_process (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_kill_process (GtkAction *action, gpointer data);
8405N/A+G_GNUC_INTERNAL void cb_hide_process (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_show_hidden_processes (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_edit_preferences (GtkAction *action, gpointer data);
8405N/A+
9370N/A+G_GNUC_INTERNAL void cb_help_contents (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_about (GtkAction *action, gpointer data);
8405N/A+
9370N/A+G_GNUC_INTERNAL void cb_app_exit (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL gboolean cb_app_delete (GtkWidget *window, GdkEventAny *event, gpointer data);
8405N/A+
9370N/A+G_GNUC_INTERNAL void cb_end_process_button_pressed (GtkButton *button, gpointer data);
8405N/A+G_GNUC_INTERNAL void cb_logout (GtkButton *button, gpointer data);
9370N/A+
9370N/A+G_GNUC_INTERNAL void cb_info_button_pressed (GtkButton *button, gpointer user_data);
9370N/A+
9370N/A+G_GNUC_INTERNAL void cb_cpu_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+G_GNUC_INTERNAL void cb_mem_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+G_GNUC_INTERNAL void cb_swap_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+G_GNUC_INTERNAL void cb_net_in_color_changed (GtkColorButton *widget, gpointer user_data);
8405N/A+G_GNUC_INTERNAL void cb_net_out_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+G_GNUC_INTERNAL void cb_bg_color_changed (GtkColorButton *widget, gpointer user_data);
8405N/A+G_GNUC_INTERNAL void cb_frame_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+
8405N/A+G_GNUC_INTERNAL void cb_row_selected (GtkTreeSelection *selection, gpointer data);
9370N/A+G_GNUC_INTERNAL gboolean cb_tree_popup_menu (GtkWidget *widget, gpointer data);
8405N/A+G_GNUC_INTERNAL gboolean cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event,
8405N/A+ gpointer data);
8405N/A+
9370N/A+
8405N/A+G_GNUC_INTERNAL void cb_change_current_page (GtkNotebook *nb,
9370N/A+ gint num, gpointer data);
8405N/A+G_GNUC_INTERNAL void cb_switch_page (GtkNotebook *nb, GtkNotebookPage *page,
8405N/A+ gint num, gpointer data);
8405N/A+
9370N/A+G_GNUC_INTERNAL gint cb_update_disks (gpointer data);
9595N/A+G_GNUC_INTERNAL gint cb_timeout (gpointer data);
8405N/A+
8405N/A+G_GNUC_INTERNAL void cb_volume_mounted_or_unmounted(GnomeVFSVolumeMonitor *vfsvolumemonitor,
8405N/A+ GnomeVFSVolume *vol,
8405N/A+ gpointer procdata);
8405N/A+
9370N/A+G_GNUC_INTERNAL void cb_radio_processes(GtkAction *action,
8405N/A+ GtkRadioAction *current,
8405N/A+ gpointer data);
8405N/A+
8405N/A+
8405N/A+G_GNUC_INTERNAL void cb_kill_sigstop(GtkAction *action,
9370N/A+ gpointer data);
8405N/A+
8405N/A+G_GNUC_INTERNAL void cb_kill_sigcont(GtkAction *action,
8405N/A+ gpointer data);
8405N/A+
8405N/A #endif /* _PROCMAN_CALLBACKS_H_ */
8405N/Adiff -Nrup gnome-system-monitor-2.17.6/src/interface.cpp gnome-system-monitor-2.17.6.mod/src/interface.cpp
9370N/A--- gnome-system-monitor-2.17.6/src/interface.cpp 2007-01-19 05:14:12.000000000 +0800
8405N/A+++ gnome-system-monitor-2.17.6.mod/src/interface.cpp 2007-01-24 17:50:05.039705000 +0800
8405N/A@@ -231,13 +231,13 @@ create_sys_view (ProcData *procdata)
8405N/A GtkWidget *cpu_box, *mem_box, *net_box;
8405N/A GtkWidget *cpu_hbox, *mem_hbox, *net_hbox;
9370N/A GtkWidget *cpu_graph_box, *mem_graph_box, *net_graph_box;
8405N/A- GtkWidget *label,*cpu_label, *spacer;
8405N/A+ GtkWidget *label,*label2,*label3, *label4,*label5, *cpu_label, *spacer;
9311N/A GtkWidget *table;
9311N/A GtkWidget *color_picker;
9311N/A GtkSizeGroup *sizegroup;
8405N/A LoadGraph *cpu_graph, *mem_graph, *net_graph;
8405N/A gint i;
8405N/A-
8405N/A+ AtkObject *colorWidget, *label1Widget, *label2Widget, *label3Widget, *label4Widget, *label5Widget;
8405N/A
8405N/A vbox = gtk_vbox_new (FALSE, 18);
8405N/A
8405N/A@@ -285,6 +285,7 @@ create_sys_view (ProcData *procdata)
8405N/A
9595N/A color_picker = gtk_color_button_new_with_color (
9595N/A &load_graph_get_colors(cpu_graph)[2+i]);
9595N/A+ colorWidget = gtk_widget_get_accessible (color_picker);
8405N/A
8405N/A g_signal_connect (G_OBJECT (color_picker), "color_set",
9595N/A G_CALLBACK (cb_cpu_color_changed), GINT_TO_POINTER (i));
8405N/A@@ -297,10 +298,21 @@ create_sys_view (ProcData *procdata)
8405N/A text = g_strdup_printf (_("CPU%d:"), i+1);
9595N/A }
8405N/A label = gtk_label_new (text);
8405N/A+ /* in order to support accessibility, add the relationship between label and button */
9595N/A+ label1Widget = gtk_widget_get_accessible (label);
8405N/A+ atk_object_add_relationship (label1Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8405N/A+
9595N/A gtk_box_pack_start (GTK_BOX (temp_hbox), label, FALSE, FALSE, 6);
9595N/A g_free (text);
9595N/A
9595N/A cpu_label = gtk_label_new (NULL);
8922N/A+ /* in order to support accessibility, add the relationship between button and cpu_label */
8922N/A+ label2Widget = gtk_widget_get_accessible (cpu_label);
8922N/A+ atk_object_add_relationship (label2Widget, ATK_RELATION_LABEL_FOR, colorWidget);
8922N/A+ /* in order to support accessibility, add the relationship between button and label/cpu_label */
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label1Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label2Widget);
8922N/A+
8922N/A gtk_box_pack_start (GTK_BOX (temp_hbox), cpu_label, FALSE, FALSE, 0);
8922N/A load_graph_get_labels(cpu_graph)->cpu[i] = cpu_label;
8922N/A
8922N/A@@ -340,22 +352,32 @@ create_sys_view (ProcData *procdata)
8922N/A gtk_table_set_col_spacings (GTK_TABLE (table), 12);
8922N/A gtk_box_pack_start (GTK_BOX (mem_graph_box), table,
8922N/A FALSE, FALSE, 0);
9595N/A+
8922N/A+/* Draw User usage */
8922N/A
8922N/A color_picker = gtk_color_button_new_with_color (
8922N/A &load_graph_get_colors(mem_graph)[2]);
8922N/A+ colorWidget = gtk_widget_get_accessible (color_picker);
8922N/A g_signal_connect (G_OBJECT (color_picker), "color_set",
8922N/A G_CALLBACK (cb_mem_color_changed), procdata);
9595N/A gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A label = gtk_label_new (_("User memory:"));
8922N/A- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A+ label1Widget = gtk_widget_get_accessible (label);
8922N/A+ atk_object_add_relationship (label1Widget,ATK_RELATION_LABEL_FOR,colorWidget); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->memused),
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label2 = load_graph_get_labels(mem_graph)->memused;
8922N/A+ label2Widget = gtk_widget_get_accessible (label2);
8922N/A+ atk_object_add_relationship (label2Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->memused),*/
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label2),
8922N/A 0.0,
8922N/A 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table),
8922N/A- load_graph_get_labels(mem_graph)->memused,
8922N/A+ label2,
8922N/A 2,
9595N/A 3,
8922N/A 0,
8922N/A@@ -365,17 +387,26 @@ create_sys_view (ProcData *procdata)
9595N/A 0,
8922N/A 0);
8922N/A
8922N/A- label = gtk_label_new (_("of"));
9595N/A- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A- gtk_table_attach (GTK_TABLE (table), label, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A-
9595N/A-
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->memtotal),
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
9595N/A+ label3 = gtk_label_new (_("of"));
9595N/A+ label3Widget = gtk_widget_get_accessible (label3);
8922N/A+ atk_object_add_relationship (label3Widget,ATK_RELATION_LABEL_FOR,colorWidget);
9595N/A+ gtk_misc_set_alignment (GTK_MISC (label3), 0.0, 0.5);
8922N/A+ gtk_table_attach (GTK_TABLE (table), label3, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A+
8922N/A+
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label4 = load_graph_get_labels(mem_graph)->memtotal;
9595N/A+ label4Widget = gtk_widget_get_accessible (label4);
9595N/A+ atk_object_add_relationship (label4Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->memtotal),*/
9595N/A+ gtk_misc_set_alignment (GTK_MISC (label4),
8922N/A 0.0,
8922N/A 0.5);
8922N/A
8922N/A gtk_table_attach (GTK_TABLE (table),
9595N/A- load_graph_get_labels(mem_graph)->memtotal,
8922N/A+ label4,
8922N/A 4,
8922N/A 5,
8922N/A 0,
9595N/A@@ -385,12 +416,18 @@ create_sys_view (ProcData *procdata)
8922N/A 0,
8922N/A 0);
8922N/A
8922N/A-
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->mempercent),
9595N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label5 = load_graph_get_labels(mem_graph)->mempercent;
9595N/A+ label5Widget = gtk_widget_get_accessible (label5);
9595N/A+ atk_object_add_relationship (label5Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->mempercent),*/
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label5),
8922N/A 1.0,
8922N/A 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table),
8922N/A- load_graph_get_labels(mem_graph)->mempercent,
8922N/A+ label5,
9595N/A 5,
9595N/A 6,
9595N/A 0,
8922N/A@@ -399,23 +436,40 @@ create_sys_view (ProcData *procdata)
8922N/A GTK_FILL,
8922N/A 0,
8922N/A 0);
9595N/A-
8922N/A+ /* in order to support accessibility, add the relationship between button and label */
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label1Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label2Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label3Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label4Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label5Widget);
8922N/A+
8922N/A+/* Draw the Swap Usage */
8922N/A color_picker = gtk_color_button_new_with_color (
8922N/A &load_graph_get_colors(mem_graph)[3]);
8922N/A+ colorWidget = gtk_widget_get_accessible (color_picker);
8922N/A g_signal_connect (G_OBJECT (color_picker), "color_set",
8922N/A G_CALLBACK (cb_swap_color_changed), procdata);
8922N/A gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A label = gtk_label_new (_("Used swap:"));
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
8922N/A+ label1Widget = gtk_widget_get_accessible (label);
8922N/A+ atk_object_add_relationship (label1Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
9595N/A
8922N/A
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swapused ),
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
9595N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label2 = load_graph_get_labels(mem_graph)->swapused;
8922N/A+ label2Widget = gtk_widget_get_accessible (label2);
9595N/A+ atk_object_add_relationship (label2Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label2),
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swapused ),*/
8922N/A 0.0,
9595N/A 0.5);
9595N/A gtk_table_attach (GTK_TABLE (table),
8922N/A- load_graph_get_labels(mem_graph)->swapused,
9595N/A+ label2,
8922N/A 2,
8922N/A 3,
8922N/A 1,
8922N/A@@ -425,16 +479,24 @@ create_sys_view (ProcData *procdata)
8922N/A 0,
8922N/A 0);
9595N/A
9595N/A- label = gtk_label_new (_("of"));
8922N/A- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A- gtk_table_attach (GTK_TABLE (table), label, 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A-
8922N/A-
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swaptotal),
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
9595N/A+ label3 = gtk_label_new (_("of"));
8922N/A+ label3Widget = gtk_widget_get_accessible (label3);
8922N/A+ atk_object_add_relationship (label3Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label3), 0.0, 0.5);
8922N/A+ gtk_table_attach (GTK_TABLE (table), label3, 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
9595N/A+
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label4 = load_graph_get_labels(mem_graph)->swaptotal;
8922N/A+ label4Widget = gtk_widget_get_accessible (label4);
8922N/A+ atk_object_add_relationship (label4Widget,ATK_RELATION_LABEL_FOR,colorWidget);
9595N/A+ gtk_misc_set_alignment (GTK_MISC (label4),
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swaptotal),*/
8922N/A 0.0,
9595N/A 0.5);
9595N/A gtk_table_attach (GTK_TABLE (table),
8922N/A- load_graph_get_labels(mem_graph)->swaptotal,
8922N/A+ label4,
8922N/A 4,
8922N/A 5,
8922N/A 1,
8922N/A@@ -445,7 +507,7 @@ create_sys_view (ProcData *procdata)
8922N/A 0);
8922N/A
9595N/A
9595N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swappercent),
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label5),
8922N/A 1.0,
8922N/A 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table),
8922N/A@@ -458,6 +520,13 @@ create_sys_view (ProcData *procdata)
8922N/A GTK_FILL,
9595N/A 0,
8922N/A 0);
8922N/A+ /* in order to support accessibility, add the relationship between button and label */
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label1Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label2Widget);
9595N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label3Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label4Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label5Widget);
8922N/A+/* Draw Network */
8922N/A
8922N/A procdata->mem_graph = mem_graph;
8922N/A
8922N/A@@ -493,11 +562,15 @@ create_sys_view (ProcData *procdata)
8922N/A
8922N/A color_picker = gtk_color_button_new_with_color (
8922N/A &load_graph_get_colors(net_graph)[2]);
8922N/A+ colorWidget = gtk_widget_get_accessible (color_picker);
8922N/A g_signal_connect (G_OBJECT (color_picker), "color_set",
8922N/A G_CALLBACK (cb_net_in_color_changed), procdata);
8922N/A gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A label = gtk_label_new (_("Received:"));
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
8922N/A+ label1Widget = gtk_widget_get_accessible (label);
8922N/A+ atk_object_add_relationship (label1Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
9595N/A
8922N/A@@ -506,26 +579,41 @@ create_sys_view (ProcData *procdata)
8922N/A G_CALLBACK(size_request), &net_size);
9595N/A
8922N/A
9595N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in),
9595N/A+ /* in order to support accessibility, and to promote performance and readable,
9595N/A+ let's call the load_graph_get_labels() only once here */
9595N/A+ label2 = load_graph_get_labels(net_graph)->net_in;
9595N/A+ label2Widget = gtk_widget_get_accessible (label2);
9595N/A+ atk_object_add_relationship (label2Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label2),
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in),*/
9595N/A 0.0,
9595N/A 0.5);
8922N/A gtk_box_pack_start (GTK_BOX (hbox),
8922N/A- load_graph_get_labels(net_graph)->net_in,
8922N/A+ label2,
9595N/A FALSE,
8922N/A FALSE,
8922N/A 0);
9595N/A
8922N/A gtk_table_attach (GTK_TABLE (table), hbox, 2, 3, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A- label = gtk_label_new (_("Total:"));
9595N/A- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
9595N/A- gtk_table_attach (GTK_TABLE (table), label, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A-
9595N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in_total),
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
9595N/A+ label3 = gtk_label_new (_("Total:"));
8922N/A+ label3Widget = gtk_widget_get_accessible (label3);
8922N/A+ atk_object_add_relationship (label3Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label3), 0.0, 0.5);
8922N/A+ gtk_table_attach (GTK_TABLE (table), label3, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A+
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
9595N/A+ label4 = load_graph_get_labels(net_graph)->net_in_total;
9595N/A+ label4Widget = gtk_widget_get_accessible (label4);
8922N/A+ atk_object_add_relationship (label4Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label4),
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in_total),*/
8922N/A 0.0,
8922N/A 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table),
8922N/A- load_graph_get_labels(net_graph)->net_in_total,
8922N/A+ label4,
8922N/A 4,
8922N/A 5,
8922N/A 0,
8922N/A@@ -534,14 +622,24 @@ create_sys_view (ProcData *procdata)
9595N/A GTK_FILL,
8922N/A 0,
8922N/A 0);
8922N/A+
9595N/A+ /* in order to support accessibility, add the relationship between button and label */
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label1Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label2Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label3Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label4Widget);
9595N/A
9595N/A color_picker = gtk_color_button_new_with_color (
8922N/A &load_graph_get_colors(net_graph)[3]);
8922N/A+ colorWidget = gtk_widget_get_accessible (color_picker);
8922N/A g_signal_connect (G_OBJECT (color_picker), "color_set",
8922N/A G_CALLBACK (cb_net_out_color_changed), procdata);
8922N/A gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
9595N/A label = gtk_label_new (_("Sent:"));
9595N/A+ /* in order to support accessibility, add the relationship between label and button */
8922N/A+ label1Widget = gtk_widget_get_accessible (label);
8922N/A+ atk_object_add_relationship (label1Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A@@ -549,26 +647,41 @@ create_sys_view (ProcData *procdata)
8922N/A g_signal_connect (G_OBJECT (hbox), "size_request",
8922N/A G_CALLBACK(size_request), &net_size);
8922N/A
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out),
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
9595N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label2 = load_graph_get_labels(net_graph)->net_out;
8922N/A+ label2Widget = gtk_widget_get_accessible (label2);
9595N/A+ atk_object_add_relationship (label2Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label2),
9595N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out),*/
9595N/A 0.0,
9595N/A 0.5);
9595N/A gtk_box_pack_start (GTK_BOX (hbox),
9595N/A- load_graph_get_labels(net_graph)->net_out,
8922N/A+ label2,
8922N/A FALSE,
9595N/A FALSE,
8922N/A 0);
8922N/A
9595N/A gtk_table_attach (GTK_TABLE (table), hbox, 2, 3, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A- label = gtk_label_new (_("Total:"));
8922N/A- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
9595N/A- gtk_table_attach (GTK_TABLE (table), label, 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
9595N/A-
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out_total),
9595N/A+ /* in order to support accessibility, add the relationship between label and button */
8922N/A+ label3 = gtk_label_new (_("Total:"));
9595N/A+ label3Widget = gtk_widget_get_accessible (label3);
8922N/A+ atk_object_add_relationship (label3Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label3), 0.0, 0.5);
8922N/A+ gtk_table_attach (GTK_TABLE (table), label3, 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A+
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label4 = load_graph_get_labels(net_graph)->net_out_total;
9595N/A+ label4Widget = gtk_widget_get_accessible (label4);
9595N/A+ atk_object_add_relationship (label4Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label4),
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out_total),*/
8922N/A 0.0,
8922N/A 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table),
8922N/A- load_graph_get_labels(net_graph)->net_out_total,
8922N/A+ label4,
8922N/A 4,
8922N/A 5,
8922N/A 1,
8922N/A@@ -578,6 +691,12 @@ create_sys_view (ProcData *procdata)
8922N/A 0,
9595N/A 0);
8922N/A
8922N/A+ /* in order to support accessibility, add the relationship between button and label */
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label1Widget);
9595N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label2Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label3Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label4Widget);
8922N/A+
8922N/A procdata->net_graph = net_graph;
9595N/A
9595N/A
8922N/Adiff -Nrup gnome-system-monitor-2.17.6/src/interface.h gnome-system-monitor-2.17.6.mod/src/interface.h
8922N/A--- gnome-system-monitor-2.17.6/src/interface.h 2007-01-03 06:15:36.000000000 +0800
8922N/A+++ gnome-system-monitor-2.17.6.mod/src/interface.h 2007-01-24 17:41:55.437494000 +0800
8922N/A@@ -24,9 +24,9 @@
8922N/A #include <gtk/gtk.h>
8922N/A #include "procman.h"
9595N/A
9595N/A-void create_main_window (ProcData *data) G_GNUC_INTERNAL;
8922N/A-void update_sensitivity (ProcData *data) G_GNUC_INTERNAL;
8922N/A-void do_popup_menu(ProcData *data, GdkEventButton *event) G_GNUC_INTERNAL;
8922N/A-GtkWidget * make_title_label (const char *text) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL void create_main_window (ProcData *data) ;
8922N/A+G_GNUC_INTERNAL void update_sensitivity (ProcData *data) ;
8922N/A+G_GNUC_INTERNAL void do_popup_menu(ProcData *data, GdkEventButton *event) ;
8922N/A+G_GNUC_INTERNAL GtkWidget * make_title_label (const char *text) ;
8922N/A
8922N/A #endif /* _PROCMAN_INTERFACE_H_ */
8922N/Adiff -Nrup gnome-system-monitor-2.17.6/src/load-graph.cpp gnome-system-monitor-2.17.6.mod/src/load-graph.cpp
8922N/A--- gnome-system-monitor-2.17.6/src/load-graph.cpp 2007-01-03 06:15:36.000000000 +0800
9595N/A+++ gnome-system-monitor-2.17.6.mod/src/load-graph.cpp 2007-01-24 17:42:48.619510000 +0800
8922N/A@@ -346,7 +346,21 @@ get_net (LoadGraph *g)
8922N/A GTimeVal time;
9595N/A float din, dout;
8922N/A gchar *text1, *text2;
9595N/A-
9595N/A+
9595N/A+ /* we have to optimize the performance of libgtop, because in some low level machine,
9595N/A+ to update the information will occupy too much cpu.
8922N/A+
8922N/A+ here I would like to make a little update:set glibtop_netlist.flags=1,so as to let glibtop_get_netlist()
8922N/A+ only return the ones whose first character of name is the same with the first one in their module,
9595N/A+ glibtop_get_netload() just try to find these devices, for example, bge0 and bge...
9595N/A+
9595N/A+ we do the check in glibtop_get_netlist(), I think this will accelerate the transaction lots,
9595N/A+ Also this will not affect the existing codes, because when nobody set glibtop_netlist.flags,
9595N/A+ glibtop_get_netlist() will return all devices with class "net".
9595N/A+ */
8405N/A+
8405N/A+ netlist.flags = 1;
8405N/A+
9370N/A ifnames = glibtop_get_netlist(&netlist);
8405N/A
8405N/A for (i = 0; i < netlist.number; ++i)
9370N/Adiff -Nrup gnome-system-monitor-2.17.6/src/load-graph.h gnome-system-monitor-2.17.6.mod/src/load-graph.h
9370N/A--- gnome-system-monitor-2.17.6/src/load-graph.h 2007-01-03 06:15:36.000000000 +0800
9370N/A+++ gnome-system-monitor-2.17.6.mod/src/load-graph.h 2007-01-24 17:44:34.665872000 +0800
9370N/A@@ -34,34 +34,34 @@ struct _LoadGraphLabels
8405N/A
8405N/A
9595N/A /* Create new load graph. */
9595N/A-LoadGraph *
9595N/A-load_graph_new (gint type, ProcData *procdata) G_GNUC_INTERNAL;
9311N/A+G_GNUC_INTERNAL LoadGraph *
9311N/A+load_graph_new (gint type, ProcData *procdata) ;
9311N/A
8403N/A /* Force a drawing update */
8922N/A-void
8922N/A-load_graph_draw (LoadGraph *g) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL void
8922N/A+load_graph_draw (LoadGraph *g) ;
8922N/A
8922N/A /* Start load graph. */
8922N/A-void
8922N/A-load_graph_start (LoadGraph *g) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL void
8922N/A+load_graph_start (LoadGraph *g) ;
8922N/A
8922N/A /* Stop load graph. */
8922N/A-void
9311N/A-load_graph_stop (LoadGraph *g) G_GNUC_INTERNAL;
9311N/A+G_GNUC_INTERNAL void
9311N/A+load_graph_stop (LoadGraph *g) ;
8922N/A
9595N/A /* Change load graph speed and restart it if it has been previously started */
9595N/A-void
9595N/A+G_GNUC_INTERNAL void
9595N/A load_graph_change_speed (LoadGraph *g,
8405N/A- guint new_speed) G_GNUC_INTERNAL;
8405N/A+ guint new_speed) ;
8405N/A
8405N/A-GdkColor*
8405N/A-load_graph_get_colors (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;
8405N/A+G_GNUC_INTERNAL GdkColor*
8405N/A+load_graph_get_colors (LoadGraph *g) G_GNUC_CONST;
8405N/A
8405N/A-LoadGraphLabels*
8405N/A-load_graph_get_labels (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;
8405N/A+G_GNUC_INTERNAL LoadGraphLabels*
8405N/A+load_graph_get_labels (LoadGraph *g) G_GNUC_CONST;
9595N/A
8405N/A
8405N/A-GtkWidget*
8405N/A-load_graph_get_widget (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;
8405N/A+G_GNUC_INTERNAL GtkWidget*
8405N/A+load_graph_get_widget (LoadGraph *g) G_GNUC_CONST;
9595N/A
8405N/A #endif /* _PROCMAN_LOAD_GRAPH_H_ */
8405N/Adiff -Nrup gnome-system-monitor-2.17.6/src/memmaps.h gnome-system-monitor-2.17.6.mod/src/memmaps.h
8405N/A--- gnome-system-monitor-2.17.6/src/memmaps.h 2007-01-03 06:15:36.000000000 +0800
8405N/A+++ gnome-system-monitor-2.17.6.mod/src/memmaps.h 2007-01-24 17:45:14.957958000 +0800
8405N/A@@ -4,6 +4,6 @@
9595N/A #include <glib.h>
8405N/A #include "procman.h"
8405N/A
8405N/A-void create_memmaps_dialog (ProcData *procdata) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void create_memmaps_dialog (ProcData *procdata) ;
8405N/A
8405N/A #endif /* _PROCMAN_MEMMAPS_H_ */
9595N/Adiff -Nrup gnome-system-monitor-2.17.6/src/openfiles.h gnome-system-monitor-2.17.6.mod/src/openfiles.h
8405N/A--- gnome-system-monitor-2.17.6/src/openfiles.h 2007-01-03 06:15:36.000000000 +0800
8405N/A+++ gnome-system-monitor-2.17.6.mod/src/openfiles.h 2007-01-24 17:45:46.513294000 +0800
8405N/A@@ -5,6 +5,6 @@
8405N/A
9595N/A #include "procman.h"
8405N/A
8405N/A-void create_openfiles_dialog (ProcData *procdata) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void create_openfiles_dialog (ProcData *procdata) ;
8405N/A
9595N/A #endif
8405N/Adiff -Nrup gnome-system-monitor-2.17.6/src/procactions.cpp gnome-system-monitor-2.17.6.mod/src/procactions.cpp
8405N/A--- gnome-system-monitor-2.17.6/src/procactions.cpp 2007-01-03 06:15:36.000000000 +0800
8405N/A+++ gnome-system-monitor-2.17.6.mod/src/procactions.cpp 2007-01-24 17:46:53.540932000 +0800
8405N/A@@ -127,6 +127,14 @@ kill_single_process (GtkTreeModel *model
8405N/A
9595N/A if (!info)
8405N/A return;
8405N/A+ /*
9595N/A+ * If the process 0 is a system process, we can't control it even as root
9595N/A+ */
9595N/A+ if ((args->signal == SIGTERM) || (args->signal == SIGKILL)){
9595N/A+ if (info->pid == 0)
9595N/A+ return;
9595N/A+ }
8405N/A+ /* if it is not a system process, we can kill it now */
8405N/A
9431N/A error = kill (info->pid, args->signal);
8405N/A
9595N/Adiff -Nrup gnome-system-monitor-2.17.6/src/procactions.h gnome-system-monitor-2.17.6.mod/src/procactions.h
9311N/A--- gnome-system-monitor-2.17.6/src/procactions.h 2007-01-03 06:15:36.000000000 +0800
9311N/A+++ gnome-system-monitor-2.17.6.mod/src/procactions.h 2007-01-24 19:30:38.684435000 +0800
9311N/A@@ -21,8 +21,8 @@
9595N/A
8405N/A #include "procman.h"
8405N/A
8405N/A-void renice (ProcData *procdata, int nice) G_GNUC_INTERNAL;
8405N/A-void kill_process (ProcData *procdata, int sig) G_GNUC_INTERNAL;
9595N/A+G_GNUC_INTERNAL void renice (ProcData *procdata, int nice) ;
8405N/A+G_GNUC_INTERNAL void kill_process (ProcData *procdata, int sig) ;
8405N/A
9311N/A #endif
9311N/A
9311N/Adiff -Nrup gnome-system-monitor-2.17.6/src/procdialogs.cpp gnome-system-monitor-2.17.6.mod/src/procdialogs.cpp
8405N/A--- gnome-system-monitor-2.17.6/src/procdialogs.cpp 2007-01-18 07:50:28.000000000 +0800
8405N/A+++ gnome-system-monitor-2.17.6.mod/src/procdialogs.cpp 2007-01-24 17:48:59.927166000 +0800
8405N/A@@ -629,7 +629,10 @@ procdialog_create_preferences_dialog (Pr
8405N/A gtk_box_pack_start (GTK_BOX (hbox2), hbox3, TRUE, TRUE, 0);
8405N/A
8405N/A update = (gfloat) procdata->config.graph_update_interval;
8405N/A- adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 0.25,
8405N/A+ /* The interval is too small, and in some low level machine,
8405N/A+ cause gconf can't work, so set its min value 1 sec*/
8405N/A+ /*adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 0.25,*/
8405N/A+ adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 1,
8405N/A 100.0, 0.25, 1.0, 1.0);
8405N/A spin_button = gtk_spin_button_new (adjustment, 1.0, 2);
8405N/A g_signal_connect (G_OBJECT (spin_button), "focus_out_event",
8405N/Adiff -Nrup gnome-system-monitor-2.17.6/src/procdialogs.h gnome-system-monitor-2.17.6.mod/src/procdialogs.h
9595N/A--- gnome-system-monitor-2.17.6/src/procdialogs.h 2007-01-18 07:47:42.000000000 +0800
9595N/A+++ gnome-system-monitor-2.17.6.mod/src/procdialogs.h 2007-01-24 17:51:27.419745000 +0800
9595N/A@@ -42,13 +42,13 @@ typedef enum
8922N/A } ProcmanActionType;
8414N/A
8414N/A
8922N/A-void procdialog_create_kill_dialog (ProcData *data, int signal) G_GNUC_INTERNAL;
8414N/A-void procdialog_create_renice_dialog (ProcData *data) G_GNUC_INTERNAL;
8922N/A-gboolean procdialog_create_root_password_dialog (ProcmanActionType type,
8922N/A+G_GNUC_INTERNAL void procdialog_create_kill_dialog (ProcData *data, int signal) ;
8922N/A+G_GNUC_INTERNAL void procdialog_create_renice_dialog (ProcData *data) ;
8922N/A+G_GNUC_INTERNAL gboolean procdialog_create_root_password_dialog (ProcmanActionType type,
8922N/A ProcData *procdata,
8922N/A- gint pid, gint extra_value) G_GNUC_INTERNAL;
8922N/A-void procdialog_create_memmaps_dialog (ProcData *data) G_GNUC_INTERNAL;
8414N/A-void procdialog_create_preferences_dialog (ProcData *data) G_GNUC_INTERNAL;
8414N/A+ gint pid, gint extra_value) ;
8414N/A+G_GNUC_INTERNAL void procdialog_create_memmaps_dialog (ProcData *data) ;
9311N/A+G_GNUC_INTERNAL void procdialog_create_preferences_dialog (ProcData *data) ;
9311N/A
9311N/A #endif
8405N/A
8405N/Adiff -Nrup gnome-system-monitor-2.17.6/src/procman.cpp gnome-system-monitor-2.17.6.mod/src/procman.cpp
8405N/A--- gnome-system-monitor-2.17.6/src/procman.cpp 2007-01-18 07:53:25.000000000 +0800
8405N/A+++ gnome-system-monitor-2.17.6.mod/src/procman.cpp 2007-01-24 17:56:36.063366000 +0800
8405N/A@@ -110,7 +110,10 @@ timeouts_changed_cb (GConfClient *client
8405N/A procdata->config.graph_update_interval = gconf_value_get_int (value);
8405N/A procdata->config.graph_update_interval =
8405N/A MAX (procdata->config.graph_update_interval,
8405N/A- 250);
8405N/A+ /* The interval is too small, and in some low level machine,
8405N/A+ cause gconf can't work, so set its min value 1 sec*/
9595N/A+ /* 250);*/
9595N/A+ 1000);
9595N/A load_graph_change_speed(procdata->cpu_graph,
8403N/A procdata->config.graph_update_interval);
8403N/A load_graph_change_speed(procdata->mem_graph,
8403N/A@@ -352,7 +355,10 @@ procman_data_new (GConfClient *client)
8403N/A pd->config.width = CLAMP (pd->config.width, 50, swidth);
8403N/A pd->config.height = CLAMP (pd->config.height, 50, sheight);
8403N/A pd->config.update_interval = MAX (pd->config.update_interval, 1000);
8403N/A- pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);
8403N/A+ /* The interval is too small, and in some low level machine,
8403N/A+ cause gconf can't work, so set its min value 1 sec*/
8922N/A+ /*pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);*/
8922N/A+ pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 1000);
8922N/A pd->config.disks_update_interval = MAX (pd->config.disks_update_interval, 1000);
8922N/A pd->config.whose_process = CLAMP (pd->config.whose_process, 0, 2);
8922N/A pd->config.current_tab = CLAMP(pd->config.current_tab,
8922N/Adiff -Nrup gnome-system-monitor-2.17.6/src/procman.h gnome-system-monitor-2.17.6.mod/src/procman.h
8922N/A--- gnome-system-monitor-2.17.6/src/procman.h 2007-01-22 00:58:39.000000000 +0800
8922N/A+++ gnome-system-monitor-2.17.6.mod/src/procman.h 2007-01-24 17:57:36.918021000 +0800
8922N/A@@ -199,9 +199,9 @@ struct ProcData
8922N/A SmoothRefresh *smooth_refresh;
8922N/A };
8922N/A
8922N/A-void procman_save_config (ProcData *data) G_GNUC_INTERNAL;
8922N/A-void procman_save_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) G_GNUC_INTERNAL;
8922N/A-gboolean procman_get_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL void procman_save_config (ProcData *data) ;
8922N/A+G_GNUC_INTERNAL void procman_save_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) ;
8922N/A+G_GNUC_INTERNAL gboolean procman_get_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) ;
8922N/A
8922N/A
8922N/A
9311N/Adiff -Nrup gnome-system-monitor-2.17.6/src/proctable.cpp gnome-system-monitor-2.17.6.mod/src/proctable.cpp
9311N/A--- gnome-system-monitor-2.17.6/src/proctable.cpp 2007-01-21 08:57:08.000000000 +0800
9311N/A+++ gnome-system-monitor-2.17.6.mod/src/proctable.cpp 2007-01-24 19:43:59.958896000 +0800
8405N/A@@ -549,7 +549,18 @@ static void get_process_memory_writable(
8405N/A unsigned i;
8405N/A
8405N/A info->memwritable = 0;
8405N/A-
8405N/A+ /* we have to optimize the performance of libgtop, because update the information will occupy too much cpu.
8405N/A+
8405N/A+ here I would like to make a little update:set glibtop_proc_map.flags=1,so as to let glibtop_get_proc_map_s()
8405N/A+ only return the ones this function need: memwritable
8405N/A+
8405N/A+ we do the check in glibtop_get_proc_map_s(), don't run the others part which don't need by this function,
8405N/A+ I think this will accelerate the transaction lots,
8405N/A+ Also this will not affect the existing codes, because when nobody set glibtop_proc_map.flags,
8405N/A+ glibtop_get_proc_map() will return all as before. zhua
8405N/A+ */
8405N/A+ buf.flags = 1;
8405N/A+
8405N/A maps = glibtop_get_proc_map(&buf, info->pid);
8405N/A
8405N/A for (i = 0; i < buf.number; ++i) {
8405N/A@@ -558,6 +569,9 @@ static void get_process_memory_writable(
8405N/A #else
9595N/A if (maps[i].perm & GLIBTOP_MAP_PERM_WRITE)
9595N/A info->memwritable += maps[i].size;
9595N/A+
9370N/A+ if (maps[i].perm & GLIBTOP_MAP_PERM_SHARED)
8922N/A+ info->memshared += maps[i].shared_clean;
8922N/A #endif
8922N/A }
8922N/A
9370N/A@@ -574,15 +588,19 @@ get_process_memory_info(ProcInfo *info)
9370N/A wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
9370N/A info->pid,
9370N/A &xresources);
8922N/A+
8922N/A+ info->memxserver = xresources.total_bytes_estimate;
8922N/A
9370N/A- glibtop_get_proc_mem(&procmem, info->pid);
8922N/A-
8922N/A+/* zhua: use get_process_memory_writable(), because it just call glibtop_get_proc_map_s(),
8922N/A++ can get shared memory and writable memory, others: vmsize & memres, will be
8922N/A+ get in procstate from glibtop_get_proc_state()*/
9370N/A+/* glibtop_get_proc_mem(&procmem, info->pid);
8922N/A+
9370N/A info->vmsize = procmem.vsize;
9370N/A info->memres = procmem.resident;
8922N/A info->memshared = procmem.share;
8922N/A
9370N/A- info->memxserver = xresources.total_bytes_estimate;
9311N/A-
9311N/A+*/
9311N/A get_process_memory_writable(info);
8922N/A
8405N/A info->mem = info->memxserver + info->memwritable;
8405N/A@@ -766,6 +784,30 @@ remove_children_from_tree (ProcData *pro
8405N/A } while (gtk_tree_model_iter_next (model, parent));
8405N/A }
8405N/A
8405N/A+/* place the children process to blacklist if the parent is placed into */
8922N/A+#if 0
8405N/A+/* Community have delete this function, so maybe not need this patch. */
8405N/A+static void
8405N/A+blacklist_children_from_tree (ProcData *procdata, GtkTreeModel *model,
8405N/A+ GtkTreeIter *parent)
8405N/A+{
9595N/A+ do {
9595N/A+ ProcInfo *child_info;
9595N/A+ GtkTreeIter child;
9311N/A+
9311N/A+ if (gtk_tree_model_iter_children (model, &child, parent))
9311N/A+ blacklist_children_from_tree (procdata, model, &child);
9311N/A+
9311N/A+ gtk_tree_model_get (model, parent, COL_POINTER, &child_info, -1);
9311N/A+ if (child_info) {
9311N/A+ if (procdata->selected_process == child_info)
9311N/A+ procdata->selected_process = NULL;
9311N/A+ add_to_blacklist (procdata, child_info->name);
9311N/A+ child_info->is_visible = FALSE;
9311N/A+ }
9311N/A+ } while (gtk_tree_model_iter_next (model, parent));
9311N/A+}
9311N/A+#endif
9311N/A
9311N/A void
9311N/A remove_info_from_tree (ProcInfo *info, ProcData *procdata)
9311N/A@@ -781,7 +823,12 @@ remove_info_from_tree (ProcInfo *info, P
9311N/A
8922N/A if (procdata->selected_process == info)
8922N/A procdata->selected_process = NULL;
8403N/A-
8922N/A+ /* move all children from tree to blacklist */
8922N/A+/* Community have delete this function, so maybe not need this patch. */
8922N/A+/* GtkTreeIter child;
8922N/A+ if (gtk_tree_model_iter_children (model, &child, &info->node))
8922N/A+ blacklist_children_from_tree (procdata, model, &child);
8403N/A+*/
8922N/A gtk_tree_store_remove (GTK_TREE_STORE (model), &info->node);
9311N/A
8922N/A info->is_visible = FALSE;
8922N/A@@ -846,18 +893,31 @@ update_info (ProcData *procdata, ProcInf
8522N/A glibtop_proc_uid procuid;
8922N/A glibtop_proc_time proctime;
8922N/A
8922N/A+ /* zhua: let's delete this call, because we can get the value
8922N/A+ from glibtop_get_proc_state
8922N/A glibtop_get_proc_uid (&procuid, info->pid);
8922N/A+ */
8922N/A glibtop_get_proc_time (&proctime, info->pid);
8922N/A
8922N/A- get_process_memory_info(info);
8922N/A- get_process_user(procdata, info, procstate.uid);
8922N/A+ get_process_memory_info(info);/* get shared/writable/xserver memory */
8922N/A+ get_process_user(procdata, info, procstate.uid);/* get user of process */
8922N/A
8922N/A+ /* zhua: let's get from file directly
8922N/A info->pcpu = (proctime.rtime - info->cpu_time_last) * 100 / total_time;
8922N/A info->pcpu = MIN(info->pcpu, 100);
8922N/A+ */
8922N/A
8922N/A info->cpu_time_last = proctime.rtime;
8922N/A- info->nice = procuid.nice;
8922N/A+ /* zhua: get nice/ppid from procstate */
8922N/A+ info->nice = procstate.nice;
8522N/A+
8922N/A+ /* zhua: get start_time from procstate */
8922N/A+ info->start_time = procstate.start_time;
9311N/A+
8403N/A+ info->vmsize = procstate.vsize;
8922N/A+ info->memres = procstate.resident;
8922N/A
8922N/A+ info->pcpu = procstate.load;
8922N/A
8922N/A model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
8922N/A
8922N/A@@ -889,7 +949,9 @@ ProcInfo::ProcInfo(pid_t pid)
8922N/A info->uid = -1;
8922N/A
8922N/A glibtop_get_proc_state (&procstate, pid);
9311N/A- glibtop_get_proc_uid (&procuid, pid);
8403N/A+ /* zhua: delete this function, because we can get nice/ppid from glibtop_get_proc_state()
8403N/A+ dont' need to open/pread/close psinfo, it will save some time
8403N/A+ glibtop_get_proc_uid (&procuid, pid);*/
8403N/A glibtop_get_proc_time (&proctime, pid);
8922N/A arguments = glibtop_get_proc_argv (&procargs, pid, 0);
8403N/A
8922N/A@@ -903,16 +965,21 @@ ProcInfo::ProcInfo(pid_t pid)
8922N/A
9311N/A info->pcpu = 0;
8403N/A info->cpu_time_last = proctime.rtime;
8922N/A- info->start_time = proctime.start_time;
8403N/A- info->nice = procuid.nice;
8922N/A-
8922N/A+ /* zhua: get start_time/nice/ppid from procstate */
8922N/A+ info->start_time = procstate.start_time;
8922N/A+ info->nice = procstate.nice;
8922N/A+ /* zhua */
8403N/A+ info->vmsize = procstate.vsize;
8403N/A+ info->memres = procstate.resident;
8922N/A+ info->pcpu = procstate.load;
9311N/A+
8403N/A get_process_memory_info(info);
8403N/A get_process_status (info, &procstate);
8403N/A get_process_selinux_context (info);
8403N/A
8403N/A info->pixbuf = ProcData::get_instance()->pretty_table.get_icon(info->name, pid);
8922N/A
8922N/A- info->parent = find_parent(ProcData::get_instance(), procuid.ppid);
8403N/A+ info->parent = find_parent(ProcData::get_instance(), procstate.ppid);
8403N/A if (info->parent) {
8403N/A info->parent->children = g_slist_prepend (info->parent->children, info);
9311N/A }
9311N/A@@ -1022,9 +1089,11 @@ proctable_update_list (ProcData * const
9311N/A
8922N/A /* FIXME: total cpu time elapsed should be calculated on an individual basis here
8922N/A ** should probably have a total_time_last gint in the ProcInfo structure */
8922N/A+ /* zhua: delete these sentences, we can get cpu% from file directly.
8922N/A glibtop_get_cpu (&cpu);
8922N/A total_time = MAX(cpu.total - total_time_last, 1);
8922N/A total_time_last = cpu.total;
8922N/A+ */
8922N/A
8922N/A refresh_list (procdata, pid_list, proclist.number);
8922N/A
8922N/Adiff -Nrup gnome-system-monitor-2.17.6/src/proctable.h gnome-system-monitor-2.17.6.mod/src/proctable.h
8922N/A--- gnome-system-monitor-2.17.6/src/proctable.h 2007-01-03 06:15:36.000000000 +0800
8922N/A+++ gnome-system-monitor-2.17.6.mod/src/proctable.h 2007-01-24 19:49:03.049889000 +0800
8922N/A@@ -48,20 +48,23 @@ enum
8922N/A NUM_COLUMNS
8922N/A };
8922N/A
8922N/A+G_BEGIN_DECLS
8922N/A
8922N/A-GtkWidget* proctable_new (ProcData *data) G_GNUC_INTERNAL;
8922N/A-void proctable_update_table (ProcData *data) G_GNUC_INTERNAL;
8922N/A-void proctable_update_list (ProcData *data) G_GNUC_INTERNAL;
8922N/A-void insert_info_to_tree (ProcInfo *info, ProcData *procdata) G_GNUC_INTERNAL;
8922N/A-void remove_info_from_tree (ProcInfo *info, ProcData *procdata) G_GNUC_INTERNAL;
8922N/A-ProcInfo * proctable_find_process (guint pid, ProcData *procdata) G_GNUC_INTERNAL;
8922N/A-void proctable_update_all (ProcData *data) G_GNUC_INTERNAL;
8922N/A-void proctable_clear_tree (ProcData *data) G_GNUC_INTERNAL;
8922N/A-void proctable_free_table (ProcData *data) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL GtkWidget* proctable_new (ProcData *data) ;
8922N/A+G_GNUC_INTERNAL void proctable_update_table (ProcData *data) ;
8922N/A+G_GNUC_INTERNAL void proctable_update_list (ProcData *data) ;
8922N/A+G_GNUC_INTERNAL void insert_info_to_tree (ProcInfo *info, ProcData *procdata) ;
8922N/A+G_GNUC_INTERNAL void remove_info_from_tree (ProcInfo *info, ProcData *procdata) ;
8922N/A+G_GNUC_INTERNAL ProcInfo * proctable_find_process (guint pid, ProcData *procdata) ;
8922N/A+G_GNUC_INTERNAL void proctable_update_all (ProcData *data) ;
8922N/A+G_GNUC_INTERNAL void proctable_clear_tree (ProcData *data) ;
8922N/A+G_GNUC_INTERNAL void proctable_free_table (ProcData *data) ;
8922N/A
8922N/A-GSList* proctable_get_columns_order(GtkTreeView *treeview) G_GNUC_INTERNAL;
8922N/A-void proctable_set_columns_order(GtkTreeView *treeview, GSList *order) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL GSList* proctable_get_columns_order(GtkTreeView *treeview) ;
8922N/A+G_GNUC_INTERNAL void proctable_set_columns_order(GtkTreeView *treeview, GSList *order) ;
8922N/A
8922N/A-char* make_loadavg_string(void) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL char* make_loadavg_string(void) ;
8405N/A+
8922N/A+G_END_DECLS
8922N/A
8922N/A #endif /* _PROCMAN_PROCTABLE_H_ */
8922N/Adiff -Nrup gnome-system-monitor-2.17.6/src/selinux.h gnome-system-monitor-2.17.6.mod/src/selinux.h
8922N/A--- gnome-system-monitor-2.17.6/src/selinux.h 2007-01-03 06:15:36.000000000 +0800
8922N/A+++ gnome-system-monitor-2.17.6.mod/src/selinux.h 2007-01-24 19:18:59.947306000 +0800
8922N/A@@ -5,10 +5,10 @@
8922N/A
8922N/A #include "procman.h"
8405N/A
8405N/A-void
8405N/A-get_process_selinux_context (ProcInfo *info) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void
8405N/A+get_process_selinux_context (ProcInfo *info) ;
8405N/A
8405N/A-gboolean
8405N/A-can_show_security_context_column (void) G_GNUC_INTERNAL G_GNUC_CONST;
8405N/A+G_GNUC_INTERNAL gboolean
8405N/A+can_show_security_context_column (void) G_GNUC_CONST;
8922N/A
8922N/A #endif /* PROCMAN_SELINUX_H_20050525 */
8405N/Adiff -Nrup gnome-system-monitor-2.17.6/src/util.h gnome-system-monitor-2.17.6.mod/src/util.h
8405N/A--- gnome-system-monitor-2.17.6/src/util.h 2007-01-23 01:30:48.000000000 +0800
8405N/A+++ gnome-system-monitor-2.17.6.mod/src/util.h 2007-01-24 19:20:35.141663000 +0800
8922N/A@@ -25,22 +25,22 @@ inline int procman_cmp(T x, T y)
8405N/A #define PROCMAN_CMP(X, Y) procman_cmp((X), (Y))
8405N/A #define PROCMAN_RCMP(X, Y) procman_cmp((Y), (X));
8405N/A
8405N/A-GtkWidget*
9311N/A+G_GNUC_INTERNAL GtkWidget*
9311N/A procman_make_label_for_mmaps_or_ofiles(const char *format,
9311N/A const char *process_name,
8522N/A- unsigned pid) G_GNUC_INTERNAL;
8405N/A+ unsigned pid) ;
8522N/A
8405N/A
8405N/A-gchar*
8405N/A-SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL gchar*
8922N/A+SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size) ;
8405N/A
8405N/A
8522N/A-gboolean
8405N/A-load_symbols(const char *module, ...) G_GNUC_INTERNAL G_GNUC_NULL_TERMINATED;
8922N/A+G_GNUC_INTERNAL gboolean
8405N/A+load_symbols(const char *module, ...) G_GNUC_NULL_TERMINATED;
8522N/A
9595N/A
9595N/A-void
9595N/A-procman_debug(const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
8922N/A+G_GNUC_INTERNAL void
8403N/A+procman_debug(const char *format, ...) G_GNUC_PRINTF(1, 2);
8403N/A
8403N/A
8403N/A inline string make_string(char *c_str)
8403N/A