chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-lookup: rearrange things so that the system path order follows the user path...
[elogind.git]
/
src
/
login
/
logind.c
diff --git
a/src/login/logind.c
b/src/login/logind.c
index 0df6b8964c887ecc59225d7524d6af97d04a4add..7fd6515ffd329e80a3163f89696f19a3b9b036a4 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-29,6
+29,8
@@
#include <sys/ioctl.h>
#include <linux/vt.h>
#include <sys/ioctl.h>
#include <linux/vt.h>
+#include <systemd/sd-daemon.h>
+
#include "logind.h"
#include "dbus-common.h"
#include "dbus-loop.h"
#include "logind.h"
#include "dbus-common.h"
#include "dbus-loop.h"
@@
-779,34
+781,74
@@
finish:
return r;
}
return r;
}
-
void manager_cgroup_notify_empty(Manager *m, const char *cgroup
) {
+
int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **session
) {
Session *s;
char *p;
assert(m);
assert(cgroup);
Session *s;
char *p;
assert(m);
assert(cgroup);
+ assert(session);
+
+ s = hashmap_get(m->cgroups, cgroup);
+ if (s) {
+ *session = s;
+ return 1;
+ }
p = strdup(cgroup);
if (!p) {
log_error("Out of memory.");
p = strdup(cgroup);
if (!p) {
log_error("Out of memory.");
- return;
+ return
-ENOMEM
;
}
for (;;) {
char *e;
}
for (;;) {
char *e;
- if (isempty(p) || streq(p, "/"))
- break;
-
-
s = hashmap_get(m->cgroups, p)
;
- if (s)
- session_add_to_gc_queue(s);
+ e = strrchr(p, '/');
+ if (!e || e == p) {
+ free(p);
+
*session = NULL
;
+ return 0;
+ }
- assert_se(e = strrchr(p, '/'));
*e = 0;
*e = 0;
+
+ s = hashmap_get(m->cgroups, p);
+ if (s) {
+ free(p);
+ *session = s;
+ return 1;
+ }
}
}
+}
+
+int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) {
+ char *p;
+ int r;
+ assert(m);
+ assert(pid >= 1);
+ assert(session);
+
+ r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &p);
+ if (r < 0)
+ return r;
+
+ r = manager_get_session_by_cgroup(m, p, session);
free(p);
free(p);
+
+ return r;
+}
+
+void manager_cgroup_notify_empty(Manager *m, const char *cgroup) {
+ Session *s;
+ int r;
+
+ r = manager_get_session_by_cgroup(m, cgroup, &s);
+ if (r <= 0)
+ return;
+
+ session_add_to_gc_queue(s);
}
static void manager_pipe_notify_eof(Manager *m, int fd) {
}
static void manager_pipe_notify_eof(Manager *m, int fd) {