summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2017-04-10 11:25:07 +0200
committerSven Eden <yamakuzure@gmx.net>2017-04-10 11:25:07 +0200
commit11731417d7e3e9051b5b2c7072dda16985eb15a3 (patch)
tree66f408c3defd106d2c94bb3cfbcd419f00c6b636
parent2e694aaeec158dba9dc12d8eea1755e201830a81 (diff)
Prep v227: Removed src/shared/cgroup-show.[hc], it is not needed.
-rw-r--r--Makefile.am2
-rw-r--r--cb/elogind.cbp4
-rw-r--r--src/login/loginctl.c4
-rw-r--r--src/shared/cgroup-show.c277
-rw-r--r--src/shared/cgroup-show.h33
5 files changed, 2 insertions, 318 deletions
diff --git a/Makefile.am b/Makefile.am
index 117a45e5f..2bd2898c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -405,8 +405,6 @@ libshared_la_SOURCES = \
src/shared/spawn-polkit-agent.h \
src/shared/clean-ipc.c \
src/shared/clean-ipc.h \
- src/shared/cgroup-show.c \
- src/shared/cgroup-show.h \
src/shared/utmp-wtmp.h \
src/shared/bus-util.c \
src/shared/bus-util.h
diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index d7168fc00..945761cd5 100644
--- a/cb/elogind.cbp
+++ b/cb/elogind.cbp
@@ -394,10 +394,6 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/shared/bus-util.h" />
- <Unit filename="../src/shared/cgroup-show.c">
- <Option compilerVar="CC" />
- </Unit>
- <Unit filename="../src/shared/cgroup-show.h" />
<Unit filename="../src/shared/clean-ipc.c">
<Option compilerVar="CC" />
</Unit>
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 6400dd6b0..ce0adc45c 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -37,8 +37,8 @@
#include "strv.h"
#include "unit-name.h"
#include "sysfs-show.h"
-// #include "logs-show.h"
-#include "cgroup-show.h"
+//#include "logs-show.h"
+//#include "cgroup-show.h"
#include "cgroup-util.h"
#include "spawn-polkit-agent.h"
#include "verbs.h"
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
deleted file mode 100644
index 4b038452f..000000000
--- a/src/shared/cgroup-show.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2010 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <errno.h>
-
-#include "util.h"
-#include "formats-util.h"
-#include "process-util.h"
-#include "macro.h"
-#include "path-util.h"
-#include "cgroup-util.h"
-#include "cgroup-show.h"
-#include "terminal-util.h"
-
-static int compare(const void *a, const void *b) {
- const pid_t *p = a, *q = b;
-
- if (*p < *q)
- return -1;
- if (*p > *q)
- return 1;
- return 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;
-
- if (n_pids == 0)
- return;
-
- qsort(pids, n_pids, sizeof(pid_t), compare);
-
- /* Filter duplicates */
- for (j = 0, i = 1; i < n_pids; i++) {
- if (pids[i] == pids[j])
- continue;
- pids[++j] = pids[i];
- }
- n_pids = j + 1;
- pid_width = DECIMAL_STR_WIDTH(pids[j]);
-
- 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++) {
- _cleanup_free_ char *t = NULL;
-
- get_process_cmdline(pids[i], n_columns, true, &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));
- }
-}
-
-
-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;
- _cleanup_fclose_ FILE *f = NULL;
- size_t n = 0, n_allocated = 0;
- _cleanup_free_ pid_t *pids = NULL;
- _cleanup_free_ char *p = NULL;
- pid_t pid;
- int r;
-
- r = cg_mangle_path(path, &p);
- if (r < 0)
- return r;
-
- fn = strjoina(p, "/cgroup.procs");
- f = fopen(fn, "re");
- if (!f)
- return -errno;
-
- while ((r = cg_read_pid(f, &pid)) > 0) {
-
- if (!kernel_threads && is_kernel_thread(pid) > 0)
- continue;
-
- if (!GREEDY_REALLOC(pids, n_allocated, n + 1))
- return -ENOMEM;
-
- assert(n < n_allocated);
- pids[n++] = pid;
- }
-
- if (r < 0)
- return r;
-
- show_pid_array(pids, n, prefix, n_columns, false, more, kernel_threads, flags);
-
- return 0;
-}
-
-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;
-
- assert(path);
-
- if (n_columns <= 0)
- n_columns = columns();
-
- if (!prefix)
- prefix = "";
-
- r = cg_mangle_path(path, &fn);
- if (r < 0)
- return r;
-
- d = opendir(fn);
- if (!d)
- return -errno;
-
- while ((r = cg_read_subgroup(d, &gn)) > 0) {
- _cleanup_free_ char *k = NULL;
-
- k = strjoin(fn, "/", gn, NULL);
- free(gn);
- if (!k)
- return -ENOMEM;
-
- if (!(flags & OUTPUT_SHOW_ALL) && cg_is_empty_recursive(NULL, k) > 0)
- continue;
-
- if (!shown_pids) {
- 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_TREE_BRANCH), cg_unescape(basename(last)));
-
- if (!p1) {
- p1 = strappend(prefix, draw_special_char(DRAW_TREE_VERTICAL));
- if (!p1)
- return -ENOMEM;
- }
-
- show_cgroup_by_path(last, p1, n_columns-2, kernel_threads, flags);
- free(last);
- }
-
- last = k;
- k = NULL;
- }
-
- if (r < 0)
- return r;
-
- if (!shown_pids)
- 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), cg_unescape(basename(last)));
-
- if (!p2) {
- p2 = strappend(prefix, " ");
- if (!p2)
- return -ENOMEM;
- }
-
- show_cgroup_by_path(last, p2, n_columns-2, kernel_threads, flags);
- }
-
- return 0;
-}
-
-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(path);
-
- r = cg_get_path(controller, path, NULL, &p);
- if (r < 0)
- 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, OutputFlags flags) {
- _cleanup_free_ pid_t *copy = NULL;
- unsigned i, j;
- int r;
-
- assert(path);
-
- if (n_pids <= 0)
- return 0;
-
- if (n_columns <= 0)
- n_columns = columns();
-
- prefix = strempty(prefix);
-
- copy = new(pid_t, n_pids);
- if (!copy)
- return -ENOMEM;
-
- for (i = 0, j = 0; i < n_pids; i++) {
- _cleanup_free_ char *k = NULL;
-
- r = cg_pid_get_path(controller, pids[i], &k);
- if (r < 0)
- return r;
-
- if (path_startswith(k, path))
- continue;
-
- copy[j++] = pids[i];
- }
-
- show_pid_array(copy, j, prefix, n_columns, true, false, false, flags);
-
- return 0;
-}
-
-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(path);
-
- 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, 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;
-
- assert(spec);
-
- r = cg_split_spec(spec, &controller, &path);
- if (r < 0)
- return r;
-
- return show_cgroup_and_extra(controller, path, prefix, n_columns, kernel_threads, extra_pids, n_extra_pids, flags);
-}
-#endif // 0
diff --git a/src/shared/cgroup-show.h b/src/shared/cgroup-show.h
deleted file mode 100644
index 7c9c3f652..000000000
--- a/src/shared/cgroup-show.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#pragma once
-
-/***
- This file is part of systemd.
-
- Copyright 2010 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <stdbool.h>
-#include <sys/types.h>
-// #include "logs-show.h"
-#include "output-mode.h"
-
-int show_cgroup_by_path(const char *path, const char *prefix, unsigned columns, bool kernel_threads, OutputFlags flags);
-int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned columns, bool kernel_threads, OutputFlags flags);
-
-// UNNEEDED 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);
-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);