chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
condition: drop pointless double negation
[elogind.git]
/
src
/
cgroup-util.c
diff --git
a/src/cgroup-util.c
b/src/cgroup-util.c
index 07e4e64fefc7ca8dced183fdb17235bb527bbe51..b68b9ad3a33a20c9c85e2e0c7a5d495e3f7cb71a 100644
(file)
--- a/
src/cgroup-util.c
+++ b/
src/cgroup-util.c
@@
-166,12
+166,12
@@
int cg_rmdir(const char *controller, const char *path) {
return r < 0 ? -errno : 0;
}
return r < 0 ? -errno : 0;
}
-int cg_kill(const char *controller, const char *path, int sig, bool ignore_self) {
+int cg_kill(const char *controller, const char *path, int sig, bool ignore_self
, Set *s
) {
bool done = false;
bool done = false;
- Set *s;
int r, ret = 0;
pid_t my_pid;
FILE *f = NULL;
int r, ret = 0;
pid_t my_pid;
FILE *f = NULL;
+ Set *allocated_set = NULL;
assert(controller);
assert(path);
assert(controller);
assert(path);
@@
-181,13
+181,14
@@
int cg_kill(const char *controller, const char *path, int sig, bool ignore_self)
* is repeated until no further processes are added to the
* tasks list, to properly handle forking processes */
* is repeated until no further processes are added to the
* tasks list, to properly handle forking processes */
- if (!(s = set_new(trivial_hash_func, trivial_compare_func)))
- return -ENOMEM;
+ if (!s)
+ if (!(s = allocated_set = set_new(trivial_hash_func, trivial_compare_func)))
+ return -ENOMEM;
my_pid = getpid();
do {
my_pid = getpid();
do {
- pid_t pid;
+ pid_t pid
= 0
;
done = true;
if ((r = cg_enumerate_processes(controller, path, &f)) < 0) {
done = true;
if ((r = cg_enumerate_processes(controller, path, &f)) < 0) {
@@
-240,7
+241,8
@@
int cg_kill(const char *controller, const char *path, int sig, bool ignore_self)
} while (!done);
finish:
} while (!done);
finish:
- set_free(s);
+ if (allocated_set)
+ set_free(allocated_set);
if (f)
fclose(f);
if (f)
fclose(f);
@@
-248,16
+250,21
@@
finish:
return ret;
}
return ret;
}
-int cg_kill_recursive(const char *controller, const char *path, int sig, bool ignore_self, bool rem) {
+int cg_kill_recursive(const char *controller, const char *path, int sig, bool ignore_self, bool rem
, Set *s
) {
int r, ret = 0;
DIR *d = NULL;
char *fn;
int r, ret = 0;
DIR *d = NULL;
char *fn;
+ Set *allocated_set = NULL;
assert(path);
assert(controller);
assert(sig >= 0);
assert(path);
assert(controller);
assert(sig >= 0);
- ret = cg_kill(controller, path, sig, ignore_self);
+ if (!s)
+ if (!(s = allocated_set = set_new(trivial_hash_func, trivial_compare_func)))
+ return -ENOMEM;
+
+ ret = cg_kill(controller, path, sig, ignore_self, s);
if ((r = cg_enumerate_subgroups(controller, path, &d)) < 0) {
if (ret >= 0 && r != -ENOENT)
if ((r = cg_enumerate_subgroups(controller, path, &d)) < 0) {
if (ret >= 0 && r != -ENOENT)
@@
-279,7
+286,7
@@
int cg_kill_recursive(const char *controller, const char *path, int sig, bool ig
goto finish;
}
goto finish;
}
- r = cg_kill_recursive(controller, p, sig, ignore_self, rem);
+ r = cg_kill_recursive(controller, p, sig, ignore_self, rem
, s
);
free(p);
if (r != 0 && ret >= 0)
free(p);
if (r != 0 && ret >= 0)
@@
-291,7
+298,9
@@
int cg_kill_recursive(const char *controller, const char *path, int sig, bool ig
if (rem)
if ((r = cg_rmdir(controller, path)) < 0) {
if (rem)
if ((r = cg_rmdir(controller, path)) < 0) {
- if (ret >= 0 && r != -ENOENT)
+ if (ret >= 0 &&
+ r != -ENOENT &&
+ r != -EBUSY)
ret = r;
}
ret = r;
}
@@
-299,6
+308,9
@@
finish:
if (d)
closedir(d);
if (d)
closedir(d);
+ if (allocated_set)
+ set_free(allocated_set);
+
return ret;
}
return ret;
}
@@
-309,24
+321,25
@@
int cg_kill_recursive_and_wait(const char *controller, const char *path, bool re
assert(controller);
/* This safely kills all processes; first it sends a SIGTERM,
assert(controller);
/* This safely kills all processes; first it sends a SIGTERM,
- * then checks 8 times after 50ms whether the group is
- * now empty, and finally kills everything that is left with
- * SIGKILL */
+ * then checks 8 times after 200ms whether the group is now
+ * empty, then kills everything that is left with SIGKILL and
+ * finally checks 5 times after 200ms each whether the group
+ * is finally empty. */
- for (i = 0; i < 1
0
; i++) {
+ for (i = 0; i < 1
5
; i++) {
int sig, r;
if (i <= 0)
sig = SIGTERM;
int sig, r;
if (i <= 0)
sig = SIGTERM;
- else if (i
>
= 9)
+ else if (i
=
= 9)
sig = SIGKILL;
else
sig = 0;
sig = SIGKILL;
else
sig = 0;
- if ((r = cg_kill_recursive(controller, path, sig, true, rem)) <= 0)
+ if ((r = cg_kill_recursive(controller, path, sig, true, rem
, NULL
)) <= 0)
return r;
return r;
- usleep(
5
0 * USEC_PER_MSEC);
+ usleep(
20
0 * USEC_PER_MSEC);
}
return 0;
}
return 0;
@@
-349,7
+362,7
@@
int cg_migrate(const char *controller, const char *from, const char *to, bool ig
my_pid = getpid();
do {
my_pid = getpid();
do {
- pid_t pid;
+ pid_t pid
= 0
;
done = true;
if ((r = cg_enumerate_tasks(controller, from, &f)) < 0) {
done = true;
if ((r = cg_enumerate_tasks(controller, from, &f)) < 0) {
@@
-449,7
+462,9
@@
int cg_migrate_recursive(const char *controller, const char *from, const char *t
if (rem)
if ((r = cg_rmdir(controller, from)) < 0) {
if (rem)
if ((r = cg_rmdir(controller, from)) < 0) {
- if (ret >= 0 && r != -ENOENT)
+ if (ret >= 0 &&
+ r != -ENOENT &&
+ r != -EBUSY)
ret = r;
}
ret = r;
}
@@
-481,7
+496,7
@@
int cg_get_path(const char *controller, const char *path, const char *suffix, ch
else
p = controller;
else
p = controller;
- if (asprintf(&mp, "/cgroup/%s", p) < 0)
+ if (asprintf(&mp, "/
sys/fs/
cgroup/%s", p) < 0)
return -ENOMEM;
if ((r = path_is_mount_point(mp)) <= 0) {
return -ENOMEM;
if ((r = path_is_mount_point(mp)) <= 0) {
@@
-767,9
+782,9
@@
finish:
}
int cg_is_empty(const char *controller, const char *path, bool ignore_self) {
}
int cg_is_empty(const char *controller, const char *path, bool ignore_self) {
- pid_t pid;
+ pid_t pid
= 0
;
int r;
int r;
- FILE *f;
+ FILE *f
= NULL
;
bool found = false;
assert(controller);
bool found = false;
assert(controller);
@@
-927,7
+942,7
@@
int cg_fix_path(const char *path, char **result) {
/* First check if it already is a filesystem path */
if (path_is_absolute(path) &&
/* First check if it already is a filesystem path */
if (path_is_absolute(path) &&
- path_startswith(path, "/cgroup") &&
+ path_startswith(path, "/
sys/fs/
cgroup") &&
access(path, F_OK) >= 0) {
if (!(t = strdup(path)))
access(path, F_OK) >= 0) {
if (!(t = strdup(path)))