GNOME.org
 

[gnome-system-monitor] Add a Process Properties dialog in GNOME System Monitor

commit 72546b7f3346fc0647a433529f3292050f15278f
Author: Krishnan Parthasarathi <krishnan parthasarathi gmail com>
Date:   Fri Jan 6 03:19:28 2012 +0200

    Add a Process Properties dialog in GNOME System Monitor
    
    https://bugzilla.gnome.org/show_bug.cgi?id=543347

 po/POTFILES.in         |    1 +
 src/Makefile.am        |    1 +
 src/callbacks.cpp      |    8 ++
 src/callbacks.h        |    1 +
 src/interface.cpp      |   11 ++-
 src/procproperties.cpp |  310 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/procproperties.h   |   31 +++++
 src/util.cpp           |    2 +-
 src/util.h             |    2 +
 9 files changed, 365 insertions(+), 2 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 368a4d4..912d9c9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,5 +19,6 @@ src/procactions.cpp
 src/procdialogs.cpp
 src/procman.cpp
 src/proctable.cpp
+src/procproperties.cpp
 src/sysinfo.cpp
 src/util.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index ccf76b7..50c9f02 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,6 +22,7 @@ gnome_system_monitor_cpp_files = \
 	procdialogs.cpp \
 	memmaps.cpp \
 	openfiles.cpp \
+	procproperties.cpp \
 	smooth_refresh.cpp \
 	disks.cpp \
 	selinux.cpp \
diff --git a/src/callbacks.cpp b/src/callbacks.cpp
index bdad606..57cf1f2 100644
--- a/src/callbacks.cpp
+++ b/src/callbacks.cpp
@@ -34,6 +34,7 @@
 #include "procdialogs.h"
 #include "memmaps.h"
 #include "openfiles.h"
+#include "procproperties.h"
 #include "load-graph.h"
 #include "disks.h"
 #include "lsof.h"
@@ -137,6 +138,13 @@ cb_show_open_files (GtkAction *action, gpointer data)
 }
 
 void
+cb_show_process_properties (GtkAction *action, gpointer data)
+{
+	ProcData *procdata = static_cast<ProcData*>(data);
+	create_procproperties_dialog (procdata);
+}
+
+void
 cb_show_lsof(GtkAction *action, gpointer data)
 {
     ProcData *procdata = static_cast<ProcData*>(data);
diff --git a/src/callbacks.h b/src/callbacks.h
index 1ae8138..573d66a 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -28,6 +28,7 @@
 
 void            cb_show_memory_maps (GtkAction *action, gpointer data);
 void            cb_show_open_files (GtkAction *action, gpointer data);
+void            cb_show_process_properties (GtkAction *action, gpointer data);
 void            cb_show_lsof(GtkAction *action, gpointer data);
 void            cb_renice (GtkAction *action, GtkRadioAction *current, gpointer data);
 void            cb_end_process (GtkAction *action, gpointer data);
diff --git a/src/interface.cpp b/src/interface.cpp
index 9410369..dd27f62 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -81,6 +81,9 @@ static const GtkActionEntry menu_entries[] =
     // Translators: this means 'Files that are open' (open is no verb here)
     { "OpenFiles", NULL, N_("Open _Files"), "<control>F",
       N_("View the files opened by a process"), G_CALLBACK (cb_show_open_files) },
+	{ "ProcessProperties", NULL, N_("_Properties"), NULL,
+	  N_("View additional information about a process"), G_CALLBACK (cb_show_process_properties) },
+
 
     { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
       N_("Open the manual"), G_CALLBACK (cb_help_contents) },
@@ -158,6 +161,8 @@ static const char ui_info[] =
     "      <menuitem name=\"ViewMemoryMapsMenu\" action=\"MemoryMaps\" />"
     "      <menuitem name=\"ViewOpenFilesMenu\" action=\"OpenFiles\" />"
     "      <separator />"
+    "      <menuitem name=\"ViewProcessPropertiesMenu\" action=\"ProcessProperties\" />"
+    "      <separator />"
     "      <menuitem name=\"ViewRefresh\" action=\"Refresh\" />"
     "    </menu>"
     "    <menu name=\"HelpMenu\" action=\"Help\">"
@@ -184,6 +189,9 @@ static const char ui_info[] =
     "    <separator />"
     "    <menuitem action=\"MemoryMaps\" />"
     "    <menuitem action=\"OpenFiles\" />"
+    "    <separator />"
+    "    <menuitem action=\"ProcessProperties\" />"
+
     "  </popup>";
 
 
@@ -774,7 +782,8 @@ update_sensitivity(ProcData *data)
                                               "KillProcess",
                                               "ChangePriority",
                                               "MemoryMaps",
-                                              "OpenFiles" };
+                                              "OpenFiles",
+                                              "ProcessProperties" };
 
     const char * const processes_actions[] = { "ShowActiveProcesses",
                                                "ShowAllProcesses",
diff --git a/src/procproperties.cpp b/src/procproperties.cpp
new file mode 100644
index 0000000..c98b8a1
--- /dev/null
+++ b/src/procproperties.cpp
@@ -0,0 +1,310 @@
+/* Process properties dialog
+ * Copyright (C) 2010 Krishnan Parthasarathi <krishnan parthasarathi gmail com>
+ *                    Robert Ancell <robert ancell canonical com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include <config.h>
+
+#include <glib/gi18n.h>
+#include <glibtop/procmem.h>
+#include <glibtop/procmap.h>
+#include <glibtop/procstate.h>
+#include <asm/param.h>
+
+#include "procman.h"
+#include "procproperties.h"
+#include "proctable.h"
+#include "util.h"
+
+
+enum
+{
+	COL_PROP = 0,
+	COL_VAL,
+	NUM_COLS,
+};
+
+typedef struct _proc_arg {
+	const gchar *prop;
+	gchar *val;
+} proc_arg;
+
+
+
+static void
+get_process_memory_writable (ProcInfo *info)
+{
+	glibtop_proc_map buf;
+	glibtop_map_entry *maps;
+
+	maps = glibtop_get_proc_map(&buf, info->pid);
+
+	gulong memwritable = 0;
+	const unsigned number = buf.number;
+
+	for (unsigned i = 0; i < number; ++i) {
+#ifdef __linux__
+		memwritable += maps[i].private_dirty;
+#else
+		if (maps[i].perm & GLIBTOP_MAP_PERM_WRITE)
+			memwritable += maps[i].size;
+#endif
+	}
+
+	info->memwritable = memwritable;
+
+	g_free(maps);
+}
+
+
+static void
+get_process_memory_info (ProcInfo *info)
+{
+	glibtop_proc_mem procmem;
+	WnckResourceUsage xresources;
+
+	wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
+	                              info->pid,
+	                              &xresources);
+
+	glibtop_get_proc_mem(&procmem, info->pid);
+
+	info->vmsize	= procmem.vsize;
+	info->memres	= procmem.resident;
+	info->memshared	= procmem.share;
+
+	info->memxserver = xresources.total_bytes_estimate;
+
+	get_process_memory_writable(info);
+
+	// fake the smart memory column if writable is not available
+	info->mem = info->memxserver + (info->memwritable ? info->memwritable : info->memres);
+}
+
+static gchar*
+format_memsize(guint64 size)
+{
+    if (size == 0)
+        return g_strdup(_("N/A"));
+    else
+        return procman::format_size(size);
+}
+
+static void
+fill_proc_properties (GtkWidget *tree, ProcInfo *info)
+{
+	guint i;
+	GtkListStore *store;
+
+	get_process_memory_info(info);
+
+	proc_arg proc_props[] = {
+		{ N_("Process Name"), g_strdup_printf("%s", info->name)},
+		{ N_("User"), g_strdup_printf("%s (%d)", info->user.c_str(), info->uid)},
+		{ N_("Status"), g_strdup(format_process_state(info->status))},
+		{ N_("Memory"), format_memsize(info->mem)},
+		{ N_("Virtual Memory"), format_memsize(info->vmsize)},
+		{ N_("Resident Memory"), format_memsize(info->memres)},
+		{ N_("Writable Memory"), format_memsize(info->memwritable)},
+		{ N_("Shared Memory"), format_memsize(info->memshared)},
+		{ N_("X Server Memory"), format_memsize(info->memxserver)},
+		{ N_("CPU"), g_strdup_printf("%d%%", info->pcpu)},
+		{ N_("CPU Time"), g_strdup_printf(ngettext("%lld second", "%lld seconds", info->cpu_time/HZ), (unsigned long long)info->cpu_time/HZ) },
+		{ N_("Started"), g_strdup_printf("%s", ctime((const time_t*)(&info->start_time)))},
+		{ N_("Nice"), g_strdup_printf("%d", info->nice)},
+		{ N_("Priority"), g_strdup_printf("%s", procman::get_nice_level(info->nice)) },
+		{ N_("ID"), g_strdup_printf("%d", info->pid)},
+		{ N_("Security Context"), g_strdup_printf("%s", info->security_context)},
+		{ N_("Command Line"), g_strdup_printf("%s", info->arguments)},
+		{ N_("Waiting Channel"), g_strdup_printf("%s", info->wchan)},
+		{ NULL, NULL}
+	};
+
+	store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(tree)));
+	for (i = 0; proc_props[i].prop; i++) {
+		GtkTreeIter iter;
+
+		if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(store), &iter, NULL, i)) {
+			gtk_list_store_append(store, &iter);
+			gtk_list_store_set(store, &iter, COL_PROP, gettext(proc_props[i].prop), -1);
+		}
+
+		gtk_list_store_set(store, &iter, COL_VAL, g_strstrip(proc_props[i].val), -1);
+		g_free(proc_props[i].val);
+	}
+}
+
+
+static void
+update_procproperties_dialog (GtkWidget *tree)
+{
+	ProcInfo *info;
+
+	info = static_cast<ProcInfo*>(g_object_get_data (G_OBJECT (tree), "selected_info"));
+
+	if (!info)
+		return;
+
+	fill_proc_properties(tree, info);
+}
+
+
+static void
+close_procprop_dialog (GtkDialog *dialog, gint id, gpointer data)
+{
+	GtkWidget *tree = static_cast<GtkWidget*>(data);
+	guint timer;
+
+	timer = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (tree), "timer"));
+	g_source_remove (timer);
+
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+
+static GtkWidget *
+create_procproperties_tree (ProcData *procdata)
+{
+	GtkWidget *tree;
+	GtkListStore *model;
+	GtkTreeViewColumn *column;
+	GtkCellRenderer *cell;
+	gint i;
+
+
+	model = gtk_list_store_new (NUM_COLS,
+				    G_TYPE_STRING,	/* Property */
+				    G_TYPE_STRING	/* Value */
+		);
+
+	tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree), TRUE);
+	g_object_unref (G_OBJECT (model));
+
+	for (i = 0; i < NUM_COLS; i++) {
+		cell = gtk_cell_renderer_text_new ();
+
+		column = gtk_tree_view_column_new_with_attributes (NULL,
+		                                                   cell,
+		                                                   "text", i,
+		                                                   NULL);
+		gtk_tree_view_column_set_resizable (column, TRUE);
+		gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
+	}
+
+	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(tree), FALSE);
+	fill_proc_properties(tree, procdata->selected_process);
+
+	return tree;
+}
+
+
+static gboolean
+procprop_timer (gpointer data)
+{
+	GtkWidget *tree = static_cast<GtkWidget*>(data);
+	GtkTreeModel *model;
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree));
+	g_assert(model);
+
+	update_procproperties_dialog (tree);
+
+	return TRUE;
+}
+
+
+static void
+create_single_procproperties_dialog (GtkTreeModel *model, GtkTreePath *path,
+                                     GtkTreeIter *iter, gpointer data)
+{
+	ProcData *procdata = static_cast<ProcData*>(data);
+	GtkWidget *procpropdialog;
+	GtkWidget *dialog_vbox, *vbox;
+	GtkWidget *cmd_hbox;
+	GtkWidget *label;
+	GtkWidget *scrolled;
+	GtkWidget *tree;
+	ProcInfo *info;
+	guint timer;
+
+	gtk_tree_model_get (model, iter, COL_POINTER, &info, -1);
+
+	if (!info)
+		return;
+
+	procpropdialog = gtk_dialog_new_with_buttons (_("Process Properties"), NULL,
+	                                              GTK_DIALOG_DESTROY_WITH_PARENT,
+	                                              GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+	                                              NULL);
+	gtk_window_set_resizable (GTK_WINDOW (procpropdialog), TRUE);
+	gtk_window_set_default_size (GTK_WINDOW (procpropdialog), 575, 400);
+	gtk_container_set_border_width (GTK_CONTAINER (procpropdialog), 5);
+
+	vbox = gtk_dialog_get_content_area (GTK_DIALOG (procpropdialog));
+	gtk_box_set_spacing (GTK_BOX (vbox), 2);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+
+	dialog_vbox = gtk_vbox_new (FALSE, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (dialog_vbox), 5);
+	gtk_box_pack_start (GTK_BOX (vbox), dialog_vbox, TRUE, TRUE, 0);
+
+	cmd_hbox = gtk_hbox_new (FALSE, 12);
+	gtk_box_pack_start (GTK_BOX (dialog_vbox), cmd_hbox, FALSE, FALSE, 0);
+
+
+	label = procman_make_label_for_mmaps_or_ofiles (
+		_("Properties of process \"%s\" (PID %u):"),
+		info->name,
+		info->pid);
+
+	gtk_box_pack_start (GTK_BOX (cmd_hbox),label, FALSE, FALSE, 0);
+
+
+	scrolled = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
+					GTK_POLICY_AUTOMATIC,
+					GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
+                                             GTK_SHADOW_IN);
+
+	tree = create_procproperties_tree (procdata);
+	gtk_container_add (GTK_CONTAINER (scrolled), tree);
+	g_object_set_data (G_OBJECT (tree), "selected_info", info);
+
+	gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolled, TRUE, TRUE, 0);
+	gtk_widget_show_all (scrolled);
+
+	g_signal_connect (G_OBJECT (procpropdialog), "response",
+			  G_CALLBACK (close_procprop_dialog), tree);
+
+	gtk_widget_show_all (procpropdialog);
+
+	timer = g_timeout_add_seconds (5, procprop_timer, tree);
+	g_object_set_data (G_OBJECT (tree), "timer", GUINT_TO_POINTER (timer));
+
+	update_procproperties_dialog (tree);
+}
+
+
+void
+create_procproperties_dialog (ProcData *procdata)
+{
+	gtk_tree_selection_selected_foreach (procdata->selection, create_single_procproperties_dialog,
+					     procdata);
+}
diff --git a/src/procproperties.h b/src/procproperties.h
new file mode 100644
index 0000000..944524c
--- /dev/null
+++ b/src/procproperties.h
@@ -0,0 +1,31 @@
+/* Process properties dialog
+ * Copyright (C) 2010 Krishnan Parthasarathi <krishnan parthasarathi gmail com>
+ *                    Robert Ancell <robert ancell canonical com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef _PROCPROPERTIES_H_
+#define _PROCPROPERTIES_H_
+
+#include <glib/gtypes.h>
+
+#include "procman.h"
+
+void 		create_procproperties_dialog (ProcData *procdata);
+
+#endif
+
diff --git a/src/util.cpp b/src/util.cpp
index ad828de..4aef576 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -19,7 +19,7 @@ extern "C" {
 }
 
 
-static const char*
+const char*
 format_process_state(guint state)
 {
     const char *status;
diff --git a/src/util.h b/src/util.h
index 04c4440..8db79c1 100644
--- a/src/util.h
+++ b/src/util.h
@@ -34,6 +34,8 @@ procman_make_label_for_mmaps_or_ofiles(const char *format,
 gboolean
 load_symbols(const char *module, ...) G_GNUC_NULL_TERMINATED;
 
+const char*
+format_process_state(guint state);
 
 void
 procman_debug_real(const char *file, int line, const char *func,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]