15890N/Adiff -Nrup gnome-system-monitor-2.25.91/configure.in gnome-system-monitor-2.25.91.mod/configure.in

15890N/A--- gnome-system-monitor-2.25.91/configure.in 2009-02-17 02:07:36.000000000 +0800

15890N/A+++ gnome-system-monitor-2.25.91.mod/configure.in 2009-03-04 10:31:31.831892000 +0800

6895N/A@@ -56,13 +56,13 @@ if test "$GCC" = "yes" -a "$set_more_war

6895N/A -Wcast-align -Wsign-compare \

6895N/A -std=gnu89 \

6895N/A $CFLAGS"

6895N/A- CXXFLAGS="-Wall -std=c++98 $CXXFLAGS"

6895N/A+ CXXFLAGS="-Wall -std=c++98 $CXXFLAGS -features=extensions"

6895N/A else

6895N/A AC_MSG_RESULT(no)

6895N/A fi

6895N/A

6895N/A-dnl CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden $CXXFLAGS"

6895N/A-dnl CXXFLAGS="-fvisibility-inlines-hidden $CXXFLAGS"

6895N/A+dnl CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden -features=extensions $CXXFLAGS"

6895N/A+dnl CXXFLAGS="-fvisibility-inlines-hidden -features=extensions $CXXFLAGS"

6895N/A

6895N/A AM_GCONF_SOURCE_2

6895N/A

6895N/Adiff -Nrup gnome-system-monitor-2.25.91/src/load-graph.cpp gnome-system-monitor-2.25.91.mod/src/load-graph.cpp

6895N/A--- gnome-system-monitor-2.25.91/src/load-graph.cpp 2008-08-31 21:29:57.000000000 +0800

6895N/A+++ gnome-system-monitor-2.25.91.mod/src/load-graph.cpp 2009-03-04 11:26:07.230508000 +0800

6895N/A@@ -405,7 +405,7 @@ net_scale (LoadGraph *g, unsigned din, u

6895N/A // where factor10 is integer and x < 10

6895N/A // so we new_max has only 1 significant digit

6895N/A

6895N/A- unsigned factor10 = std::pow(10.0, std::floor(std::log10(coef10)));

15890N/A+ unsigned factor10 = std::pow(10.0, std::floor(std::log10((double)coef10)));

6895N/A coef10 = std::ceil(coef10 / double(factor10)) * factor10;

6895N/A

6895N/A // then make coef10 divisible by num_bars

6895N/A@@ -414,10 +414,10 @@ net_scale (LoadGraph *g, unsigned din, u

7867N/A g_assert(coef10 % g->num_bars() == 0);

6895N/A

6895N/A new_max = coef10 * (1UL << (base10 * 10));

15890N/A- procman_debug("bak %u new_max %u pow2 %u coef10 %u", bak_max, new_max, pow2, coef10);

7867N/A+ //procman_debug("bak %u new_max %u pow2 %u coef10 %u", bak_max, new_max, pow2, coef10);

6895N/A

6895N/A if (bak_max > new_max) {

7867N/A- procman_debug("overflow detected: bak=%u new=%u", bak_max, new_max);

15890N/A+ //procman_debug("overflow detected: bak=%u new=%u", bak_max, new_max);

6895N/A new_max = bak_max;

6895N/A }

6895N/A

15890N/A@@ -435,7 +435,7 @@ net_scale (LoadGraph *g, unsigned din, u

6895N/A }

6895N/A }

6895N/A

15890N/A- procman_debug("rescale dmax = %u max = %u new_max = %u", dmax, g->net.max, new_max);

6895N/A+ //procman_debug("rescale dmax = %u max = %u new_max = %u", dmax, g->net.max, new_max);

6895N/A

6895N/A g->net.max = new_max;

15890N/A

15890N/A@@ -457,6 +457,24 @@ get_net (LoadGraph *g)

15890N/A unsigned din, dout;

7867N/A gchar *text1;

6895N/A

6895N/A+ /* we have to optimize the performance of libgtop, because in some low

6895N/A+ level machine, to update the information will occupy too much cpu.

6895N/A+

10911N/A+ Here I would like to make a little update:

6895N/A+ set netlist.flags=1

6895N/A+ so as to let glibtop_get_netlist() only return the ones whose first

6895N/A+ character of name is the same withthe first one in their module,

6895N/A+ glibtop_get_netload() just try to find these devices, for example,

6895N/A+ bge0 and bge...

6895N/A+

6895N/A+ We do the check in glibtop_get_netlist(), I think this will

6895N/A+ accelerate the transaction lots. Also this will not affect the

6895N/A+ existing codes, because when nobody set glibtop_netlist.flags,

6895N/A+ glibtop_get_netlist() will return all devices with class "net".

6895N/A+ */

6895N/A+

6895N/A+ netlist.flags = 1;

6895N/A+

6895N/A ifnames = glibtop_get_netlist(&netlist);

6895N/A

6895N/A for (i = 0; i < netlist.number; ++i)

6895N/Adiff -Nrup gnome-system-monitor-2.25.91/src/lsof.cpp gnome-system-monitor-2.25.91.mod/src/lsof.cpp

6895N/A--- gnome-system-monitor-2.25.91/src/lsof.cpp 2008-05-24 05:44:00.000000000 +0800

6895N/A+++ gnome-system-monitor-2.25.91.mod/src/lsof.cpp 2009-03-04 10:16:57.082704000 +0800

6895N/A@@ -95,13 +95,13 @@ namespace

6895N/A

6895N/A GUI()

6895N/A {

6895N/A- procman_debug("New Lsof GUI %p", this);

6895N/A+ //procman_debug("New Lsof GUI %p", this);

6895N/A }

6895N/A

6895N/A

10911N/A ~GUI()

10911N/A {

6895N/A- procman_debug("Destroying Lsof GUI %p", this);

6895N/A+ //procman_debug("Destroying Lsof GUI %p", this);

6895N/A }

6895N/A

6895N/A

6895N/Adiff -Nrup gnome-system-monitor-2.25.91/src/openfiles.cpp gnome-system-monitor-2.25.91.mod/src/openfiles.cpp

6895N/A--- gnome-system-monitor-2.25.91/src/openfiles.cpp 2008-09-12 03:55:34.000000000 +0800

6895N/A+++ gnome-system-monitor-2.25.91.mod/src/openfiles.cpp 2009-03-04 11:54:44.460430000 +0800

6895N/A@@ -67,7 +67,7 @@ friendlier_hostname(const char *addr_str

6895N/A goto failsafe;

6895N/A

6895N/A if (getnameinfo(res->ai_addr, res->ai_addrlen, hostname,

6895N/A- sizeof hostname, service, sizeof service, NI_IDN))

6895N/A+ sizeof hostname, service, sizeof service, NI_MAXSERV))

6895N/A goto failsafe;

6895N/A

6895N/A if (res) freeaddrinfo(res);

6895N/Adiff -Nrup gnome-system-monitor-2.25.91/src/prettytable.cpp gnome-system-monitor-2.25.91.mod/src/prettytable.cpp

6895N/A--- gnome-system-monitor-2.25.91/src/prettytable.cpp 2009-01-19 02:01:09.000000000 +0800

6895N/A+++ gnome-system-monitor-2.25.91.mod/src/prettytable.cpp 2009-03-04 10:17:07.130460000 +0800

15890N/A@@ -77,7 +77,7 @@ PrettyTable::register_application(pid_t

6895N/A info->set_icon(icon);

6895N/A // move the ref to the map

6895N/A this->apps[pid] = icon;

6895N/A- procman_debug("WNCK OK for %u", unsigned(pid));

6895N/A+ //procman_debug("WNCK OK for %u", unsigned(pid));

6895N/A }

6895N/A }

10911N/A

15890N/A@@ -229,7 +229,7 @@ PrettyTable::set_icon(ProcInfo &info)

14429N/A getters.push_back(&PrettyTable::get_icon_from_name);

14429N/A if (has_kthreadd())

14429N/A {

14429N/A- procman_debug("kthreadd is running with PID 2");

14429N/A+ //procman_debug("kthreadd is running with PID 2");

14429N/A getters.push_back(&PrettyTable::get_icon_for_kernel);

14429N/A }

14429N/A getters.push_back(&PrettyTable::get_icon_dummy);

14429N/Adiff -Nrup gnome-system-monitor-2.25.91/src/procactions.cpp gnome-system-monitor-2.25.91.mod/src/procactions.cpp

14429N/A--- gnome-system-monitor-2.25.91/src/procactions.cpp 2007-01-03 06:15:36.000000000 +0800

14429N/A+++ gnome-system-monitor-2.25.91.mod/src/procactions.cpp 2009-02-22 19:58:20.190256000 +0800

6895N/A@@ -128,6 +128,15 @@ kill_single_process (GtkTreeModel *model

15890N/A if (!info)

6895N/A return;

6895N/A

14429N/A+ /*

14429N/A+ * If the process 0 is a system process, we can't control it even as root

14429N/A+ */

6895N/A+ if ((args->signal == SIGTERM) || (args->signal == SIGKILL)){

6895N/A+ if (info->pid == 0)

15890N/A+ return;

15890N/A+ }

15890N/A+ /* if it is not a system process, we can kill it now */

15890N/A+

15890N/A error = kill (info->pid, args->signal);

15890N/A

6895N/A /* success */

14429N/Adiff -Nrup gnome-system-monitor-2.25.91/src/procdialogs.cpp gnome-system-monitor-2.25.91.mod/src/procdialogs.cpp

15890N/A--- gnome-system-monitor-2.25.91/src/procdialogs.cpp 2008-05-24 05:44:00.000000000 +0800

15890N/A+++ gnome-system-monitor-2.25.91.mod/src/procdialogs.cpp 2009-03-04 10:17:21.908309000 +0800

15890N/A@@ -342,7 +342,7 @@ private:

6895N/A g_error_free(e);

15890N/A }

15890N/A

15890N/A- procman_debug("set %s to %d", this->gconf_key.c_str(), new_value);

14429N/A+ //procman_debug("set %s to %d", this->gconf_key.c_str(), new_value);

14429N/A }

14429N/A

15890N/A const string gconf_key;

15890N/A@@ -659,7 +659,10 @@ procdialog_create_preferences_dialog (Pr

15890N/A gtk_box_pack_start (GTK_BOX (hbox2), hbox3, TRUE, TRUE, 0);

14429N/A

15890N/A update = (gfloat) procdata->config.graph_update_interval;

15890N/A- adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 0.25,

15890N/A+ /* The interval is too small, and in some low level machine,

14429N/A+ cause gconf can't work, so set its min value 1 sec*/

14429N/A+ /*adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 0.25,*/

14429N/A+ adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 1,

14429N/A 100.0, 0.25, 1.0, 1.0);

14429N/A spin_button = gtk_spin_button_new (adjustment, 1.0, 2);

15890N/A g_signal_connect (G_OBJECT (spin_button), "focus_out_event",

15890N/A@@ -803,7 +806,7 @@ procdialog_create_root_password_dialog(P

15890N/A

14429N/A command = procman_action_to_command(type, pid, extra_value);

14429N/A

15890N/A- procman_debug("Trying to run '%s' as root", command);

6895N/A+ //procman_debug("Trying to run '%s' as root", command);

15890N/A

6895N/A if (procman_has_gksu())

6895N/A ret = procman_gksu_create_root_password_dialog(command);

6999N/Adiff -Nrup gnome-system-monitor-2.25.91/src/procman.cpp gnome-system-monitor-2.25.91.mod/src/procman.cpp

6895N/A--- gnome-system-monitor-2.25.91/src/procman.cpp 2009-01-03 20:06:10.000000000 +0800

6895N/A+++ gnome-system-monitor-2.25.91.mod/src/procman.cpp 2009-03-04 10:22:32.037096000 +0800

6895N/A@@ -147,7 +147,10 @@ timeouts_changed_cb (GConfClient *client

6895N/A procdata->config.graph_update_interval = gconf_value_get_int (value);

6895N/A procdata->config.graph_update_interval =

6895N/A MAX (procdata->config.graph_update_interval,

6895N/A- 250);

6895N/A+ /* The interval is too small, and in some low level machine,

6895N/A+ cause gconf can't work, so set its min value 1 sec*/

14429N/A+ /* 250);*/

14429N/A+ 1000);

14429N/A load_graph_change_speed(procdata->cpu_graph,

14429N/A procdata->config.graph_update_interval);

14429N/A load_graph_change_speed(procdata->mem_graph,

14429N/A@@ -332,10 +335,14 @@ procman_data_new (GConfClient *client)

14429N/A /* Sanity checks */

14429N/A swidth = gdk_screen_width ();

14429N/A sheight = gdk_screen_height ();

14429N/A- pd->config.width = CLAMP (pd->config.width, 50, swidth);

14429N/A- pd->config.height = CLAMP (pd->config.height, 50, sheight);

14429N/A+ pd->config.width = CLAMP (pd->config.width, 50, swidth-2); /* there is a bug in gtk I think, when the width/height

14429N/A+ become the biggest, the windows alway biggest, so -2 */

14429N/A+ pd->config.height = CLAMP (pd->config.height, 50, sheight-2);

14429N/A pd->config.update_interval = MAX (pd->config.update_interval, 1000);

14429N/A- pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);

14429N/A+ /* The interval is too small, and in some low level machine,

14429N/A+ cause gconf can't work, so set its min value 1 sec*/

14429N/A+ /*pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);*/

14429N/A+ pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 1000);

14429N/A pd->config.disks_update_interval = MAX (pd->config.disks_update_interval, 1000);

14429N/A pd->config.whose_process = CLAMP (pd->config.whose_process, 0, 2);

14429N/A pd->config.current_tab = CLAMP(pd->config.current_tab,

14429N/A@@ -598,9 +605,9 @@ cb_server (const gchar *msg, gpointer us

14429N/A procdata = *(ProcData**)user_data;

14429N/A g_assert (procdata != NULL);

14429N/A

14429N/A- procman_debug("cb_server(%s)", msg);

14429N/A+ //procman_debug("cb_server(%s)", msg);

14429N/A if (msg != NULL && procman::SHOW_SYSTEM_TAB_CMD == msg) {

14429N/A- procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message");

14429N/A+ //procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message");

14429N/A gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO);

14429N/A cb_change_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata);

14429N/A } else

14429N/A@@ -677,7 +684,7 @@ main (int argc, char *argv[])

14429N/A

14429N/A Gio::init();

14429N/A Gtk::Main kit(&argc, &argv);

14429N/A- procman_debug("post gtk_init");

14429N/A+ //procman_debug("post gtk_init");

14429N/A

14429N/A conn = bacon_message_connection_new ("gnome-system-monitor");

14429N/A if (!conn) g_error("Couldn't connect to gnome-system-monitor");

14429N/A@@ -715,14 +722,14 @@ main (int argc, char *argv[])

14429N/A

14429N/A glibtop_init ();

14429N/A

14429N/A- procman_debug("end init");

14429N/A+ //procman_debug("end init");

14429N/A

14429N/A procdata = procman_data_new (client);

14429N/A procdata->client = client;

14429N/A

14429N/A- procman_debug("begin create_main_window");

14429N/A+ //procman_debug("begin create_main_window");

14429N/A create_main_window (procdata);

14429N/A- procman_debug("end create_main_window");

14429N/A+ //procman_debug("end create_main_window");

14429N/A

14429N/A // proctable_update_all (procdata);

14429N/A

14429N/A@@ -731,14 +738,14 @@ main (int argc, char *argv[])

6999N/A g_assert(procdata->app);

6999N/A

6999N/A if (option_group.show_system_tab) {

6999N/A- procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request");

6999N/A+ //procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request");

6999N/A gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO);

6999N/A cb_change_current_page (GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata);

6999N/A }

6999N/A

6999N/A gtk_widget_show(procdata->app);

6999N/A

6999N/A- procman_debug("begin gtk_main");

6999N/A+ //procman_debug("begin gtk_main");

14429N/A kit.run();

7867N/A

6999N/A procman_free_data (procdata);

6999N/Adiff -Nrup gnome-system-monitor-2.25.91/src/proctable.cpp gnome-system-monitor-2.25.91.mod/src/proctable.cpp

14429N/A--- gnome-system-monitor-2.25.91/src/proctable.cpp 2008-09-14 05:25:03.000000000 +0800

15890N/A+++ gnome-system-monitor-2.25.91.mod/src/proctable.cpp 2009-03-04 12:05:57.166912000 +0800

6999N/A@@ -197,7 +197,7 @@ search_equal_func(GtkTreeModel *model,

6999N/A

6895N/A

15890N/A GtkWidget *

6999N/A-proctable_new (ProcData * const procdata)

6999N/A+proctable_new (ProcData * procdata)

6999N/A {

14429N/A GtkWidget *proctree;

15890N/A GtkWidget *scrolled;

6999N/A@@ -487,6 +487,18 @@ static void get_process_memory_writable(

6999N/A glibtop_proc_map buf;

6999N/A glibtop_map_entry *maps;

6999N/A

6999N/A+ /* we have to optimize the performance of libgtop, because update the information will occupy too much cpu.

6999N/A+

6999N/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()

14429N/A+ only return the ones this function need: memwritable

15890N/A+

6999N/A+ we do the check in glibtop_get_proc_map_s(), don't run the others part which don't need by this function,

6999N/A+ I think this will accelerate the transaction lots,

14429N/A+ Also this will not affect the existing codes, because when nobody set glibtop_proc_map.flags,

14429N/A+ glibtop_get_proc_map() will return all as before. zhua

6999N/A+ */

6999N/A+ buf.flags = 1;

6999N/A+

14429N/A maps = glibtop_get_proc_map(&buf, info->pid);

15890N/A

7867N/A gulong memwritable = 0;

7867N/A@@ -498,6 +510,9 @@ static void get_process_memory_writable(

7867N/A #else

7867N/A if (maps[i].perm & GLIBTOP_MAP_PERM_WRITE)

7867N/A memwritable += maps[i].size;

7867N/A+

14429N/A+ if (maps[i].perm & GLIBTOP_MAP_PERM_SHARED)

15890N/A+ info->memshared += maps[i].shared_clean;

7867N/A #endif

7867N/A }

7867N/A

7867N/A@@ -517,13 +532,20 @@ get_process_memory_info(ProcInfo *info)

7867N/A info->pid,

7867N/A &xresources);

14429N/A

6895N/A- glibtop_get_proc_mem(&procmem, info->pid);

7867N/A+ info->memxserver = xresources.total_bytes_estimate;

7867N/A+

7867N/A+/* zhua: use get_process_memory_writable(), because it just call glibtop_get_proc_map_s(),

14429N/A+ can get shared memory and writable memory, others: vmsize & memres, will be

7867N/A+ get in procstate from glibtop_get_proc_state()*/

7867N/A+/* glibtop_get_proc_mem(&procmem, info->pid);

7867N/A+

7867N/A

14429N/A info->vmsize = procmem.vsize;

14429N/A info->memres = procmem.resident;

14429N/A info->memshared = procmem.share;

14429N/A

14429N/A info->memxserver = xresources.total_bytes_estimate;

14429N/A+*/

14429N/A

14429N/A get_process_memory_writable(info);

7867N/A

7867N/A@@ -597,7 +619,7 @@ insert_info_to_tree (ProcInfo *info, Pro

7867N/A

7867N/A procdata->pretty_table.set_icon(*info);

7867N/A

7867N/A- procman_debug("inserted %d%s", info->pid, (forced ? " (forced)" : ""));

7867N/A+ //procman_debug("inserted %d%s", info->pid, (forced ? " (forced)" : ""));

7867N/A }

7867N/A

7867N/A

7867N/A@@ -612,12 +634,12 @@ remove_info_from_tree (ProcData *procdat

7867N/A GtkTreeIter child_node;

14429N/A

7867N/A if (std::find(orphans.begin(), orphans.end(), current) != orphans.end()) {

7867N/A- procman_debug("[%u] %d already removed from tree", lvl, int(current->pid));

7867N/A+ //procman_debug("[%u] %d already removed from tree", lvl, int(current->pid));

14429N/A return;

7867N/A }

7867N/A

7867N/A- procman_debug("[%u] pid %d, %d children", lvl, int(current->pid),

14429N/A- gtk_tree_model_iter_n_children(model, &current->node));

7867N/A+ //procman_debug("[%u] pid %d, %d children", lvl, int(current->pid),

7867N/A+ // gtk_tree_model_iter_n_children(model, &current->node));

7867N/A

14429N/A // it is not possible to iterate&erase over a treeview so instead we

7867N/A // just pop one child after another and recursively remove it and

7867N/A@@ -655,15 +677,20 @@ update_info (ProcData *procdata, ProcInf

7867N/A glibtop_get_proc_state (&procstate, info->pid);

6895N/A info->status = procstate.state;

7867N/A

7867N/A+ /* zhua: let's delete this call, because we can get the value

7867N/A+ from glibtop_get_proc_state

7867N/A glibtop_get_proc_uid (&procuid, info->pid);

14429N/A+ */

7867N/A glibtop_get_proc_time (&proctime, info->pid);

7867N/A

7867N/A- get_process_memory_info(info);

14429N/A+ get_process_memory_info(info);/* get shared/writable/xserver memory */

14429N/A

6999N/A- info->set_user(procstate.uid);

6999N/A+ info->set_user(procstate.uid);/* get user of process */

6999N/A

14429N/A+ /* zhua: let's get from file directly

14429N/A info->pcpu = (proctime.rtime - info->cpu_time) * 100 / procdata->cpu_total_time;

14429N/A info->pcpu = MIN(info->pcpu, 100);

14429N/A+ */

14240N/A

14429N/A if (procdata->config.solaris_mode)

14429N/A info->pcpu /= procdata->config.num_cpus;

14429N/A@@ -671,6 +698,17 @@ update_info (ProcData *procdata, ProcInf

14429N/A ProcInfo::cpu_times[info->pid] = info->cpu_time = proctime.rtime;

6895N/A info->nice = procuid.nice;

14240N/A info->ppid = procuid.ppid;

14240N/A+

14240N/A+ /* zhua: get nice/ppid from procstate */

14240N/A+ // info->nice = procstate.nice;

14240N/A+

14240N/A+ /* zhua: get start_time from procstate */

14240N/A+ info->start_time = procstate.start_time;

6895N/A+

7867N/A+ info->vmsize = procstate.vsize;

6999N/A+ info->memres = procstate.resident;

6999N/A+

6895N/A+ // info->pcpu = procstate.load;

6999N/A }

6999N/A

6999N/A

6895N/A@@ -712,7 +750,13 @@ ProcInfo::ProcInfo(pid_t pid)

6895N/A cpu_time = it->second;

6895N/A }

6895N/A info->cpu_time = cpu_time;

6895N/A- info->start_time = proctime.start_time;

6895N/A+ /* zhua: get start_time/nice/ppid from procstate */

6895N/A+ info->start_time = procstate.start_time;

6895N/A+ info->nice = procstate.nice;

6895N/A+ /* zhua */

7867N/A+ info->vmsize = procstate.vsize;

7867N/A+ info->memres = procstate.resident;

7867N/A+ info->pcpu = procstate.load;

7867N/A

7867N/A get_process_selinux_context (info);

7867N/A }

7867N/A@@ -757,7 +801,7 @@ refresh_list (ProcData *procdata, const

7867N/A ++next;

7867N/A

7867N/A if (pids.find(info->pid) == pids.end()) {

7867N/A- procman_debug("ripping %d", info->pid);

6895N/A+ //procman_debug("ripping %d", info->pid);

15890N/A remove_info_from_tree(procdata, model, info, addition);

7867N/A addition.remove(info);

15890N/A ProcInfo::all.erase(it);

15890N/A@@ -785,12 +829,12 @@ refresh_list (ProcData *procdata, const

7867N/A

15890N/A

15890N/A while (not addition.empty()) {

15890N/A- procman_debug("looking for %d parents", int(addition.size()));

15890N/A+ //procman_debug("looking for %d parents", int(addition.size()));

15890N/A ProcList::iterator it(addition.begin());

15890N/A

7867N/A while (it != addition.end()) {

15890N/A- procman_debug("looking for %d's parent with ppid %d",

15890N/A- int((*it)->pid), int((*it)->ppid));

6895N/A+ //procman_debug("looking for %d's parent with ppid %d",

15890N/A+ //int((*it)->pid), int((*it)->ppid));

15890N/A

15890N/A

7867N/A // inserts the process in the treeview if :

15890N/A@@ -880,9 +924,11 @@ proctable_update_list (ProcData * const

15890N/A

14240N/A /* FIXME: total cpu time elapsed should be calculated on an individual basis here

15890N/A ** should probably have a total_time_last gint in the ProcInfo structure */

15890N/A+/* zhua: delete these sentences, we can get cpu% from file directly.

15890N/A glibtop_get_cpu (&cpu);

7867N/A procdata->cpu_total_time = MAX(cpu.total - procdata->cpu_total_time_last, 1);

15890N/A procdata->cpu_total_time_last = cpu.total;

15890N/A+*/

6895N/A

15890N/A refresh_list (procdata, pid_list, proclist.number);

15890N/A

15890N/A@@ -895,7 +941,7 @@ proctable_update_list (ProcData * const

7867N/A

15890N/A

15890N/A void

15890N/A-proctable_update_all (ProcData * const procdata)

15890N/A+proctable_update_all (ProcData * procdata)

15890N/A {

15890N/A char* string;

7867N/A

15890N/Adiff -Nrup gnome-system-monitor-2.25.91/src/selection.cpp gnome-system-monitor-2.25.91.mod/src/selection.cpp

15890N/A--- gnome-system-monitor-2.25.91/src/selection.cpp 2007-06-30 02:28:26.000000000 +0800

7867N/A+++ gnome-system-monitor-2.25.91.mod/src/selection.cpp 2009-03-04 12:00:41.995124000 +0800

15890N/A@@ -33,10 +33,10 @@ namespace procman

15890N/A if (ProcInfo* proc = ProcInfo::find(*it))

15890N/A {

6895N/A gtk_tree_selection_select_iter(selection, &proc->node);

6895N/A- procman_debug("Re-selected process %u", unsigned(*it));

6895N/A+ //procman_debug("Re-selected process %u", unsigned(*it));

6895N/A }

6895N/A- else

6895N/A- procman_debug("Could not find process %u, cannot re-select it", unsigned(*it));

6895N/A+ //else

6895N/A+ //procman_debug("Could not find process %u, cannot re-select it", unsigned(*it));

6895N/A }

6895N/A }

6895N/A }

15890N/Adiff -Nrup gnome-system-monitor-2.25.91/src/smooth_refresh.cpp gnome-system-monitor-2.25.91.mod/src/smooth_refresh.cpp

6895N/A--- gnome-system-monitor-2.25.91/src/smooth_refresh.cpp 2009-01-19 02:16:39.000000000 +0800

6895N/A+++ gnome-system-monitor-2.25.91.mod/src/smooth_refresh.cpp 2009-03-04 11:31:10.615230000 +0800

6895N/A@@ -65,7 +65,7 @@ void SmoothRefresh::load_gconf_value(GCo

7867N/A this->active = value ? gconf_value_get_bool(value) : KEY_DEFAULT_VALUE;

6895N/A

6895N/A if (this->active)

6895N/A- procman_debug("smooth_refresh is enabled");

6895N/A+ //procman_debug("smooth_refresh is enabled");

6895N/A

6895N/A if (own_value and value)

6895N/A gconf_value_free(value);

7867N/A@@ -159,10 +159,10 @@ SmoothRefresh::get(guint &new_interval)

6895N/A

6895N/A

6895N/A if (changed) {

7867N/A- procman_debug("CPU usage is %3u%%, changed refresh_interval to %u (config %u)",

7867N/A+ /*procman_debug("CPU usage is %3u%%, changed refresh_interval to %u (config %u)",

6895N/A this->last_pcpu,

6895N/A this->interval,

6895N/A- config_interval);

7867N/A+ config_interval);*/

6895N/A }

6895N/A

6895N/A g_assert(this->interval == new_interval);

7867N/Adiff -Nrup gnome-system-monitor-2.25.91/src/sysinfo.cpp gnome-system-monitor-2.25.91.mod/src/sysinfo.cpp

7867N/A--- gnome-system-monitor-2.25.91/src/sysinfo.cpp 2009-01-21 05:13:28.000000000 +0800

6895N/A+++ gnome-system-monitor-2.25.91.mod/src/sysinfo.cpp 2009-03-04 10:18:54.373979000 +0800

6895N/A@@ -273,7 +273,7 @@ namespace {

6895N/A channel->close();

7867N/A Glib::spawn_close_pid(pid);

6895N/A

6895N/A- procman_debug("lsb_release output = '%s'", content.c_str());

6895N/A+ //procman_debug("lsb_release output = '%s'", content.c_str());

7867N/A

6895N/A string release, codename;

6895N/A std::istringstream input(content);

6895N/Adiff -Nrup gnome-system-monitor-2.25.91/src/util.cpp gnome-system-monitor-2.25.91.mod/src/util.cpp

7867N/A--- gnome-system-monitor-2.25.91/src/util.cpp 2009-02-17 02:21:44.000000000 +0800

6895N/A+++ gnome-system-monitor-2.25.91.mod/src/util.cpp 2009-03-04 10:21:38.634398000 +0800

6895N/A@@ -192,7 +192,7 @@ load_symbols(const char *module, ...)

6895N/A if (!mod)

6895N/A return FALSE;

6895N/A

6895N/A- procman_debug("Found %s", module);

6895N/A+ //procman_debug("Found %s", module);

7867N/A

6895N/A va_start(args, module);

6895N/A

6895N/A@@ -208,10 +208,10 @@ load_symbols(const char *module, ...)

7867N/A symbol = va_arg(args, void**);

6895N/A

6895N/A if (g_module_symbol(mod, name, symbol)) {

6895N/A- procman_debug("Loaded %s from %s", name, module);

6895N/A+ //procman_debug("Loaded %s from %s", name, module);

7867N/A }

7867N/A else {

7867N/A- procman_debug("Could not load %s from %s", name, module);

7867N/A+ //procman_debug("Could not load %s from %s", name, module);

7867N/A found_all = FALSE;

7867N/A break;

7867N/A }

7867N/A