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: fix hello ioctl buffer size calculation
[elogind.git]
/
src
/
machine
/
machine.c
diff --git
a/src/machine/machine.c
b/src/machine/machine.c
index f78b0cf8fdc97c568cb4adeb8a5777f024839d17..cf3ef15456bc416615ecd0622a1199c5a5f8c96c 100644
(file)
--- a/
src/machine/machine.c
+++ b/
src/machine/machine.c
@@
-23,7
+23,7
@@
#include <unistd.h>
#include <errno.h>
#include <unistd.h>
#include <errno.h>
-#include
<systemd/sd-messages.h>
+#include
"sd-messages.h"
#include "util.h"
#include "mkdir.h"
#include "util.h"
#include "mkdir.h"
@@
-32,8
+32,9
@@
#include "fileio.h"
#include "special.h"
#include "unit-name.h"
#include "fileio.h"
#include "special.h"
#include "unit-name.h"
-#include "dbus-common.h"
#include "machine.h"
#include "machine.h"
+#include "bus-util.h"
+#include "bus-error.h"
Machine* machine_new(Manager *manager, const char *name) {
Machine *m;
Machine* machine_new(Manager *manager, const char *name) {
Machine *m;
@@
-84,8
+85,10
@@
void machine_free(Machine *m) {
hashmap_remove(m->manager->machines, m->name);
hashmap_remove(m->manager->machines, m->name);
- if (m->create_message)
- dbus_message_unref(m->create_message);
+ 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);
free(m->state_file);
free(m->name);
free(m->state_file);
@@
-217,19
+220,14
@@
int machine_load(Machine *m) {
return r;
}
return r;
}
-static int machine_start_scope(Machine *m, DBusMessageIter *iter) {
- _cleanup_free_ char *description = NULL;
- DBusError error;
- char *job;
+static int machine_start_scope(Machine *m, sd_bus_message *properties, sd_bus_error *error) {
int r = 0;
assert(m);
int r = 0;
assert(m);
- dbus_error_init(&error);
-
if (!m->scope) {
_cleanup_free_ char *escaped = NULL;
if (!m->scope) {
_cleanup_free_ char *escaped = NULL;
- char *scope;
+ char *scope
, *description, *job
;
escaped = unit_name_escape(m->name);
if (!escaped)
escaped = unit_name_escape(m->name);
if (!escaped)
@@
-239,13
+237,11
@@
static int machine_start_scope(Machine *m, DBusMessageIter *iter) {
if (!scope)
return log_oom();
if (!scope)
return log_oom();
- description = strappend(m->class == MACHINE_VM ? "Virtual Machine " : "Container ", m->name);
+ description = strappend
a
(m->class == MACHINE_VM ? "Virtual Machine " : "Container ", m->name);
- r = manager_start_scope(m->manager, scope, m->leader, SPECIAL_MACHINE_SLICE, description,
iter, &
error, &job);
+ r = manager_start_scope(m->manager, scope, m->leader, SPECIAL_MACHINE_SLICE, description,
properties,
error, &job);
if (r < 0) {
if (r < 0) {
- log_error("Failed to start machine scope: %s", bus_error(&error, r));
- dbus_error_free(&error);
-
+ log_error("Failed to start machine scope: %s", bus_error_message(error, r));
free(scope);
return r;
} else {
free(scope);
return r;
} else {
@@
-262,7
+258,7
@@
static int machine_start_scope(Machine *m, DBusMessageIter *iter) {
return r;
}
return r;
}
-int machine_start(Machine *m,
DBusMessageIter *ite
r) {
+int machine_start(Machine *m,
sd_bus_message *properties, sd_bus_error *erro
r) {
int r;
assert(m);
int r;
assert(m);
@@
-270,8
+266,12
@@
int machine_start(Machine *m, DBusMessageIter *iter) {
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 */
/* Create cgroup */
- r = machine_start_scope(m,
ite
r);
+ r = machine_start_scope(m,
properties, erro
r);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-296,21
+296,18
@@
int machine_start(Machine *m, DBusMessageIter *iter) {
}
static int machine_stop_scope(Machine *m) {
}
static int machine_stop_scope(Machine *m) {
-
DBusError error
;
+
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL
;
char *job;
int r;
assert(m);
char *job;
int r;
assert(m);
- dbus_error_init(&error);
-
if (!m->scope)
return 0;
r = manager_stop_unit(m->manager, m->scope, &error, &job);
if (r < 0) {
if (!m->scope)
return 0;
r = manager_stop_unit(m->manager, m->scope, &error, &job);
if (r < 0) {
- log_error("Failed to stop machine scope: %s", bus_error(&error, r));
- dbus_error_free(&error);
+ log_error("Failed to stop machine scope: %s", bus_error_message(&error, r));
return r;
}
return r;
}
@@
-348,19
+345,19
@@
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)
- return
0
;
+ return
false
;
- if (m->scope_job)
- return
1
;
+ if (m->scope_job
&& manager_job_is_active(m->manager, m->scope_job)
)
+ return
true
;
- if (m->scope)
- return
manager_unit_is_active(m->manager, m->scope) != 0
;
+ if (m->scope
&& manager_unit_is_active(m->manager, m->scope)
)
+ return
true
;
- return
0
;
+ return
false
;
}
void machine_add_to_gc_queue(Machine *m) {
}
void machine_add_to_gc_queue(Machine *m) {