mirror of
https://github.com/systemd/systemd.git
synced 2025-03-03 16:58:37 +03:00
systemctl: drop useless DBus calls from 'systemctl show foo.service'
systemctl called LoadUnit, GetUnit, GetAll in this order to get the properties. It is useless to load units explicitly, because it won't ensure anything. The unit may be freed immediately by the garbage collector. It is unnecessary to call GetUnit, because systemctl can easily translate the unit name to DBus path by itself. GetAll will load the unit if necessary.
This commit is contained in:
Michal Schmidt
parent
80fbf05e75
commit
a223b325b4
@ -2955,18 +2955,70 @@ finish:
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int show(DBusConnection *bus, char **args) {
|
static int show_one_by_pid(const char *verb, DBusConnection *bus, uint32_t pid, bool *new_line) {
|
||||||
DBusMessage *m = NULL, *reply = NULL;
|
DBusMessage *m = NULL, *reply = NULL;
|
||||||
int r, ret = 0;
|
const char *path = NULL;
|
||||||
DBusError error;
|
DBusError error;
|
||||||
|
int r;
|
||||||
|
|
||||||
|
dbus_error_init(&error);
|
||||||
|
|
||||||
|
m = dbus_message_new_method_call(
|
||||||
|
"org.freedesktop.systemd1",
|
||||||
|
"/org/freedesktop/systemd1",
|
||||||
|
"org.freedesktop.systemd1.Manager",
|
||||||
|
"GetUnitByPID");
|
||||||
|
if (!m) {
|
||||||
|
log_error("Could not allocate message.");
|
||||||
|
r = -ENOMEM;
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dbus_message_append_args(m,
|
||||||
|
DBUS_TYPE_UINT32, &pid,
|
||||||
|
DBUS_TYPE_INVALID)) {
|
||||||
|
log_error("Could not append arguments to message.");
|
||||||
|
r = -ENOMEM;
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
|
||||||
|
if (!reply) {
|
||||||
|
log_error("Failed to issue method call: %s", bus_error_message(&error));
|
||||||
|
r = -EIO;
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dbus_message_get_args(reply, &error,
|
||||||
|
DBUS_TYPE_OBJECT_PATH, &path,
|
||||||
|
DBUS_TYPE_INVALID)) {
|
||||||
|
log_error("Failed to parse reply: %s", bus_error_message(&error));
|
||||||
|
r = -EIO;
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = show_one(verb, bus, path, false, new_line);
|
||||||
|
|
||||||
|
finish:
|
||||||
|
if (m)
|
||||||
|
dbus_message_unref(m);
|
||||||
|
|
||||||
|
if (reply)
|
||||||
|
dbus_message_unref(reply);
|
||||||
|
|
||||||
|
dbus_error_free(&error);
|
||||||
|
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int show(DBusConnection *bus, char **args) {
|
||||||
|
int r, ret = 0;
|
||||||
bool show_properties, new_line = false;
|
bool show_properties, new_line = false;
|
||||||
char **name;
|
char **name;
|
||||||
|
|
||||||
assert(bus);
|
assert(bus);
|
||||||
assert(args);
|
assert(args);
|
||||||
|
|
||||||
dbus_error_init(&error);
|
|
||||||
|
|
||||||
show_properties = !streq(args[0], "status");
|
show_properties = !streq(args[0], "status");
|
||||||
|
|
||||||
if (show_properties)
|
if (show_properties)
|
||||||
@ -2976,157 +3028,55 @@ static int show(DBusConnection *bus, char **args) {
|
|||||||
/* If not argument is specified inspect the manager
|
/* If not argument is specified inspect the manager
|
||||||
* itself */
|
* itself */
|
||||||
|
|
||||||
ret = show_one(args[0], bus, "/org/freedesktop/systemd1", show_properties, &new_line);
|
return show_one(args[0], bus, "/org/freedesktop/systemd1", show_properties, &new_line);
|
||||||
goto finish;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
STRV_FOREACH(name, args+1) {
|
STRV_FOREACH(name, args+1) {
|
||||||
const char *path = NULL;
|
|
||||||
uint32_t id;
|
uint32_t id;
|
||||||
|
|
||||||
if (safe_atou32(*name, &id) < 0) {
|
if (safe_atou32(*name, &id) < 0) {
|
||||||
|
|
||||||
/* Interpret as unit name */
|
/* Interpret as unit name */
|
||||||
|
|
||||||
if (!(m = dbus_message_new_method_call(
|
char *e, *p;
|
||||||
"org.freedesktop.systemd1",
|
e = bus_path_escape(*name);
|
||||||
"/org/freedesktop/systemd1",
|
if (!e)
|
||||||
"org.freedesktop.systemd1.Manager",
|
return -ENOMEM;
|
||||||
"LoadUnit"))) {
|
p = strappend("/org/freedesktop/systemd1/unit/", e);
|
||||||
log_error("Could not allocate message.");
|
free(e);
|
||||||
ret = -ENOMEM;
|
if (!p)
|
||||||
goto finish;
|
return -ENOMEM;
|
||||||
}
|
|
||||||
|
|
||||||
if (!dbus_message_append_args(m,
|
r = show_one(args[0], bus, p, show_properties, &new_line);
|
||||||
DBUS_TYPE_STRING, name,
|
free(p);
|
||||||
DBUS_TYPE_INVALID)) {
|
|
||||||
log_error("Could not append arguments to message.");
|
|
||||||
ret = -ENOMEM;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
|
if (r != 0)
|
||||||
|
ret = r;
|
||||||
if (!dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED)) {
|
|
||||||
log_error("Failed to issue method call: %s", bus_error_message(&error));
|
|
||||||
ret = -EIO;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
|
|
||||||
dbus_error_free(&error);
|
|
||||||
|
|
||||||
dbus_message_unref(m);
|
|
||||||
if (!(m = dbus_message_new_method_call(
|
|
||||||
"org.freedesktop.systemd1",
|
|
||||||
"/org/freedesktop/systemd1",
|
|
||||||
"org.freedesktop.systemd1.Manager",
|
|
||||||
"GetUnit"))) {
|
|
||||||
log_error("Could not allocate message.");
|
|
||||||
ret = -ENOMEM;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!dbus_message_append_args(m,
|
|
||||||
DBUS_TYPE_STRING, name,
|
|
||||||
DBUS_TYPE_INVALID)) {
|
|
||||||
log_error("Could not append arguments to message.");
|
|
||||||
ret = -ENOMEM;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
|
|
||||||
log_error("Failed to issue method call: %s", bus_error_message(&error));
|
|
||||||
|
|
||||||
if (dbus_error_has_name(&error, BUS_ERROR_NO_SUCH_UNIT))
|
|
||||||
ret = 4; /* According to LSB: "program or service status is unknown" */
|
|
||||||
else
|
|
||||||
ret = -EIO;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (show_properties) {
|
} else if (show_properties) {
|
||||||
|
|
||||||
/* Interpret as job id */
|
/* Interpret as job id */
|
||||||
|
|
||||||
if (!(m = dbus_message_new_method_call(
|
char *p;
|
||||||
"org.freedesktop.systemd1",
|
if (asprintf(&p, "/org/freedesktop/systemd1/job/%u", id) < 0)
|
||||||
"/org/freedesktop/systemd1",
|
return -ENOMEM;
|
||||||
"org.freedesktop.systemd1.Manager",
|
|
||||||
"GetJob"))) {
|
|
||||||
log_error("Could not allocate message.");
|
|
||||||
ret = -ENOMEM;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!dbus_message_append_args(m,
|
r = show_one(args[0], bus, p, show_properties, &new_line);
|
||||||
DBUS_TYPE_UINT32, &id,
|
free(p);
|
||||||
DBUS_TYPE_INVALID)) {
|
|
||||||
log_error("Could not append arguments to message.");
|
if (r != 0)
|
||||||
ret = -ENOMEM;
|
ret = r;
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
|
|
||||||
log_error("Failed to issue method call: %s", bus_error_message(&error));
|
|
||||||
ret = -EIO;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
/* Interpret as PID */
|
/* Interpret as PID */
|
||||||
|
|
||||||
if (!(m = dbus_message_new_method_call(
|
r = show_one_by_pid(args[0], bus, id, &new_line);
|
||||||
"org.freedesktop.systemd1",
|
if (r != 0)
|
||||||
"/org/freedesktop/systemd1",
|
ret = r;
|
||||||
"org.freedesktop.systemd1.Manager",
|
|
||||||
"GetUnitByPID"))) {
|
|
||||||
log_error("Could not allocate message.");
|
|
||||||
ret = -ENOMEM;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!dbus_message_append_args(m,
|
|
||||||
DBUS_TYPE_UINT32, &id,
|
|
||||||
DBUS_TYPE_INVALID)) {
|
|
||||||
log_error("Could not append arguments to message.");
|
|
||||||
ret = -ENOMEM;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
|
|
||||||
log_error("Failed to issue method call: %s", bus_error_message(&error));
|
|
||||||
ret = -EIO;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dbus_message_get_args(reply, &error,
|
|
||||||
DBUS_TYPE_OBJECT_PATH, &path,
|
|
||||||
DBUS_TYPE_INVALID)) {
|
|
||||||
log_error("Failed to parse reply: %s", bus_error_message(&error));
|
|
||||||
ret = -EIO;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((r = show_one(args[0], bus, path, show_properties, &new_line)) != 0)
|
|
||||||
ret = r;
|
|
||||||
|
|
||||||
dbus_message_unref(m);
|
|
||||||
dbus_message_unref(reply);
|
|
||||||
m = reply = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
finish:
|
|
||||||
if (m)
|
|
||||||
dbus_message_unref(m);
|
|
||||||
|
|
||||||
if (reply)
|
|
||||||
dbus_message_unref(reply);
|
|
||||||
|
|
||||||
dbus_error_free(&error);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user