picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bus: add API for querying the kdbus message sequence number

This commit is contained in:
Lennart Poettering 2014-01-22 10:57:12 +01:00
parent d6f116a7b1
commit 6a0e376c1c
6 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libsystemd/libsystemd.sym
View File

@ -94,6 +94,7 @@ global:
sd_bus_message_get_errno;
sd_bus_message_get_monotonic_timestamp;
sd_bus_message_get_realtime_timestamp;
sd_bus_message_get_seqnum;
sd_bus_message_get_creds;
sd_bus_message_is_signal;
sd_bus_message_is_method_call;

4
src/libsystemd/sd-bus/bus-dump.c
View File

@ -100,8 +100,10 @@ int bus_message_dump(sd_bus_message *m, FILE *f, bool with_header) {
fprintf(f, " Monotonic=%llu", (unsigned long long) m->monotonic);
if (m->realtime != 0)
fprintf(f, " Realtime=%llu", (unsigned long long) m->realtime);
if (m->seqnum != 0)
fprintf(f, " SequenceNumber=%llu", (unsigned long long) m->seqnum);
if (m->monotonic != 0 || m->realtime != 0)
if (m->monotonic != 0 || m->realtime != 0 || m->seqnum != 0)
fputs("\n", f);
bus_creds_dump(&m->creds, f);

1
src/libsystemd/sd-bus/bus-kernel.c
View File

@ -501,6 +501,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
case KDBUS_ITEM_TIMESTAMP:
m->realtime = d->timestamp.realtime_ns / NSEC_PER_USEC;
m->monotonic = d->timestamp.monotonic_ns / NSEC_PER_USEC;
m->seqnum = d->timestamp.seqnum;
break;
case KDBUS_ITEM_PID_COMM:

9
src/libsystemd/sd-bus/bus-message.c
View File

@ -898,6 +898,15 @@ _public_ int sd_bus_message_get_realtime_timestamp(sd_bus_message *m, uint64_t *
return 0;
}
_public_ int sd_bus_message_get_seqnum(sd_bus_message *m, uint64_t *seqnum) {
assert_return(m, -EINVAL);
assert_return(seqnum, -EINVAL);
assert_return(m->seqnum > 0, -ENODATA);
*seqnum = m->seqnum;
return 0;
}
_public_ sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m) {
assert_return(m, NULL);

1
src/libsystemd/sd-bus/bus-message.h
View File

@ -98,6 +98,7 @@ struct sd_bus_message {
usec_t monotonic;
usec_t realtime;
uint64_t seqnum;
bool sealed:1;
bool dont_send:1;

2
src/systemd/sd-bus.h
View File

@ -202,6 +202,8 @@ int sd_bus_message_get_errno(sd_bus_message *m);
int sd_bus_message_get_monotonic_timestamp(sd_bus_message *m, uint64_t *usec);
int sd_bus_message_get_realtime_timestamp(sd_bus_message *m, uint64_t *usec);
int sd_bus_message_get_seqnum(sd_bus_message *m, uint64_t* seqnum);
sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m); /* do not unref the result */
int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member);