X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fcgroup-show.c;h=c862ee91f6091bcb52213500c1a385725b71d747;hp=69fe7fc96db4ceba6a5860d655557b443896a33c;hb=6b01f1d3911bd7c7eadbb8a3b4375bd3ac05c98f;hpb=c339d9775d1df19fdbbafc57486f7cd51af6b7fb diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c index 69fe7fc96..c862ee91f 100644 --- a/src/shared/cgroup-show.c +++ b/src/shared/cgroup-show.c @@ -40,18 +40,7 @@ static int compare(const void *a, const void *b) { return 0; } -static unsigned ilog10(unsigned long ul) { - int n = 0; - - while (ul > 0) { - n++; - ul /= 10; - } - - return n; -} - -static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsigned n_columns, bool extra, bool more, bool kernel_threads) { +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; @@ -71,54 +60,52 @@ static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi pids[m++] = pids[i]; } n_pids = m; - pid_width = ilog10(biggest); + pid_width = DECIMAL_STR_WIDTH(biggest); /* And sort */ - qsort(pids, n_pids, sizeof(pid_t), compare); - - if (n_columns > pid_width+2) - n_columns -= pid_width+2; - else - n_columns = 20; - + qsort_safe(pids, n_pids, sizeof(pid_t), compare); + + if (flags & OUTPUT_FULL_WIDTH) + n_columns = 0; + else { + if (n_columns > pid_width+2) + n_columns -= pid_width+2; + else + n_columns = 20; + } for (i = 0; i < n_pids; i++) { - char *t = NULL; + _cleanup_free_ char *t = NULL; 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_BOX_VERT_AND_RIGHT : DRAW_BOX_UP_AND_RIGHT)), + 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("%*lu %s\n", pid_width, (unsigned long) pids[i], strna(t)); - - free(t); } } -static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigned n_columns, bool more, bool kernel_threads) { +static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigned n_columns, bool more, bool kernel_threads, OutputFlags flags) { char *fn; - FILE *f; + _cleanup_fclose_ FILE *f = NULL; size_t n = 0, n_allocated = 0; - pid_t *pids = NULL; - char *p; + _cleanup_free_ pid_t *pids = NULL; + _cleanup_free_ char *p = NULL; pid_t pid; int r; - r = cg_fix_path(path, &p); + r = cg_mangle_path(path, &p); if (r < 0) return r; - r = asprintf(&fn, "%s/cgroup.procs", p); - free(p); - if (r < 0) - return -ENOMEM; - + fn = strappenda(p, "/cgroup.procs"); f = fopen(fn, "re"); - free(fn); if (!f) return -errno; @@ -133,10 +120,8 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne n_allocated = MAX(16U, n*2U); npids = realloc(pids, sizeof(pid_t) * n_allocated); - if (!npids) { - r = -ENOMEM; - goto finish; - } + if (!npids) + return -ENOMEM; pids = npids; } @@ -146,26 +131,18 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne } if (r < 0) - goto finish; + return r; if (n > 0) - show_pid_array(pids, n, prefix, n_columns, false, more, kernel_threads); - - r = 0; - -finish: - free(pids); + show_pid_array(pids, n, prefix, n_columns, false, more, kernel_threads, flags); - if (f) - fclose(f); - - return r; + return 0; } -int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns, bool kernel_threads, bool all) { - DIR *d; - char *last = NULL; - char *p1 = NULL, *p2 = NULL, *fn = NULL, *gn = NULL; +int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns, bool kernel_threads, OutputFlags flags) { + _cleanup_free_ char *fn = NULL, *p1 = NULL, *last = NULL, *p2 = NULL; + _cleanup_closedir_ DIR *d = NULL; + char *gn = NULL; bool shown_pids = false; int r; @@ -177,113 +154,88 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns if (!prefix) prefix = ""; - r = cg_fix_path(path, &fn); + r = cg_mangle_path(path, &fn); if (r < 0) return r; d = opendir(fn); - if (!d) { - free(fn); + if (!d) return -errno; - } while ((r = cg_read_subgroup(d, &gn)) > 0) { - char *k; + _cleanup_free_ char *k = NULL; - r = asprintf(&k, "%s/%s", fn, gn); + k = strjoin(fn, "/", gn, NULL); free(gn); - if (r < 0) { - r = -ENOMEM; - goto finish; - } + if (!k) + return -ENOMEM; - if (!all && cg_is_empty_recursive(NULL, k, false) > 0) { - free(k); + if (!(flags & OUTPUT_SHOW_ALL) && cg_is_empty_recursive(NULL, k, false) > 0) continue; - } if (!shown_pids) { - show_cgroup_one_by_path(path, prefix, n_columns, true, kernel_threads); + show_cgroup_one_by_path(path, prefix, n_columns, true, kernel_threads, flags); shown_pids = true; } if (last) { - printf("%s%s %s\n", prefix, draw_special_char(DRAW_BOX_VERT_AND_RIGHT), - path_get_file_name(last)); + printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_BRANCH), + basename(last)); if (!p1) { - p1 = strjoin(prefix, draw_special_char(DRAW_BOX_VERT), " ", NULL); - if (!p1) { - free(k); - r = -ENOMEM; - goto finish; - } + p1 = strappend(prefix, draw_special_char(DRAW_TREE_VERTICAL)); + if (!p1) + return -ENOMEM; } - show_cgroup_by_path(last, p1, n_columns-2, kernel_threads, all); + show_cgroup_by_path(last, p1, n_columns-2, kernel_threads, flags); free(last); } last = k; + k = NULL; } if (r < 0) - goto finish; + return r; if (!shown_pids) - show_cgroup_one_by_path(path, prefix, n_columns, !!last, kernel_threads); + 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_BOX_UP_AND_RIGHT), - path_get_file_name(last)); + printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_RIGHT), + basename(last)); if (!p2) { p2 = strappend(prefix, " "); - if (!p2) { - r = -ENOMEM; - goto finish; - } + if (!p2) + return -ENOMEM; } - show_cgroup_by_path(last, p2, n_columns-2, kernel_threads, all); + show_cgroup_by_path(last, p2, n_columns-2, kernel_threads, flags); } - r = 0; - -finish: - free(p1); - free(p2); - free(last); - free(fn); - - closedir(d); - - return r; + return 0; } -int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned n_columns, bool kernel_threads, bool all) { - char *p; +int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned n_columns, bool kernel_threads, OutputFlags flags) { + _cleanup_free_ char *p = NULL; int r; - assert(controller); assert(path); r = cg_get_path(controller, path, NULL, &p); if (r < 0) return r; - r = show_cgroup_by_path(p, prefix, n_columns, kernel_threads, all); - free(p); - - return r; + return show_cgroup_by_path(p, prefix, n_columns, kernel_threads, flags); } -static int show_extra_pids(const char *controller, const char *path, const char *prefix, unsigned n_columns, const pid_t pids[], unsigned n_pids) { - pid_t *copy; +static int show_extra_pids(const char *controller, const char *path, const char *prefix, unsigned n_columns, const pid_t pids[], unsigned n_pids, OutputFlags flags) { + _cleanup_free_ pid_t *copy = NULL; unsigned i, j; int r; - assert(controller); assert(path); if (n_pids <= 0) @@ -292,21 +244,18 @@ static int show_extra_pids(const char *controller, const char *path, const char if (n_columns <= 0) n_columns = columns(); - if (!prefix) - prefix = ""; + prefix = strempty(prefix); copy = new(pid_t, n_pids); if (!copy) return -ENOMEM; for (i = 0, j = 0; i < n_pids; i++) { - char *k; + _cleanup_free_ char *k = NULL; - r = cg_get_by_pid(controller, pids[i], &k); - if (r < 0) { - free(copy); + r = cg_pid_get_path(controller, pids[i], &k); + if (r < 0) return r; - } if (path_startswith(k, path)) continue; @@ -314,28 +263,26 @@ static int show_extra_pids(const char *controller, const char *path, const char copy[j++] = pids[i]; } - show_pid_array(copy, j, prefix, n_columns, true, false, false); + show_pid_array(copy, j, prefix, n_columns, true, false, false, flags); - free(copy); return 0; } -int show_cgroup_and_extra(const char *controller, const char *path, const char *prefix, unsigned n_columns, bool kernel_threads, bool all, const pid_t extra_pids[], unsigned n_extra_pids) { +int show_cgroup_and_extra(const char *controller, const char *path, const char *prefix, unsigned n_columns, bool kernel_threads, const pid_t extra_pids[], unsigned n_extra_pids, OutputFlags flags) { int r; - assert(controller); assert(path); - r = show_cgroup(controller, path, prefix, n_columns, kernel_threads, all); + r = show_cgroup(controller, path, prefix, n_columns, kernel_threads, flags); if (r < 0) return r; - return show_extra_pids(controller, path, prefix, n_columns, extra_pids, n_extra_pids); + return show_extra_pids(controller, path, prefix, n_columns, extra_pids, n_extra_pids, flags); } -int show_cgroup_and_extra_by_spec(const char *spec, const char *prefix, unsigned n_columns, bool kernel_threads, bool all, const pid_t extra_pids[], unsigned n_extra_pids) { +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; - char *controller, *path; assert(spec); @@ -343,9 +290,5 @@ int show_cgroup_and_extra_by_spec(const char *spec, const char *prefix, unsigned if (r < 0) return r; - r = show_cgroup_and_extra(controller, path, prefix, n_columns, kernel_threads, all, extra_pids, n_extra_pids); - free(controller); - free(path); - - return r; + return show_cgroup_and_extra(controller, path, prefix, n_columns, kernel_threads, extra_pids, n_extra_pids, flags); }