chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: introduce concept of a "default" event loop per-thread and make use of it everywhere
[elogind.git]
/
src
/
machine
/
machine.c
diff --git
a/src/machine/machine.c
b/src/machine/machine.c
index be669f02dcf59dcb6258ba6d858660936ec9d3ac..cf3ef15456bc416615ecd0622a1199c5a5f8c96c 100644
(file)
--- a/
src/machine/machine.c
+++ b/
src/machine/machine.c
@@
-85,6
+85,9
@@
void machine_free(Machine *m) {
hashmap_remove(m->manager->machines, m->name);
hashmap_remove(m->manager->machines, m->name);
+ if (m->leader > 0)
+ hashmap_remove_value(m->manager->machine_leaders, UINT_TO_PTR(m->leader), m);
+
sd_bus_message_unref(m->create_message);
free(m->name);
sd_bus_message_unref(m->create_message);
free(m->name);
@@
-263,6
+266,10
@@
int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) {
if (m->started)
return 0;
if (m->started)
return 0;
+ r = hashmap_put(m->manager->machine_leaders, UINT_TO_PTR(m->leader), m);
+ if (r < 0)
+ return r;
+
/* Create cgroup */
r = machine_start_scope(m, properties, error);
if (r < 0)
/* Create cgroup */
r = machine_start_scope(m, properties, error);
if (r < 0)
@@
-338,7
+345,7
@@
int machine_stop(Machine *m) {
return r;
}
return r;
}
-
int
machine_check_gc(Machine *m, bool drop_not_started) {
+
bool
machine_check_gc(Machine *m, bool drop_not_started) {
assert(m);
if (drop_not_started && !m->started)
assert(m);
if (drop_not_started && !m->started)