summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-04-12 01:57:53 +0200
committerLennart Poettering <lennart@poettering.net>2013-04-12 01:57:53 +0200
commitacb5a3cb20d075782e088362d4ec9aa9f3996d90 (patch)
treeb9ec82bf6de0c438c02e2d1eee5cc56a9f7a60a4
parent8323bc1f907ff558df5ccd6bdf1e14debed5cf2e (diff)
bus: parse and expose kdbus message timestamps
-rw-r--r--src/libsystemd-bus/bus-kernel.c5
-rw-r--r--src/libsystemd-bus/bus-message.c13
-rw-r--r--src/libsystemd-bus/bus-message.h1
-rw-r--r--src/systemd/sd-bus.h1
4 files changed, 20 insertions, 0 deletions
diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c
index 3d26f16cda..1b2297fbb4 100644
--- a/src/libsystemd-bus/bus-kernel.c
+++ b/src/libsystemd-bus/bus-kernel.c
@@ -225,6 +225,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess
struct bus_header *h = NULL;
size_t total, n_bytes = 0, idx = 0;
struct kdbus_creds *creds = NULL;
+ uint64_t nsec = 0;
int r;
assert(bus);
@@ -266,6 +267,8 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess
} else if (d->type == KDBUS_MSG_SRC_CREDS)
creds = &d->creds;
+ else if (d->type == KDBUS_MSG_TIMESTAMP)
+ nsec = d->ts_ns;
}
if (!h)
@@ -313,6 +316,8 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess
m->uid_valid = m->gid_valid = true;
}
+ m->timestamp = nsec / NSEC_PER_USEC;
+
r = bus_message_parse_fields(m);
if (r < 0) {
sd_bus_message_unref(m);
diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c
index aac49f486e..467b519039 100644
--- a/src/libsystemd-bus/bus-message.c
+++ b/src/libsystemd-bus/bus-message.c
@@ -709,6 +709,17 @@ const char *sd_bus_message_get_label(sd_bus_message *m) {
return m->label;
}
+int sd_bus_message_get_timestamp(sd_bus_message *m, uint64_t *usec) {
+ if (!m)
+ return -EINVAL;
+
+ if (m->timestamp <= 0)
+ return -ENOENT;
+
+ *usec = m->timestamp;
+ return 0;
+}
+
int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member) {
if (!m)
return -EINVAL;
@@ -2922,6 +2933,8 @@ int bus_message_dump(sd_bus_message *m) {
printf("\tgid=%lu\n", (unsigned long) m->gid);
if (m->pid_starttime != 0)
printf("\tpid_starttime=%llu\n", (unsigned long long) m->pid_starttime);
+ if (m->timestamp)
+ printf("\ttimestamp=%llu\n", (unsigned long long) m->timestamp);
r = sd_bus_message_rewind(m, true);
if (r < 0) {
diff --git a/src/libsystemd-bus/bus-message.h b/src/libsystemd-bus/bus-message.h
index 079a188787..c501325b12 100644
--- a/src/libsystemd-bus/bus-message.h
+++ b/src/libsystemd-bus/bus-message.h
@@ -68,6 +68,7 @@ struct sd_bus_message {
pid_t pid;
pid_t tid;
usec_t pid_starttime;
+ usec_t timestamp;
bool sealed:1;
bool dont_send:1;
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 4ab5924e7d..91445bb62d 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -127,6 +127,7 @@ int sd_bus_message_get_pid(sd_bus_message *m, pid_t *pid);
int sd_bus_message_get_tid(sd_bus_message *m, pid_t *tid);
int sd_bus_message_get_pid_starttime(sd_bus_message *m, uint64_t *usec);
const char *sd_bus_message_get_label(sd_bus_message *m);
+int sd_bus_message_get_timestamp(sd_bus_message *m, uint64_t *usec);
int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member);
int sd_bus_message_is_method_call(sd_bus_message *m, const char *interface, const char *member);