1 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/configure.in gnome-system-monitor-2.25.91.mod/configure.in 2 17667 davelam --- gnome-system-monitor-2.25.91/configure.in 2009-02-17 02:07:36.000000000 +0800 3 17667 davelam +++ gnome-system-monitor-2.25.91.mod/configure.in 2009-03-04 10:31:31.831892000 +0800 4 17667 davelam @@ -56,13 +56,13 @@ if test "$GCC" = "yes" -a "$set_more_war 5 17667 davelam -Wcast-align -Wsign-compare \ 6 17667 davelam -std=gnu89 \ 7 17667 davelam $CFLAGS" 8 17667 davelam - CXXFLAGS="-Wall -std=c++98 $CXXFLAGS" 9 17667 davelam + CXXFLAGS="-Wall -std=c++98 $CXXFLAGS -features=extensions" 10 17667 davelam else 11 17667 davelam AC_MSG_RESULT(no) 12 17667 davelam fi 13 8652 hz159841 14 17667 davelam -dnl CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden $CXXFLAGS" 15 17667 davelam -dnl CXXFLAGS="-fvisibility-inlines-hidden $CXXFLAGS" 16 17667 davelam +dnl CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden -features=extensions $CXXFLAGS" 17 17667 davelam +dnl CXXFLAGS="-fvisibility-inlines-hidden -features=extensions $CXXFLAGS" 18 8652 hz159841 19 17667 davelam AM_GCONF_SOURCE_2 20 8652 hz159841 21 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/load-graph.cpp gnome-system-monitor-2.25.91.mod/src/load-graph.cpp 22 17667 davelam --- gnome-system-monitor-2.25.91/src/load-graph.cpp 2008-08-31 21:29:57.000000000 +0800 23 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/load-graph.cpp 2009-03-04 11:26:07.230508000 +0800 24 17667 davelam @@ -435,7 +435,7 @@ net_scale (LoadGraph *g, unsigned din, u 25 17667 davelam } 26 17667 davelam } 27 8650 hz159841 28 17667 davelam - procman_debug("rescale dmax = %u max = %u new_max = %u", dmax, g->net.max, new_max); 29 17667 davelam + //procman_debug("rescale dmax = %u max = %u new_max = %u", dmax, g->net.max, new_max); 30 8650 hz159841 31 17667 davelam g->net.max = new_max; 32 10341 henryz 33 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/lsof.cpp gnome-system-monitor-2.25.91.mod/src/lsof.cpp 34 17667 davelam --- gnome-system-monitor-2.25.91/src/lsof.cpp 2008-05-24 05:44:00.000000000 +0800 35 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/lsof.cpp 2009-03-04 10:16:57.082704000 +0800 36 17667 davelam @@ -95,13 +95,13 @@ namespace 37 8652 hz159841 38 17667 davelam GUI() 39 17667 davelam { 40 17667 davelam - procman_debug("New Lsof GUI %p", this); 41 17667 davelam + //procman_debug("New Lsof GUI %p", this); 42 17667 davelam } 43 8652 hz159841 44 8652 hz159841 45 17667 davelam ~GUI() 46 17667 davelam { 47 17667 davelam - procman_debug("Destroying Lsof GUI %p", this); 48 17667 davelam + //procman_debug("Destroying Lsof GUI %p", this); 49 17667 davelam } 50 8652 hz159841 51 8652 hz159841 52 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/openfiles.cpp gnome-system-monitor-2.25.91.mod/src/openfiles.cpp 53 17667 davelam --- gnome-system-monitor-2.25.91/src/openfiles.cpp 2008-09-12 03:55:34.000000000 +0800 54 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/openfiles.cpp 2009-03-04 11:54:44.460430000 +0800 55 17667 davelam @@ -67,7 +67,7 @@ friendlier_hostname(const char *addr_str 56 17667 davelam goto failsafe; 57 8652 hz159841 58 17667 davelam if (getnameinfo(res->ai_addr, res->ai_addrlen, hostname, 59 17667 davelam - sizeof hostname, service, sizeof service, NI_IDN)) 60 17667 davelam + sizeof hostname, service, sizeof service, NI_MAXSERV)) 61 17667 davelam goto failsafe; 62 8652 hz159841 63 17667 davelam if (res) freeaddrinfo(res); 64 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/prettytable.cpp gnome-system-monitor-2.25.91.mod/src/prettytable.cpp 65 17667 davelam --- gnome-system-monitor-2.25.91/src/prettytable.cpp 2009-01-19 02:01:09.000000000 +0800 66 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/prettytable.cpp 2009-03-04 10:17:07.130460000 +0800 67 17667 davelam @@ -77,7 +77,7 @@ PrettyTable::register_application(pid_t 68 17667 davelam info->set_icon(icon); 69 17667 davelam // move the ref to the map 70 17667 davelam this->apps[pid] = icon; 71 17667 davelam - procman_debug("WNCK OK for %u", unsigned(pid)); 72 17667 davelam + //procman_debug("WNCK OK for %u", unsigned(pid)); 73 17667 davelam } 74 17667 davelam } 75 8652 hz159841 76 17667 davelam @@ -229,7 +229,7 @@ PrettyTable::set_icon(ProcInfo &info) 77 17667 davelam getters.push_back(&PrettyTable::get_icon_from_name); 78 17667 davelam if (has_kthreadd()) 79 17667 davelam { 80 17667 davelam - procman_debug("kthreadd is running with PID 2"); 81 17667 davelam + //procman_debug("kthreadd is running with PID 2"); 82 17667 davelam getters.push_back(&PrettyTable::get_icon_for_kernel); 83 17667 davelam } 84 17667 davelam getters.push_back(&PrettyTable::get_icon_dummy); 85 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/procactions.cpp gnome-system-monitor-2.25.91.mod/src/procactions.cpp 86 17667 davelam --- gnome-system-monitor-2.25.91/src/procactions.cpp 2007-01-03 06:15:36.000000000 +0800 87 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/procactions.cpp 2009-02-22 19:58:20.190256000 +0800 88 17667 davelam @@ -128,6 +128,15 @@ kill_single_process (GtkTreeModel *model 89 8662 hz159841 if (!info) 90 8662 hz159841 return; 91 17667 davelam 92 8662 hz159841 + /* 93 9302 hz159841 + * If the process 0 is a system process, we can't control it even as root 94 9302 hz159841 + */ 95 9302 hz159841 + if ((args->signal == SIGTERM) || (args->signal == SIGKILL)){ 96 9302 hz159841 + if (info->pid == 0) 97 9302 hz159841 + return; 98 9302 hz159841 + } 99 9302 hz159841 + /* if it is not a system process, we can kill it now */ 100 17667 davelam + 101 8662 hz159841 error = kill (info->pid, args->signal); 102 8662 hz159841 103 17667 davelam /* success */ 104 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/procdialogs.cpp gnome-system-monitor-2.25.91.mod/src/procdialogs.cpp 105 17667 davelam --- gnome-system-monitor-2.25.91/src/procdialogs.cpp 2008-05-24 05:44:00.000000000 +0800 106 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/procdialogs.cpp 2009-03-04 10:17:21.908309000 +0800 107 17667 davelam @@ -342,7 +342,7 @@ private: 108 17667 davelam g_error_free(e); 109 17667 davelam } 110 8652 hz159841 111 17667 davelam - procman_debug("set %s to %d", this->gconf_key.c_str(), new_value); 112 17667 davelam + //procman_debug("set %s to %d", this->gconf_key.c_str(), new_value); 113 17667 davelam } 114 8652 hz159841 115 17667 davelam const string gconf_key; 116 17667 davelam @@ -659,7 +659,10 @@ procdialog_create_preferences_dialog (Pr 117 10312 henryz gtk_box_pack_start (GTK_BOX (hbox2), hbox3, TRUE, TRUE, 0); 118 10312 henryz 119 10312 henryz update = (gfloat) procdata->config.graph_update_interval; 120 10312 henryz - adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 0.25, 121 10312 henryz + /* The interval is too small, and in some low level machine, 122 10312 henryz + cause gconf can't work, so set its min value 1 sec*/ 123 10312 henryz + /*adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 0.25,*/ 124 10312 henryz + adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 1, 125 10312 henryz 100.0, 0.25, 1.0, 1.0); 126 10312 henryz spin_button = gtk_spin_button_new (adjustment, 1.0, 2); 127 10312 henryz g_signal_connect (G_OBJECT (spin_button), "focus_out_event", 128 17667 davelam @@ -803,7 +806,7 @@ procdialog_create_root_password_dialog(P 129 8652 hz159841 130 17667 davelam command = procman_action_to_command(type, pid, extra_value); 131 8652 hz159841 132 17667 davelam - procman_debug("Trying to run '%s' as root", command); 133 17667 davelam + //procman_debug("Trying to run '%s' as root", command); 134 8652 hz159841 135 17667 davelam if (procman_has_gksu()) 136 17667 davelam ret = procman_gksu_create_root_password_dialog(command); 137 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/procman.cpp gnome-system-monitor-2.25.91.mod/src/procman.cpp 138 17667 davelam --- gnome-system-monitor-2.25.91/src/procman.cpp 2009-01-03 20:06:10.000000000 +0800 139 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/procman.cpp 2009-03-04 10:22:32.037096000 +0800 140 17667 davelam @@ -147,7 +147,10 @@ timeouts_changed_cb (GConfClient *client 141 9302 hz159841 procdata->config.graph_update_interval = gconf_value_get_int (value); 142 9302 hz159841 procdata->config.graph_update_interval = 143 9302 hz159841 MAX (procdata->config.graph_update_interval, 144 9302 hz159841 - 250); 145 9831 dcarbery + /* The interval is too small, and in some low level machine, 146 9831 dcarbery + cause gconf can't work, so set its min value 1 sec*/ 147 9831 dcarbery + /* 250);*/ 148 9831 dcarbery + 1000); 149 9302 hz159841 load_graph_change_speed(procdata->cpu_graph, 150 9302 hz159841 procdata->config.graph_update_interval); 151 9302 hz159841 load_graph_change_speed(procdata->mem_graph, 152 17667 davelam @@ -332,10 +335,14 @@ procman_data_new (GConfClient *client) 153 10389 henryz /* Sanity checks */ 154 10389 henryz swidth = gdk_screen_width (); 155 10389 henryz sheight = gdk_screen_height (); 156 10389 henryz - pd->config.width = CLAMP (pd->config.width, 50, swidth); 157 10389 henryz - pd->config.height = CLAMP (pd->config.height, 50, sheight); 158 10395 henryz + pd->config.width = CLAMP (pd->config.width, 50, swidth-2); /* there is a bug in gtk I think, when the width/height 159 17667 davelam + become the biggest, the windows alway biggest, so -2 */ 160 10389 henryz + pd->config.height = CLAMP (pd->config.height, 50, sheight-2); 161 9302 hz159841 pd->config.update_interval = MAX (pd->config.update_interval, 1000); 162 9302 hz159841 - pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250); 163 9831 dcarbery + /* The interval is too small, and in some low level machine, 164 9302 hz159841 + cause gconf can't work, so set its min value 1 sec*/ 165 9831 dcarbery + /*pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);*/ 166 9831 dcarbery + pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 1000); 167 9302 hz159841 pd->config.disks_update_interval = MAX (pd->config.disks_update_interval, 1000); 168 9302 hz159841 pd->config.whose_process = CLAMP (pd->config.whose_process, 0, 2); 169 9831 dcarbery pd->config.current_tab = CLAMP(pd->config.current_tab, 170 17667 davelam @@ -598,9 +605,9 @@ cb_server (const gchar *msg, gpointer us 171 17667 davelam procdata = *(ProcData**)user_data; 172 17667 davelam g_assert (procdata != NULL); 173 8652 hz159841 174 17667 davelam - procman_debug("cb_server(%s)", msg); 175 17667 davelam + //procman_debug("cb_server(%s)", msg); 176 17667 davelam if (msg != NULL && procman::SHOW_SYSTEM_TAB_CMD == msg) { 177 17667 davelam - procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message"); 178 17667 davelam + //procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message"); 179 17667 davelam gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO); 180 17667 davelam cb_change_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata); 181 17667 davelam } else 182 17667 davelam @@ -677,7 +684,7 @@ main (int argc, char *argv[]) 183 8652 hz159841 184 17667 davelam Gio::init(); 185 17667 davelam Gtk::Main kit(&argc, &argv); 186 17667 davelam - procman_debug("post gtk_init"); 187 17667 davelam + //procman_debug("post gtk_init"); 188 8652 hz159841 189 17667 davelam conn = bacon_message_connection_new ("gnome-system-monitor"); 190 17667 davelam if (!conn) g_error("Couldn't connect to gnome-system-monitor"); 191 17667 davelam @@ -715,14 +722,14 @@ main (int argc, char *argv[]) 192 8652 hz159841 193 17667 davelam glibtop_init (); 194 9731 henryz 195 17667 davelam - procman_debug("end init"); 196 17667 davelam + //procman_debug("end init"); 197 17667 davelam 198 17667 davelam procdata = procman_data_new (client); 199 17667 davelam procdata->client = client; 200 17667 davelam 201 17667 davelam - procman_debug("begin create_main_window"); 202 17667 davelam + //procman_debug("begin create_main_window"); 203 17667 davelam create_main_window (procdata); 204 17667 davelam - procman_debug("end create_main_window"); 205 17667 davelam + //procman_debug("end create_main_window"); 206 17667 davelam 207 17667 davelam // proctable_update_all (procdata); 208 17667 davelam 209 17667 davelam @@ -731,14 +738,14 @@ main (int argc, char *argv[]) 210 17667 davelam g_assert(procdata->app); 211 17667 davelam 212 17667 davelam if (option_group.show_system_tab) { 213 17667 davelam - procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request"); 214 17667 davelam + //procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request"); 215 17667 davelam gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO); 216 17667 davelam cb_change_current_page (GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata); 217 17667 davelam } 218 17667 davelam 219 17667 davelam gtk_widget_show(procdata->app); 220 17667 davelam 221 17667 davelam - procman_debug("begin gtk_main"); 222 17667 davelam + //procman_debug("begin gtk_main"); 223 17667 davelam kit.run(); 224 17667 davelam 225 17667 davelam procman_free_data (procdata); 226 18725 lin diff -Nrup gnome-system-monitor-2.26.2/src/proctable.cpp gnome-system-monitor-2.26.2/src/proctable.cpp 227 18725 lin --- gnome-system-monitor-2.26.2/src/proctable.cpp 2009-07-15 15:18:15.325964805 +0800 228 18725 lin +++ gnome-system-monitor-2.26.2/src/proctable.cpp 2009-07-15 15:40:34.315280700 +0800 229 17667 davelam @@ -197,7 +197,7 @@ search_equal_func(GtkTreeModel *model, 230 17667 davelam 231 17667 davelam 232 17667 davelam GtkWidget * 233 17667 davelam -proctable_new (ProcData * const procdata) 234 17667 davelam +proctable_new (ProcData * procdata) 235 17667 davelam { 236 17667 davelam GtkWidget *proctree; 237 17667 davelam GtkWidget *scrolled; 238 17667 davelam @@ -487,6 +487,18 @@ static void get_process_memory_writable( 239 17667 davelam glibtop_proc_map buf; 240 17667 davelam glibtop_map_entry *maps; 241 17667 davelam 242 9731 henryz + /* we have to optimize the performance of libgtop, because update the information will occupy too much cpu. 243 9731 henryz + 244 9731 henryz + here I would like to make a little update:set glibtop_proc_map.flags=1,so as to let glibtop_get_proc_map_s() 245 9731 henryz + only return the ones this function need: memwritable 246 9731 henryz + 247 9731 henryz + we do the check in glibtop_get_proc_map_s(), don't run the others part which don't need by this function, 248 9731 henryz + I think this will accelerate the transaction lots, 249 9731 henryz + Also this will not affect the existing codes, because when nobody set glibtop_proc_map.flags, 250 9731 henryz + glibtop_get_proc_map() will return all as before. zhua 251 9731 henryz + */ 252 9731 henryz + buf.flags = 1; 253 10341 henryz + 254 9731 henryz maps = glibtop_get_proc_map(&buf, info->pid); 255 9731 henryz 256 17667 davelam gulong memwritable = 0; 257 17667 davelam @@ -498,6 +510,9 @@ static void get_process_memory_writable( 258 10312 henryz #else 259 10312 henryz if (maps[i].perm & GLIBTOP_MAP_PERM_WRITE) 260 17667 davelam memwritable += maps[i].size; 261 10312 henryz + 262 10312 henryz + if (maps[i].perm & GLIBTOP_MAP_PERM_SHARED) 263 10312 henryz + info->memshared += maps[i].shared_clean; 264 10312 henryz #endif 265 10312 henryz } 266 8650 hz159841 267 18725 lin @@ -570,7 +585,7 @@ insert_info_to_tree (ProcInfo *info, Pro 268 10312 henryz 269 18725 lin ProcInfo *parent = 0; 270 17667 davelam 271 18725 lin - if (not forced) 272 18725 lin + if (not forced && info->pid != 0) 273 18725 lin parent = ProcInfo::find(info->ppid); 274 10312 henryz 275 18725 lin if (parent) { 276 18725 lin @@ -597,7 +612,7 @@ insert_info_to_tree (ProcInfo *info, Pro 277 17667 davelam 278 17667 davelam procdata->pretty_table.set_icon(*info); 279 17667 davelam 280 17667 davelam - procman_debug("inserted %d%s", info->pid, (forced ? " (forced)" : "")); 281 17667 davelam + //procman_debug("inserted %d%s", info->pid, (forced ? " (forced)" : "")); 282 9302 hz159841 } 283 8794 dc144907 284 8650 hz159841 285 18725 lin @@ -612,12 +627,12 @@ remove_info_from_tree (ProcData *procdat 286 17667 davelam GtkTreeIter child_node; 287 8794 dc144907 288 17667 davelam if (std::find(orphans.begin(), orphans.end(), current) != orphans.end()) { 289 17667 davelam - procman_debug("[%u] %d already removed from tree", lvl, int(current->pid)); 290 17667 davelam + //procman_debug("[%u] %d already removed from tree", lvl, int(current->pid)); 291 17667 davelam return; 292 17667 davelam } 293 9302 hz159841 294 17667 davelam - procman_debug("[%u] pid %d, %d children", lvl, int(current->pid), 295 17667 davelam - gtk_tree_model_iter_n_children(model, ¤t->node)); 296 17667 davelam + //procman_debug("[%u] pid %d, %d children", lvl, int(current->pid), 297 17667 davelam + // gtk_tree_model_iter_n_children(model, ¤t->node)); 298 10341 henryz 299 17667 davelam // it is not possible to iterate&erase over a treeview so instead we 300 17667 davelam // just pop one child after another and recursively remove it and 301 18725 lin @@ -757,7 +772,7 @@ refresh_list (ProcData *procdata, const 302 17667 davelam ++next; 303 10312 henryz 304 17667 davelam if (pids.find(info->pid) == pids.end()) { 305 17667 davelam - procman_debug("ripping %d", info->pid); 306 17667 davelam + //procman_debug("ripping %d", info->pid); 307 17667 davelam remove_info_from_tree(procdata, model, info, addition); 308 17667 davelam addition.remove(info); 309 17667 davelam ProcInfo::all.erase(it); 310 18725 lin @@ -785,12 +800,12 @@ refresh_list (ProcData *procdata, const 311 10312 henryz 312 11478 dcarbery 313 17667 davelam while (not addition.empty()) { 314 17667 davelam - procman_debug("looking for %d parents", int(addition.size())); 315 17667 davelam + //procman_debug("looking for %d parents", int(addition.size())); 316 17667 davelam ProcList::iterator it(addition.begin()); 317 11478 dcarbery 318 17667 davelam while (it != addition.end()) { 319 17667 davelam - procman_debug("looking for %d's parent with ppid %d", 320 17667 davelam - int((*it)->pid), int((*it)->ppid)); 321 17667 davelam + //procman_debug("looking for %d's parent with ppid %d", 322 17667 davelam + //int((*it)->pid), int((*it)->ppid)); 323 10312 henryz 324 17667 davelam 325 17667 davelam // inserts the process in the treeview if : 326 18725 lin @@ -895,7 +910,7 @@ proctable_update_list (ProcData * const 327 17667 davelam 328 8650 hz159841 329 17667 davelam void 330 17667 davelam -proctable_update_all (ProcData * const procdata) 331 17667 davelam +proctable_update_all (ProcData * procdata) 332 17667 davelam { 333 17667 davelam char* string; 334 8652 hz159841 335 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/selection.cpp gnome-system-monitor-2.25.91.mod/src/selection.cpp 336 17667 davelam --- gnome-system-monitor-2.25.91/src/selection.cpp 2007-06-30 02:28:26.000000000 +0800 337 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/selection.cpp 2009-03-04 12:00:41.995124000 +0800 338 17667 davelam @@ -33,10 +33,10 @@ namespace procman 339 17667 davelam if (ProcInfo* proc = ProcInfo::find(*it)) 340 17667 davelam { 341 17667 davelam gtk_tree_selection_select_iter(selection, &proc->node); 342 17667 davelam - procman_debug("Re-selected process %u", unsigned(*it)); 343 17667 davelam + //procman_debug("Re-selected process %u", unsigned(*it)); 344 17667 davelam } 345 17667 davelam - else 346 17667 davelam - procman_debug("Could not find process %u, cannot re-select it", unsigned(*it)); 347 17667 davelam + //else 348 17667 davelam + //procman_debug("Could not find process %u, cannot re-select it", unsigned(*it)); 349 17667 davelam } 350 17667 davelam } 351 17667 davelam } 352 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/smooth_refresh.cpp gnome-system-monitor-2.25.91.mod/src/smooth_refresh.cpp 353 17667 davelam --- gnome-system-monitor-2.25.91/src/smooth_refresh.cpp 2009-01-19 02:16:39.000000000 +0800 354 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/smooth_refresh.cpp 2009-03-04 11:31:10.615230000 +0800 355 17667 davelam @@ -65,7 +65,7 @@ void SmoothRefresh::load_gconf_value(GCo 356 17667 davelam this->active = value ? gconf_value_get_bool(value) : KEY_DEFAULT_VALUE; 357 8652 hz159841 358 17667 davelam if (this->active) 359 17667 davelam - procman_debug("smooth_refresh is enabled"); 360 17667 davelam + //procman_debug("smooth_refresh is enabled"); 361 8652 hz159841 362 17667 davelam if (own_value and value) 363 17667 davelam gconf_value_free(value); 364 17667 davelam @@ -159,10 +159,10 @@ SmoothRefresh::get(guint &new_interval) 365 8652 hz159841 366 8652 hz159841 367 17667 davelam if (changed) { 368 17667 davelam - procman_debug("CPU usage is %3u%%, changed refresh_interval to %u (config %u)", 369 17667 davelam + /*procman_debug("CPU usage is %3u%%, changed refresh_interval to %u (config %u)", 370 17667 davelam this->last_pcpu, 371 17667 davelam this->interval, 372 17667 davelam - config_interval); 373 17667 davelam + config_interval);*/ 374 17667 davelam } 375 8652 hz159841 376 17667 davelam g_assert(this->interval == new_interval); 377 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/sysinfo.cpp gnome-system-monitor-2.25.91.mod/src/sysinfo.cpp 378 17667 davelam --- gnome-system-monitor-2.25.91/src/sysinfo.cpp 2009-01-21 05:13:28.000000000 +0800 379 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/sysinfo.cpp 2009-03-04 10:18:54.373979000 +0800 380 17667 davelam @@ -273,7 +273,7 @@ namespace { 381 17667 davelam channel->close(); 382 17667 davelam Glib::spawn_close_pid(pid); 383 8652 hz159841 384 17667 davelam - procman_debug("lsb_release output = '%s'", content.c_str()); 385 17667 davelam + //procman_debug("lsb_release output = '%s'", content.c_str()); 386 8652 hz159841 387 17667 davelam string release, codename; 388 17667 davelam std::istringstream input(content); 389 17667 davelam diff -Nrup gnome-system-monitor-2.25.91/src/util.cpp gnome-system-monitor-2.25.91.mod/src/util.cpp 390 17667 davelam --- gnome-system-monitor-2.25.91/src/util.cpp 2009-02-17 02:21:44.000000000 +0800 391 17667 davelam +++ gnome-system-monitor-2.25.91.mod/src/util.cpp 2009-03-04 10:21:38.634398000 +0800 392 17667 davelam @@ -192,7 +192,7 @@ load_symbols(const char *module, ...) 393 17667 davelam if (!mod) 394 17667 davelam return FALSE; 395 8652 hz159841 396 17667 davelam - procman_debug("Found %s", module); 397 17667 davelam + //procman_debug("Found %s", module); 398 8652 hz159841 399 17667 davelam va_start(args, module); 400 8652 hz159841 401 17667 davelam @@ -208,10 +208,10 @@ load_symbols(const char *module, ...) 402 17667 davelam symbol = va_arg(args, void**); 403 8652 hz159841 404 17667 davelam if (g_module_symbol(mod, name, symbol)) { 405 17667 davelam - procman_debug("Loaded %s from %s", name, module); 406 17667 davelam + //procman_debug("Loaded %s from %s", name, module); 407 17667 davelam } 408 17667 davelam else { 409 17667 davelam - procman_debug("Could not load %s from %s", name, module); 410 17667 davelam + //procman_debug("Could not load %s from %s", name, module); 411 17667 davelam found_all = FALSE; 412 17667 davelam break; 413 17667 davelam } 414 18076 niall diff -Nrup gnome-system-monitor-2.26.0/src/util.h gnome-system-monitor-2.26.0-new/src/util.h 415 18076 niall --- gnome-system-monitor-2.26.0/src/util.h 2009-02-27 21:50:16.000000000 +0000 416 18076 niall +++ gnome-system-monitor-2.26.0-new/src/util.h 2009-04-09 13:50:15.164866011 +0100 417 18076 niall @@ -46,7 +46,7 @@ procman_debug_real(const char *file, int 418 18076 niall inline string make_string(char *c_str) 419 18076 niall { 420 18076 niall if (!c_str) { 421 18076 niall - procman_debug("NULL string"); 422 18076 niall + //procman_debug("NULL string"); 423 18076 niall return string(); 424 18076 niall } 425
Indexes created Thu Nov 26 13:30:14 UTC 2009
Terms of Use |
Privacy |
Trademarks |
Copyright Policy |
Site Guidelines |
Help
Your use of this web site or any of its content or software indicates your agreement to be bound by these Terms of Use.
Copyright © 1995-2008 Sun Microsystems, Inc.