summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-01-20 23:09:58 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-01-22 01:14:52 -0500
commit3da7a50f847ce5ea6094927cb51bab7eb1818efd (patch)
treed242d8aa5e6d175061a94d4fb60cc64e26546f6a /src/shared
parent1fa2f38f0f011010bf57522b42fcc168856a7003 (diff)
shared/cgroup-show: simplify show_pid_array()
int[] should not be used as pid_t[], even if happens to be same thing. Also deduplicating in a quadratic loop right before sorting is unnecessary. Remove custom greedy_realloc implementation.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/cgroup-show.c50
-rw-r--r--src/shared/util.h5
2 files changed, 17 insertions, 38 deletions
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index c862ee91f6..1e14ba6ddb 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -40,30 +40,20 @@ static int compare(const void *a, const void *b) {
return 0;
}
-static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsigned n_columns, bool extra, bool more, bool kernel_threads, OutputFlags flags) {
- unsigned i, m, pid_width;
- pid_t biggest = 0;
+static void show_pid_array(pid_t pids[], unsigned n_pids, const char *prefix, unsigned n_columns, bool extra, bool more, bool kernel_threads, OutputFlags flags) {
+ unsigned i, j, pid_width;
- /* Filter duplicates */
- m = 0;
- for (i = 0; i < n_pids; i++) {
- unsigned j;
-
- if (pids[i] > biggest)
- biggest = pids[i];
-
- for (j = i+1; j < n_pids; j++)
- if (pids[i] == pids[j])
- break;
+ assert(n_pids > 0);
+ qsort(pids, n_pids, sizeof(pid_t), compare);
- if (j >= n_pids)
- pids[m++] = pids[i];
+ /* Filter duplicates */
+ for (j = 0, i = 1; i < n_pids; i++) {
+ if (pids[i] == pids[j])
+ continue;
+ pids[++j] = pids[i];
}
- n_pids = m;
- pid_width = DECIMAL_STR_WIDTH(biggest);
-
- /* And sort */
- qsort_safe(pids, n_pids, sizeof(pid_t), compare);
+ n_pids = j + 1;
+ pid_width = DECIMAL_STR_WIDTH(pids[j]);
if (flags & OUTPUT_FULL_WIDTH)
n_columns = 0;
@@ -83,10 +73,7 @@ static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
else
printf("%s%s", prefix, draw_special_char(((more || i < n_pids-1) ? DRAW_TREE_BRANCH : DRAW_TREE_RIGHT)));
- printf("%*lu %s\n",
- pid_width,
- (unsigned long) pids[i],
- strna(t));
+ printf("%*"PID_PRI" %s\n", pid_width, pids[i], strna(t));
}
}
@@ -114,17 +101,8 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne
if (!kernel_threads && is_kernel_thread(pid) > 0)
continue;
- if (n >= n_allocated) {
- pid_t *npids;
-
- n_allocated = MAX(16U, n*2U);
-
- npids = realloc(pids, sizeof(pid_t) * n_allocated);
- if (!npids)
- return -ENOMEM;
-
- pids = npids;
- }
+ if (!GREEDY_REALLOC(pids, n_allocated, n + 1))
+ return -ENOMEM;
assert(n < n_allocated);
pids[n++] = pid;
diff --git a/src/shared/util.h b/src/shared/util.h
index 179c9615f9..bfa56335cd 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -45,12 +45,13 @@
#include <sys/inotify.h>
#if SIZEOF_PID_T == 4
-# define PID_FMT "%" PRIi32
+# define PID_PRI PRIi32
#elif SIZEOF_PID_T == 2
-# define PID_FMT "%" PRIi16
+# define PID_PRI PRIi16
#else
# error Unknown pid_t size
#endif
+#define PID_FMT "%" PID_PRI
#if SIZEOF_UID_T == 4
# define UID_FMT "%" PRIu32