Attachment 914407 Details for Bug 1106457 – Systemd patch based on upstream tree

[patch] Systemd patch based on upstream tree

systemd_errno.patch (text/plain), 5.92 KB, created by Miguel Angel Ajo on 2014-07-03 08:48:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Angel Ajo

Created: 2014-07-03 08:48:10 UTC

Size: 5.92 KB

patch

obsolete

>diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
>index ecbadd7..df29764 100644
>--- a/src/core/dbus-execute.c
>+++ b/src/core/dbus-execute.c
>@@ -657,7 +657,7 @@ static int append_exec_command(sd_bus_message *reply, ExecCommand *c) {
>         if (!c->path)
>                 return 0;
> 
>-        r = sd_bus_message_open_container(reply, 'r', "sasbttttuii");
>+        r = sd_bus_message_open_container(reply, 'r', "sasbttttuiii");
>         if (r < 0)
>                 return r;
> 
>@@ -669,7 +669,7 @@ static int append_exec_command(sd_bus_message *reply, ExecCommand *c) {
>         if (r < 0)
>                 return r;
> 
>-        r = sd_bus_message_append(reply, "bttttuii",
>+        r = sd_bus_message_append(reply, "bttttuiii",
>                                   c->ignore,
>                                   c->exec_status.start_timestamp.realtime,
>                                   c->exec_status.start_timestamp.monotonic,
>@@ -677,7 +677,8 @@ static int append_exec_command(sd_bus_message *reply, ExecCommand *c) {
>                                   c->exec_status.exit_timestamp.monotonic,
>                                   (uint32_t) c->exec_status.pid,
>                                   (int32_t) c->exec_status.code,
>-                                  (int32_t) c->exec_status.status);
>+                                  (int32_t) c->exec_status.status,
>+                                  (int32_t) c->exec_status.errno_code);
>         if (r < 0)
>                 return r;
> 
>@@ -699,7 +700,7 @@ int bus_property_get_exec_command(
>         assert(bus);
>         assert(reply);
> 
>-        r = sd_bus_message_open_container(reply, 'a', "(sasbttttuii)");
>+        r = sd_bus_message_open_container(reply, 'a', "(sasbttttuiii)");
>         if (r < 0)
>                 return r;
> 
>@@ -725,7 +726,7 @@ int bus_property_get_exec_command_list(
>         assert(bus);
>         assert(reply);
> 
>-        r = sd_bus_message_open_container(reply, 'a', "(sasbttttuii)");
>+        r = sd_bus_message_open_container(reply, 'a', "(sasbttttuiii)");
>         if (r < 0)
>                 return r;
> 
>diff --git a/src/core/dbus-execute.h b/src/core/dbus-execute.h
>index e4c2d5d..61ed34d 100644
>--- a/src/core/dbus-execute.h
>+++ b/src/core/dbus-execute.h
>@@ -29,13 +29,14 @@
>         BUS_PROPERTY_DUAL_TIMESTAMP(prefix "ExitTimestamp", (offset) + offsetof(ExecStatus, exit_timestamp), flags), \
>         SD_BUS_PROPERTY(prefix "PID", "u", bus_property_get_pid, (offset) + offsetof(ExecStatus, pid), flags), \
>         SD_BUS_PROPERTY(prefix "Code", "i", bus_property_get_int, (offset) + offsetof(ExecStatus, code), flags), \
>-        SD_BUS_PROPERTY(prefix "Status", "i", bus_property_get_int, (offset) + offsetof(ExecStatus, status), flags)
>+        SD_BUS_PROPERTY(prefix "Status", "i", bus_property_get_int, (offset) + offsetof(ExecStatus, status), flags), \
>+        SD_BUS_PROPERTY(prefix "ERRNO", "i", bus_property_get_int, (offset) + offsetof(ExecStatus, errno_code), flags)
> 
> #define BUS_EXEC_COMMAND_VTABLE(name, offset, flags)                    \
>-        SD_BUS_PROPERTY(name, "a(sasbttttuii)", bus_property_get_exec_command, offset, flags)
>+        SD_BUS_PROPERTY(name, "a(sasbttttuiii)", bus_property_get_exec_command, offset, flags)
> 
> #define BUS_EXEC_COMMAND_LIST_VTABLE(name, offset, flags)                    \
>-        SD_BUS_PROPERTY(name, "a(sasbttttuii)", bus_property_get_exec_command_list, offset, flags)
>+        SD_BUS_PROPERTY(name, "a(sasbttttuiii)", bus_property_get_exec_command_list, offset, flags)
> 
> extern const sd_bus_vtable bus_exec_vtable[];
> 
>diff --git a/src/core/execute.c b/src/core/execute.c
>index 1ea6463..e30ec95 100644
>--- a/src/core/execute.c
>+++ b/src/core/execute.c
>@@ -2421,6 +2421,11 @@ void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix) {
>                         prefix, format_timestamp(buf, sizeof(buf), s->exit_timestamp.realtime),
>                         prefix, sigchld_code_to_string(s->code),
>                         prefix, s->status);
>+
>+        if (s->errno_code != 0)
>+                fprintf(f,
>+                        "%sErrno Code: %i\n",
>+                        prefix, s->errno_code);
> }
> 
> char *exec_command_line(char **argv) {
>diff --git a/src/core/execute.h b/src/core/execute.h
>index 9d05d3a..1c8efd8 100644
>--- a/src/core/execute.h
>+++ b/src/core/execute.h
>@@ -72,6 +72,7 @@ struct ExecStatus {
>         pid_t pid;
>         int code;     /* as in siginfo_t::si_code */
>         int status;   /* as in sigingo_t::si_status */
>+        int errno_code;    /* ERRNO message from NOTIFY_SOCKET interface */
> };
> 
> struct ExecCommand {
>diff --git a/src/core/service.c b/src/core/service.c
>index 10dc79c..4e4dc21 100644
>--- a/src/core/service.c
>+++ b/src/core/service.c
>@@ -2565,6 +2565,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
>         Service *s = SERVICE(u);
>         const char *e;
>         bool notify_dbus = false;
>+        int errno_code;
> 
>         assert(u);
> 
>@@ -2604,6 +2605,24 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
>                 }
>         }
> 
>+        /* Interpret ERRNO= */
>+        if ((e = strv_find_prefix(tags, "ERRNO=")) &&
>+            (s->state == SERVICE_START ||
>+             s->state == SERVICE_START_POST ||
>+             s->state == SERVICE_RUNNING ||
>+             s->state == SERVICE_RELOAD)) {
>+
>+                if (safe_atoi(e + 6, &errno_code) < 0)
>+                        log_warning_unit(u->id,
>+                                         "Failed to parse notification message %s", e);
>+                else {
>+                        log_debug_unit(u->id,
>+                                       "%s: got %s", u->id, e);
>+                        s->main_exec_status.errno_code = errno_code;
>+                        notify_dbus = true;
>+                }
>+        }
>+
>         /* Interpret READY= */
>         if (s->type == SERVICE_NOTIFY && s->state == SERVICE_START && strv_find(tags, "READY=1")) {
>                 log_debug_unit(u->id, "%s: got READY=1", u->id);

Actions: View | Diff

Attachments on bug 1106457: 910807 | 910809 | 910810 | 913408 | 914407