chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: document socket units
[elogind.git]
/
src
/
execute.c
diff --git
a/src/execute.c
b/src/execute.c
index 28baeedcfc44c9ca3c359ef28ff26390a57dc198..cf71f232b421635c7705d019c2b3b788bef47f70 100644
(file)
--- a/
src/execute.c
+++ b/
src/execute.c
@@
-1213,7
+1213,7
@@
int exec_spawn(ExecCommand *command,
}
if (n_fds > 0)
}
if (n_fds > 0)
- if (asprintf(our_env + n_env++, "LISTEN_PID=%l
lu", (unsigned long
long) getpid()) < 0 ||
+ if (asprintf(our_env + n_env++, "LISTEN_PID=%l
u", (unsigned
long) getpid()) < 0 ||
asprintf(our_env + n_env++, "LISTEN_FDS=%u", n_fds) < 0) {
r = EXIT_MEMORY;
goto fail;
asprintf(our_env + n_env++, "LISTEN_FDS=%u", n_fds) < 0) {
r = EXIT_MEMORY;
goto fail;
@@
-1270,10
+1270,10
@@
int exec_spawn(ExecCommand *command,
if (cgroup_bondings)
cgroup_bonding_install_list(cgroup_bondings, pid);
if (cgroup_bondings)
cgroup_bonding_install_list(cgroup_bondings, pid);
- log_debug("Forked %s as %l
lu", command->path, (unsigned long
long) pid);
+ log_debug("Forked %s as %l
u", command->path, (unsigned
long) pid);
command->exec_status.pid = pid;
command->exec_status.pid = pid;
-
command->exec_status.start_timestamp = now(CLOCK_REALTIME
);
+
dual_timestamp_get(&command->exec_status.start_timestamp
);
*ret = pid;
return 0;
*ret = pid;
return 0;
@@
-1553,7
+1553,7
@@
void exec_status_fill(ExecStatus *s, pid_t pid, int code, int status) {
assert(s);
s->pid = pid;
assert(s);
s->pid = pid;
-
s->exit_timestamp = now(CLOCK_REALTIME
);
+
dual_timestamp_get(&s->exit_timestamp
);
s->code = code;
s->status = status;
s->code = code;
s->status = status;
@@
-1572,20
+1572,20
@@
void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix) {
return;
fprintf(f,
return;
fprintf(f,
- "%sPID: %l
l
u\n",
- prefix, (unsigned long
long
) s->pid);
+ "%sPID: %lu\n",
+ prefix, (unsigned long) s->pid);
- if (s->start_timestamp > 0)
+ if (s->start_timestamp
.realtime
> 0)
fprintf(f,
"%sStart Timestamp: %s\n",
fprintf(f,
"%sStart Timestamp: %s\n",
- prefix, format_timestamp(buf, sizeof(buf), s->start_timestamp));
+ prefix, format_timestamp(buf, sizeof(buf), s->start_timestamp
.realtime
));
- if (s->exit_timestamp > 0)
+ if (s->exit_timestamp
.realtime
> 0)
fprintf(f,
"%sExit Timestamp: %s\n"
"%sExit Code: %s\n"
"%sExit Status: %i\n",
fprintf(f,
"%sExit Timestamp: %s\n"
"%sExit Code: %s\n"
"%sExit Status: %i\n",
- prefix, format_timestamp(buf, sizeof(buf), s->exit_timestamp),
+ prefix, format_timestamp(buf, sizeof(buf), s->exit_timestamp
.realtime
),
prefix, sigchld_code_to_string(s->code),
prefix, s->status);
}
prefix, sigchld_code_to_string(s->code),
prefix, s->status);
}