From d2ec05e662e52a187e0f155e12e714af48979d9b Mon Sep 17 00:00:00 2001 From: rim Date: Thu, 17 May 2018 02:35:45 +0300 Subject: [PATCH] Refactoring of task-manager.c --- src/app-manager.c | 13 ++++--------- src/process-tree-view.c | 14 +++++--------- src/task-manager-bsd.c | 2 ++ src/task-manager-freebsd.c | 2 ++ src/task-manager-linux.c | 2 ++ src/task-manager-skel.c | 2 ++ src/task-manager-solaris.c | 2 ++ src/task-manager.c | 323 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/task-manager.h | 9 +++++++++ 9 files changed, 144 insertions(+), 225 deletions(-) diff --git a/src/app-manager.c b/src/app-manager.c index a3609f4..23fe470 100644 --- a/src/app-manager.c +++ b/src/app-manager.c @@ -17,6 +17,7 @@ #include #include "app-manager.h" +#include "task-manager.h" @@ -78,9 +79,7 @@ xtm_app_manager_init (XtmAppManager *manager) apps_add_application (manager->apps, application); } -#if DEBUG - g_debug ("Initial applications: %d", manager->apps->len); -#endif + G_DEBUG_FMT ("Initial applications: %d", manager->apps->len); /* Connect signals */ g_signal_connect (screen, "application-opened", G_CALLBACK (application_opened), manager); @@ -158,18 +157,14 @@ apps_lookup_pid (GArray *apps, gint pid) static void application_opened (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager) { -#if DEBUG - g_debug ("Application opened %p %d", application, wnck_application_get_pid (application)); -#endif + G_DEBUG_FMT ("Application opened %p %d", application, wnck_application_get_pid (application)); apps_add_application (manager->apps, application); } static void application_closed (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager) { -#if DEBUG - g_debug ("Application closed %p", application); -#endif + G_DEBUG_FMT ("Application closed %p", application); apps_remove_application (manager->apps, application); } diff --git a/src/process-tree-view.c b/src/process-tree-view.c index 748610a..672969d 100644 --- a/src/process-tree-view.c +++ b/src/process-tree-view.c @@ -397,6 +397,8 @@ cb_send_signal (GtkMenuItem *mi, gpointer user_data) GtkTreeSelection *selection; GtkWidget *treeview; treeview = g_object_get_data (G_OBJECT (mi), "treeview"); + if (NULL == treeview) + return; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); gtk_tree_selection_unselect_all (selection); } @@ -543,9 +545,7 @@ treeview_clicked (XtmProcessTreeView *treeview, GdkEventButton *event) gtk_tree_selection_select_path (selection, path); gtk_tree_path_free (path); -#if DEBUG - g_debug ("Found iter with pid %d", pid); -#endif + G_DEBUG_FMT ("Found iter with pid %d", pid); } popup_menu (treeview, pid, event->time, TRUE); @@ -601,9 +601,7 @@ column_clicked (GtkTreeViewColumn *column, XtmProcessTreeView *treeview) GtkSortType sort_type; gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (treeview->model), &sort_column_id, &sort_type); -#if DEBUG - g_debug ("Last sort column %d; sort type: %d", sort_column_id, sort_type); -#endif + G_DEBUG_FMT ("Last sort column %d; sort type: %d", sort_column_id, sort_type); if (treeview->sort_column != column) { @@ -617,9 +615,7 @@ column_clicked (GtkTreeViewColumn *column, XtmProcessTreeView *treeview) sort_type = (sort_type == GTK_SORT_ASCENDING) ? GTK_SORT_DESCENDING : GTK_SORT_ASCENDING; } -#if DEBUG - g_debug ("New sort column %d; sort type: %d", sort_column_id, sort_type); -#endif + G_DEBUG_FMT ("New sort column %d; sort type: %d", sort_column_id, sort_type); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (treeview->model), sort_column_id, sort_type); gtk_tree_view_column_set_sort_order (column, sort_type); diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c index 67fabbd..4e34973 100644 --- a/src/task-manager-bsd.c +++ b/src/task-manager-bsd.c @@ -151,6 +151,8 @@ gboolean get_task_list (GArray *task_list) } free(kp); + g_array_sort (task_list, task_pid_compare_fn); + return TRUE; } diff --git a/src/task-manager-freebsd.c b/src/task-manager-freebsd.c index 84b8e5f..2dbe366 100644 --- a/src/task-manager-freebsd.c +++ b/src/task-manager-freebsd.c @@ -256,6 +256,8 @@ get_task_list (GArray *task_list) kvm_close (kd); + g_array_sort (task_list, task_pid_compare_fn); + return TRUE; } diff --git a/src/task-manager-linux.c b/src/task-manager-linux.c index 2e26a70..bb5a2f9 100644 --- a/src/task-manager-linux.c +++ b/src/task-manager-linux.c @@ -333,6 +333,8 @@ get_task_list (GArray *task_list) g_dir_close (dir); + g_array_sort (task_list, task_pid_compare_fn); + return TRUE; } diff --git a/src/task-manager-skel.c b/src/task-manager-skel.c index 5673523..665f65a 100644 --- a/src/task-manager-skel.c +++ b/src/task-manager-skel.c @@ -75,6 +75,8 @@ get_task_list (GArray *task_list) } } + g_array_sort (task_list, task_pid_compare_fn); + return TRUE; } diff --git a/src/task-manager-solaris.c b/src/task-manager-solaris.c index 0fe53e3..cfdd99c 100644 --- a/src/task-manager-solaris.c +++ b/src/task-manager-solaris.c @@ -227,6 +227,8 @@ get_task_list (GArray *task_list) g_dir_close (dir); + g_array_sort (task_list, task_pid_compare_fn); + return FALSE; } diff --git a/src/task-manager.c b/src/task-manager.c index b63dfc9..a0adebc 100644 --- a/src/task-manager.c +++ b/src/task-manager.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2010 Mike Massonnet, + * Copyright (c) 2018 Rozhuk Ivan * * 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 @@ -11,6 +12,7 @@ #include #endif +#include #include #include #include @@ -73,16 +75,14 @@ static void xtm_task_manager_finalize (GObject *object); static void setting_changed (GObject *object, GParamSpec *pspec, XtmTaskManager *manager); #ifdef HAVE_WNCK static void model_add_task (GtkTreeModel *model, Task *task, App *app, glong timestamp); -static void model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, Task *task, App *app); -static void model_update_task (GtkTreeModel *model, Task *task, App *app); +static void model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task, App *app); #else static void model_add_task (GtkTreeModel *model, Task *task, glong timestamp); -static void model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, Task *task); -static void model_update_task (GtkTreeModel *model, Task *task); +static void model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task); #endif -static void model_mark_tree_iter_as_removed (GtkTreeModel *model, GtkTreeIter *iter); +static void model_mark_tree_iter_as_removed (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp); static void model_remove_tree_iter (GtkTreeModel *model, GtkTreeIter *iter); -static void model_find_tree_iter_for_pid (GtkTreeModel *model, guint pid, GtkTreeIter *iter); +static gboolean task_list_find_for_pid (GArray *task_list, guint pid, Task **task, guint *idx); static glong __current_timestamp (void); @@ -169,46 +169,31 @@ model_add_task (GtkTreeModel *model, Task *task, glong timestamp) #endif { GtkTreeIter iter; - gchar *cmdline; - -#ifdef HAVE_WNCK - if (app != NULL && full_cmdline == FALSE) - cmdline = g_strdup (app->name); - else - cmdline = pretty_cmdline (task->cmdline, task->name); -#else - cmdline = pretty_cmdline (task->cmdline, task->name); -#endif gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, - XTM_PTV_COLUMN_COMMAND, cmdline, XTM_PTV_COLUMN_PID, task->pid, XTM_PTV_COLUMN_STATE, task->state, XTM_PTV_COLUMN_UID, task->uid, XTM_PTV_COLUMN_UID_STR, task->uid_name, - XTM_PTV_COLUMN_BACKGROUND, NULL, - XTM_PTV_COLUMN_FOREGROUND, NULL, XTM_PTV_COLUMN_TIMESTAMP, timestamp, -1); #ifdef HAVE_WNCK - model_update_tree_iter (model, &iter, task, app); + model_update_tree_iter (model, &iter, timestamp, TRUE, task, app); #else - model_update_tree_iter (model, &iter, task); + model_update_tree_iter (model, &iter, timestamp, TRUE, task); #endif - - g_free (cmdline); } static void -model_mark_tree_iter_as_removed (GtkTreeModel *model, GtkTreeIter *iter) +model_mark_tree_iter_as_removed (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp) { gtk_list_store_set (GTK_LIST_STORE (model), iter, XTM_PTV_COLUMN_CPU, 0.0, XTM_PTV_COLUMN_CPU_STR, "-", XTM_PTV_COLUMN_BACKGROUND, "#e57373", XTM_PTV_COLUMN_FOREGROUND, "#000000", - XTM_PTV_COLUMN_TIMESTAMP, __current_timestamp (), + XTM_PTV_COLUMN_TIMESTAMP, timestamp, -1); } @@ -220,9 +205,9 @@ model_remove_tree_iter (GtkTreeModel *model, GtkTreeIter *iter) static void #ifdef HAVE_WNCK -model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, Task *task, App *app) +model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task, App *app) #else -model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, Task *task) +model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, glong timestamp, gboolean update_cmd_line, Task *task) #endif { gchar *vsz, *rss, cpu[16]; @@ -237,8 +222,8 @@ model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, Task *task) vsz = g_format_size_full (task->vsz, G_FORMAT_SIZE_IEC_UNITS); rss = g_format_size_full (task->rss, G_FORMAT_SIZE_IEC_UNITS); - g_snprintf (value, 14, (more_precision) ? "%.2f" : "%.0f", task->cpu_user + task->cpu_system); - g_snprintf (cpu, 16, _("%s%%"), value); + g_snprintf (value, sizeof(value), (more_precision) ? "%.2f" : "%.0f", (task->cpu_user + task->cpu_system)); + g_snprintf (cpu, sizeof(cpu), _("%s%%"), value); /* Retrieve values for tweaking background/foreground color and updating content as needed */ gtk_tree_model_get (model, iter, XTM_PTV_COLUMN_TIMESTAMP, &old_timestamp, XTM_PTV_COLUMN_STATE, &old_state, @@ -258,9 +243,9 @@ model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, Task *task) gtk_list_store_set (GTK_LIST_STORE (model), iter, XTM_PTV_COLUMN_COMMAND, cmdline, -1); g_free (cmdline); } - else if (model_update_forced) + else if (update_cmd_line) #else - if (model_update_forced) + if (update_cmd_line) #endif { gchar *cmdline = pretty_cmdline (task->cmdline, task->name); @@ -273,10 +258,10 @@ model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, Task *task) /* Set yellow color for changing state */ background = g_strdup ("#fff176"); foreground = g_strdup ("#000000"); - old_timestamp = __current_timestamp () - TIMESTAMP_DELTA + 3; + old_timestamp = timestamp - TIMESTAMP_DELTA + 3; } - if (__current_timestamp () - old_timestamp <= TIMESTAMP_DELTA) + if ((timestamp - old_timestamp) <= TIMESTAMP_DELTA) { /* Set green color for started task */ background = (background == NULL) ? g_strdup ("#aed581") : background; @@ -311,36 +296,29 @@ model_update_tree_iter (GtkTreeModel *model, GtkTreeIter *iter, Task *task) g_free (rss); } -static void -#ifdef HAVE_WNCK -model_update_task (GtkTreeModel *model, Task *task, App *app) -#else -model_update_task (GtkTreeModel *model, Task *task) -#endif +static gboolean +task_list_find_for_pid (GArray *task_list, guint pid, Task **task, guint *idx) { - GtkTreeIter iter; - model_find_tree_iter_for_pid (model, task->pid, &iter); -#ifdef HAVE_WNCK - model_update_tree_iter (model, &iter, task, app); -#else - model_update_tree_iter (model, &iter, task); -#endif -} + Task *task_tmp, tkey; + tkey.pid = pid; + task_tmp = bsearch(&tkey, task_list->data, task_list->len, sizeof(Task), task_pid_compare_fn); -static void -model_find_tree_iter_for_pid (GtkTreeModel *model, guint pid, GtkTreeIter *iter) -{ - gboolean valid; - guint pid_iter; - - valid = gtk_tree_model_get_iter_first (model, iter); - while (valid) + if (NULL != task) { - gtk_tree_model_get (model, iter, XTM_PTV_COLUMN_PID, &pid_iter, -1); - if (pid == pid_iter) - break; - valid = gtk_tree_model_iter_next (model, iter); + (*task) = task_tmp; } + if (NULL != idx) + { + if (NULL != task_tmp) + { + (*idx) = (((size_t)task_tmp - (size_t)task_list->data) / sizeof(Task)); + } + else + { + (*idx) = (~((guint)0)); + } + } + return ((NULL != task_tmp)); } static glong @@ -419,197 +397,123 @@ xtm_task_manager_get_task_list (XtmTaskManager *manager) void xtm_task_manager_update_model (XtmTaskManager *manager) { - static GArray *removed_tasks = NULL; GArray *array; guint i; + GtkTreeIter iter; + gboolean valid; + glong timestamp; g_return_if_fail (XTM_IS_TASK_MANAGER (manager)); - if (removed_tasks == NULL) - removed_tasks = g_array_new (FALSE, FALSE, sizeof (GtkTreeIter)); - - /* Retrieve initial task list and return */ - if (manager->tasks->len == 0) - { - get_task_list (manager->tasks); - for (i = 0; i < manager->tasks->len; i++) - { - Task *task = &g_array_index (manager->tasks, Task, i); -#ifdef HAVE_WNCK - App *app = xtm_app_manager_get_app_from_pid (manager->app_manager, task->pid); - model_add_task (manager->model, task, app, 0); -#else - model_add_task (manager->model, task, 0); -#endif -#if DEBUG - g_print ("%5d %5s %15s %.50s\n", task->pid, task->uid_name, task->name, task->cmdline); -#endif - } - return; - } + /* First time fast refresh. */ + timestamp = ((manager->tasks->len == 0) ? 0 : __current_timestamp ()); /* Retrieve new task list */ array = g_array_new (FALSE, FALSE, sizeof (Task)); get_task_list (array); - /* Remove terminated tasks */ - for (i = 0; i < removed_tasks->len; i++) + /* Remove terminated tasks, mark to remove, update existing. */ + valid = gtk_tree_model_get_iter_first (manager->model, &iter); + while (valid) { - GtkTreeIter *iter = &g_array_index (removed_tasks, GtkTreeIter, i); + gint pid; + gchar *cpu_str; glong old_timestamp; - gtk_tree_model_get (manager->model, iter, XTM_PTV_COLUMN_TIMESTAMP, &old_timestamp, -1); - if (__current_timestamp () - old_timestamp > TIMESTAMP_DELTA) + gboolean found; + Task *task, *task_new; + GtkTreeIter cur_iter = iter; + + gtk_tree_model_get (manager->model, &iter, XTM_PTV_COLUMN_CPU_STR, &cpu_str, XTM_PTV_COLUMN_TIMESTAMP, &old_timestamp, XTM_PTV_COLUMN_PID, &pid, -1); + found = (g_strcmp0 (cpu_str, "-") == 0); + g_free (cpu_str); + valid = gtk_tree_model_iter_next (manager->model, &iter); + if (found && (timestamp - old_timestamp) > TIMESTAMP_DELTA) { -#if DEBUG - gint pid; - gtk_tree_model_get (manager->model, iter, XTM_PTV_COLUMN_PID, &pid, -1); - g_debug ("Remove old task %d", pid); -#endif - model_remove_tree_iter (manager->model, iter); - g_array_remove_index (removed_tasks, i); + G_DEBUG_FMT ("Remove old task %d", pid); + model_remove_tree_iter (manager->model, &cur_iter); + continue; } - } - for (i = 0; i < manager->tasks->len; i++) - { - guint j; - Task *tasktmp; - Task *task = &g_array_index (manager->tasks, Task, i); - gboolean found = FALSE; - - for (j = 0; j < array->len; j++) + /* Looking for new terminated tasks and check updates for existing. */ + found = task_list_find_for_pid (manager->tasks, pid, &task, &i); + if (FALSE == found) { - tasktmp = &g_array_index (array, Task, j); - if (task->pid != tasktmp->pid) - continue; - found = TRUE; - break; + G_DEBUG_FMT ("Cached task not found for pid: %d", pid); + continue; } - - if (found == FALSE) + found = task_list_find_for_pid (array, pid, &task_new, NULL); + if (FALSE == found) /* Mark as removed. */ { - GtkTreeIter iter; -#if DEBUG - g_debug ("Task %d '%s' terminated, marking as removed", task->pid, task->name); -#endif - model_find_tree_iter_for_pid (manager->model, task->pid, &iter); - model_mark_tree_iter_as_removed (manager->model, &iter); - g_array_append_val (removed_tasks, iter); + G_DEBUG_FMT ("Task %d '%s' terminated, marking as removed", pid, task->name); + model_mark_tree_iter_as_removed (manager->model, &cur_iter, timestamp); g_array_remove_index (manager->tasks, i); + continue; } - } - - /* Append started tasks and update existing ones */ - for (i = 0; i < array->len; i++) - { - guint j; - Task *tasktmp = &g_array_index (array, Task, i); - gboolean found = FALSE; - for (j = 0; j < manager->tasks->len; j++) - { - Task *task = &g_array_index (manager->tasks, Task, j); + /* Task alive, check for update. */ #ifdef HAVE_WNCK - App *app; + App *app = xtm_app_manager_get_app_from_pid (manager->app_manager, pid); #endif - gboolean updated = FALSE; - - if (task->pid != tasktmp->pid) - continue; - -#ifdef HAVE_WNCK - app = xtm_app_manager_get_app_from_pid (manager->app_manager, task->pid); -#endif - found = TRUE; - - /* Update the model (with the rest) only if needed, this keeps the CPU cool */ - if (model_update_forced - || task->ppid != tasktmp->ppid - || g_strcmp0 (task->state, tasktmp->state) - || task->cpu_user != tasktmp->cpu_user - || task->cpu_system != tasktmp->cpu_system - || task->rss != tasktmp->rss - || task->vsz != tasktmp->vsz - || task->prio != tasktmp->prio) - { - updated = TRUE; - task->ppid = tasktmp->ppid; - g_strlcpy (task->state, tasktmp->state, sizeof (task->state)); - task->cpu_user = tasktmp->cpu_user; - task->cpu_system = tasktmp->cpu_system; - task->rss = tasktmp->rss; - task->vsz = tasktmp->vsz; - task->prio = tasktmp->prio; -#ifdef HAVE_WNCK - model_update_task (manager->model, tasktmp, app); -#else - model_update_task (manager->model, tasktmp); -#endif - } + gboolean need_update = FALSE; + gboolean update_cmd_line = FALSE; + /* Update the model (with the rest) only if needed, this keeps the CPU cool */ + if (model_update_forced || 0 != memcmp(task, task_new, sizeof(Task))) + { + need_update = TRUE; /* Update command name if needed (can happen) */ - if (!model_update_forced && g_strcmp0 (task->cmdline, tasktmp->cmdline)) - { - GtkTreeIter iter; - gchar *cmdline; - - cmdline = pretty_cmdline (tasktmp->cmdline, tasktmp->name); - model_find_tree_iter_for_pid (manager->model, task->pid, &iter); - gtk_list_store_set (GTK_LIST_STORE (manager->model), &iter, XTM_PTV_COLUMN_COMMAND, cmdline, -1); - g_free (cmdline); - } + update_cmd_line = (model_update_forced || g_strcmp0 (task->cmdline, task_new->cmdline)); + memcpy(task, task_new, sizeof(Task)); + } + else /* Update color if needed */ + { + gchar *color; - /* Update color if needed */ - if (updated == FALSE) + gtk_tree_model_get (manager->model, &cur_iter, XTM_PTV_COLUMN_BACKGROUND, &color, -1); + if (color != NULL && (timestamp - old_timestamp) > TIMESTAMP_DELTA) { - GtkTreeIter iter; - gchar *color; - glong old_timestamp; - - model_find_tree_iter_for_pid (manager->model, task->pid, &iter); - gtk_tree_model_get (manager->model, &iter, XTM_PTV_COLUMN_BACKGROUND, &color, XTM_PTV_COLUMN_TIMESTAMP, &old_timestamp, -1); - - if (color != NULL && __current_timestamp () - old_timestamp > TIMESTAMP_DELTA) - { -#if DEBUG - g_debug ("Remove color from running PID %d", task->pid); -#endif + need_update = TRUE; + G_DEBUG_FMT ("Remove color from running PID %d", pid); + } + g_free (color); + } + + if (need_update) + { #ifdef HAVE_WNCK - model_update_task (manager->model, tasktmp, app); + model_update_tree_iter (manager->model, &cur_iter, timestamp, update_cmd_line, task_new, app); #else - model_update_task (manager->model, tasktmp); + model_update_tree_iter (manager->model, &cur_iter, timestamp, update_cmd_line, task_new); #endif - } - - g_free (color); - } - - break; } + } - if (found == FALSE) - { + /* Append started tasks and update existing ones */ + for (i = 0; i < array->len; i++) + { + Task *tasktmp = &g_array_index (array, Task, i); + + if (task_list_find_for_pid (manager->tasks, tasktmp->pid, NULL, NULL)) + continue; #ifdef HAVE_WNCK - App *app = xtm_app_manager_get_app_from_pid (manager->app_manager, tasktmp->pid); - model_add_task (manager->model, tasktmp, app, __current_timestamp ()); + App *app = xtm_app_manager_get_app_from_pid (manager->app_manager, tasktmp->pid); + model_add_task (manager->model, tasktmp, app, timestamp); #else - model_add_task (manager->model, tasktmp, __current_timestamp ()); + model_add_task (manager->model, tasktmp, timestamp); #endif - g_array_append_val (manager->tasks, *tasktmp); -#if DEBUG - g_debug ("Add new task %d %s", tasktmp->pid, tasktmp->name); -#endif - } + /* XXX: add bininsert() here. */ + g_array_append_val (manager->tasks, *tasktmp); + g_array_sort (manager->tasks, task_pid_compare_fn); + G_DEBUG_FMT ("Add new task %d %s", tasktmp->pid, tasktmp->name); } g_array_free (array, TRUE); model_update_forced = FALSE; return; } - void get_owner_uid (guint *owner_uid, gchar **owner_uid_name) { @@ -633,7 +537,7 @@ get_hostname (void) #define HOST_NAME_MAX 255 #endif char hostname[HOST_NAME_MAX]; - if (gethostname (hostname, HOST_NAME_MAX)) + if (gethostname (hostname, sizeof(hostname))) return g_strdup ("(unknown)"); return g_strdup_printf ("%s", hostname); } @@ -693,3 +597,8 @@ set_priority_to_pid (guint pid, gint priority) return (res == 0) ? TRUE : FALSE; } +gint +task_pid_compare_fn(gconstpointer a, gconstpointer b) +{ + return (((Task*)a)->pid - ((Task*)b)->pid); +} diff --git a/src/task-manager.h b/src/task-manager.h index e74acd0..1a3c0bd 100644 --- a/src/task-manager.h +++ b/src/task-manager.h @@ -96,5 +96,14 @@ void get_owner_uid (guint *owner_uid, gchar **owner_uid_name); gchar * get_hostname (void); gboolean send_signal_to_pid (guint pid, gint xtm_signal); gboolean set_priority_to_pid (guint pid, gint priority); +gint task_pid_compare_fn (gconstpointer a, gconstpointer b); + + +#if DEBUG +# define G_DEBUG_FMT(fmt, args...) g_debug((fmt), ##args) +#else +# define G_DEBUG_FMT(fmt, args...) +#endif + #endif /* !TASK_MANAGER_H */ -- libgit2 0.27.0