[gnome-system-monitor] Fix up coding style for patch using older style
- From: Chris KÃhl <chriskuehl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor] Fix up coding style for patch using older style
- Date: Sat, 14 Jan 2012 01:54:09 +0000 (UTC)
commit ba95b970aa179ceeda622d762311d8da14b96e3d
Author: Chris KÃhl <chrisk openismus com>
Date: Sat Jan 14 02:41:17 2012 +0100
Fix up coding style for patch using older style
src/callbacks.cpp | 4 +-
src/interface.cpp | 4 +-
src/procproperties.cpp | 375 +++++++++++++++++++++++-------------------------
src/procproperties.h | 2 +-
4 files changed, 186 insertions(+), 199 deletions(-)
---
diff --git a/src/callbacks.cpp b/src/callbacks.cpp
index 57cf1f2..4f228be 100644
--- a/src/callbacks.cpp
+++ b/src/callbacks.cpp
@@ -140,8 +140,8 @@ 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);
+ ProcData *procdata = static_cast<ProcData*>(data);
+ create_procproperties_dialog (procdata);
}
void
diff --git a/src/interface.cpp b/src/interface.cpp
index dd27f62..8a84429 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -81,8 +81,8 @@ 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) },
+ { "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",
diff --git a/src/procproperties.cpp b/src/procproperties.cpp
index c98b8a1..0020782 100644
--- a/src/procproperties.cpp
+++ b/src/procproperties.cpp
@@ -31,69 +31,65 @@
#include "proctable.h"
#include "util.h"
-
enum
{
- COL_PROP = 0,
- COL_VAL,
- NUM_COLS,
+ COL_PROP = 0,
+ COL_VAL,
+ NUM_COLS,
};
typedef struct _proc_arg {
- const gchar *prop;
- gchar *val;
+ const gchar *prop;
+ gchar *val;
} proc_arg;
-
-
static void
get_process_memory_writable (ProcInfo *info)
{
- glibtop_proc_map buf;
- glibtop_map_entry *maps;
+ glibtop_proc_map buf;
+ glibtop_map_entry *maps;
- maps = glibtop_get_proc_map(&buf, info->pid);
+ maps = glibtop_get_proc_map(&buf, info->pid);
- gulong memwritable = 0;
- const unsigned number = buf.number;
+ gulong memwritable = 0;
+ const unsigned number = buf.number;
- for (unsigned i = 0; i < number; ++i) {
+ for (unsigned i = 0; i < number; ++i) {
#ifdef __linux__
- memwritable += maps[i].private_dirty;
+ memwritable += maps[i].private_dirty;
#else
- if (maps[i].perm & GLIBTOP_MAP_PERM_WRITE)
- memwritable += maps[i].size;
+ if (maps[i].perm & GLIBTOP_MAP_PERM_WRITE)
+ memwritable += maps[i].size;
#endif
- }
+ }
- info->memwritable = memwritable;
+ info->memwritable = memwritable;
- g_free(maps);
+ g_free(maps);
}
-
static void
get_process_memory_info (ProcInfo *info)
{
- glibtop_proc_mem procmem;
- WnckResourceUsage xresources;
+ glibtop_proc_mem procmem;
+ WnckResourceUsage xresources;
- wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
- info->pid,
- &xresources);
+ wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
+ info->pid,
+ &xresources);
- glibtop_get_proc_mem(&procmem, info->pid);
+ glibtop_get_proc_mem(&procmem, info->pid);
- info->vmsize = procmem.vsize;
- info->memres = procmem.resident;
- info->memshared = procmem.share;
+ info->vmsize = procmem.vsize;
+ info->memres = procmem.resident;
+ info->memshared = procmem.share;
- info->memxserver = xresources.total_bytes_estimate;
+ info->memxserver = xresources.total_bytes_estimate;
- get_process_memory_writable(info);
+ 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);
+ // fake the smart memory column if writable is not available
+ info->mem = info->memxserver + (info->memwritable ? info->memwritable : info->memres);
}
static gchar*
@@ -108,203 +104,194 @@ format_memsize(guint64 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);
- }
+ 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;
+ ProcInfo *info;
- info = static_cast<ProcInfo*>(g_object_get_data (G_OBJECT (tree), "selected_info"));
+ info = static_cast<ProcInfo*>(g_object_get_data (G_OBJECT (tree), "selected_info"));
- if (!info)
- return;
+ if (!info)
+ return;
- fill_proc_properties(tree, info);
+ fill_proc_properties(tree, info);
}
-
static void
close_procprop_dialog (GtkDialog *dialog, gint id, gpointer data)
{
- GtkWidget *tree = static_cast<GtkWidget*>(data);
- guint timer;
+ GtkWidget *tree = static_cast<GtkWidget*>(data);
+ guint timer;
- timer = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (tree), "timer"));
- g_source_remove (timer);
+ timer = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (tree), "timer"));
+ g_source_remove (timer);
- gtk_widget_destroy (GTK_WIDGET (dialog));
+ 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;
+ 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;
+ GtkWidget *tree = static_cast<GtkWidget*>(data);
+ GtkTreeModel *model;
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree));
- g_assert(model);
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree));
+ g_assert(model);
- update_procproperties_dialog (tree);
+ update_procproperties_dialog (tree);
- return TRUE;
+ 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);
+ 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);
+ gtk_tree_selection_selected_foreach (procdata->selection, create_single_procproperties_dialog,
+ procdata);
}
diff --git a/src/procproperties.h b/src/procproperties.h
index df34606..ca1103c 100644
--- a/src/procproperties.h
+++ b/src/procproperties.h
@@ -25,7 +25,7 @@
#include "procman.h"
-void create_procproperties_dialog (ProcData *procdata);
+void create_procproperties_dialog (ProcData *procdata);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
