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];
+ 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)
+ if (flags & OUTPUT_FULL_WIDTH)
n_columns = 0;
else {
if (n_columns > pid_width+2)
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_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)));
- free(t);
+ printf("%*"PID_PRI" %s\n", pid_width, pids[i], strna(t));
}
}
_cleanup_fclose_ FILE *f = NULL;
size_t n = 0, n_allocated = 0;
_cleanup_free_ pid_t *pids = NULL;
- char *p = NULL;
+ _cleanup_free_ char *p = NULL;
pid_t pid;
int r;
if (r < 0)
return r;
- fn = strappend(p, "/cgroup.procs");
- free(p);
- if (!fn)
- return -ENOMEM;
-
+ fn = strjoina(p, "/cgroup.procs");
f = fopen(fn, "re");
- free(fn);
if (!f)
return -errno;
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;
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;
}
if (last) {
printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_BRANCH),
- path_get_file_name(last));
+ 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;
}
if (last) {
printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_RIGHT),
- path_get_file_name(last));
+ basename(last));
if (!p2) {
p2 = strappend(prefix, " ");