X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fcgroup-show.c;h=42399077eefe28b61bbd3a47877a4dc7812cc8c4;hb=94c5f7fa9e34517edad75cd63d71dd459ec4f133;hp=979fa8fddf6e776fa1db2b70e261e36f866f6582;hpb=b47d419c25ecc735615a1088060c1ec8bef1e41f;p=elogind.git
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index 979fa8fdd..42399077e 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -19,16 +19,23 @@
along with systemd; If not, see .
***/
-#include
-#include
#include
#include
+#include
+#include
-#include "util.h"
+#include "alloc-util.h"
+#include "cgroup-show.h"
+#include "cgroup-util.h"
+#include "fd-util.h"
+#include "formats-util.h"
+#include "locale-util.h"
#include "macro.h"
#include "path-util.h"
-#include "cgroup-util.h"
-#include "cgroup-show.h"
+#include "process-util.h"
+#include "string-util.h"
+#include "terminal-util.h"
+#include "util.h"
static int compare(const void *a, const void *b) {
const pid_t *p = a, *q = b;
@@ -40,32 +47,22 @@ 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;
-
- assert(n_pids > 0);
-
- /* Filter duplicates */
- m = 0;
- for (i = 0; i < n_pids; i++) {
- unsigned j;
+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;
- if (pids[i] > biggest)
- biggest = pids[i];
+ if (n_pids == 0)
+ return;
- for (j = i+1; j < n_pids; j++)
- if (pids[i] == pids[j])
- break;
+ 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(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;
@@ -80,13 +77,12 @@ static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
get_process_cmdline(pids[i], n_columns, true, &t);
- printf("%s%s%*lu %s\n",
- prefix,
- draw_special_char(extra ? DRAW_TRIANGULAR_BULLET :
- ((more || i < n_pids-1) ? DRAW_TREE_BRANCH : DRAW_TREE_RIGHT)),
- pid_width,
- (unsigned long) pids[i],
- strna(t));
+ if (extra)
+ printf("%s%s ", prefix, draw_special_char(DRAW_TRIANGULAR_BULLET));
+ else
+ printf("%s%s", prefix, draw_special_char(((more || i < n_pids-1) ? DRAW_TREE_BRANCH : DRAW_TREE_RIGHT)));
+
+ printf("%*"PID_PRI" %s\n", pid_width, pids[i], strna(t));
}
}
@@ -104,7 +100,7 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne
if (r < 0)
return r;
- fn = strappenda(p, "/cgroup.procs");
+ fn = strjoina(p, "/cgroup.procs");
f = fopen(fn, "re");
if (!f)
return -errno;
@@ -114,17 +110,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;
@@ -133,8 +120,7 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne
if (r < 0)
return r;
- if (n > 0)
- show_pid_array(pids, n, prefix, n_columns, false, more, kernel_threads, flags);
+ show_pid_array(pids, n, prefix, n_columns, false, more, kernel_threads, flags);
return 0;
}
@@ -170,7 +156,7 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
if (!k)
return -ENOMEM;
- if (!(flags & OUTPUT_SHOW_ALL) && cg_is_empty_recursive(NULL, k, false) > 0)
+ if (!(flags & OUTPUT_SHOW_ALL) && cg_is_empty_recursive(NULL, k) > 0)
continue;
if (!shown_pids) {
@@ -179,11 +165,10 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
}
if (last) {
- printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_BRANCH),
- path_get_file_name(last));
+ printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_BRANCH), cg_unescape(basename(last)));
if (!p1) {
- p1 = strappend(prefix, draw_special_char(DRAW_TREE_VERT));
+ p1 = strappend(prefix, draw_special_char(DRAW_TREE_VERTICAL));
if (!p1)
return -ENOMEM;
}
@@ -203,8 +188,7 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
show_cgroup_one_by_path(path, prefix, n_columns, !!last, kernel_threads, flags);
if (last) {
- printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_RIGHT),
- path_get_file_name(last));
+ printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_RIGHT), cg_unescape(basename(last)));
if (!p2) {
p2 = strappend(prefix, " ");
@@ -280,6 +264,8 @@ int show_cgroup_and_extra(const char *controller, const char *path, const char *
return show_extra_pids(controller, path, prefix, n_columns, extra_pids, n_extra_pids, flags);
}
+/// UNNEEDED by elogind
+#if 0
int show_cgroup_and_extra_by_spec(const char *spec, const char *prefix, unsigned n_columns, bool kernel_threads, const pid_t extra_pids[], unsigned n_extra_pids, OutputFlags flags) {
_cleanup_free_ char *controller = NULL, *path = NULL;
int r;
@@ -292,3 +278,4 @@ int show_cgroup_and_extra_by_spec(const char *spec, const char *prefix, unsigned
return show_cgroup_and_extra(controller, path, prefix, n_columns, kernel_threads, extra_pids, n_extra_pids, flags);
}
+#endif // 0