chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: introduce UID_INVALID (and friends) as macro for (uid_t) -1
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
test-bus-zero-copy.c
diff --git
a/src/libsystemd/sd-bus/test-bus-zero-copy.c
b/src/libsystemd/sd-bus/test-bus-zero-copy.c
index 29e40aa0afd234379e7f61f7e34a804dd2f4fcea..2cc671b16d16932be0d316cb8f91ac2a622f4f27 100644
(file)
--- a/
src/libsystemd/sd-bus/test-bus-zero-copy.c
+++ b/
src/libsystemd/sd-bus/test-bus-zero-copy.c
@@
-24,9
+24,9
@@
#include "util.h"
#include "log.h"
#include "util.h"
#include "log.h"
+#include "memfd-util.h"
#include "sd-bus.h"
#include "sd-bus.h"
-#include "sd-memfd.h"
#include "bus-message.h"
#include "bus-error.h"
#include "bus-kernel.h"
#include "bus-message.h"
#include "bus-error.h"
#include "bus-kernel.h"
@@
-43,7
+43,7
@@
int main(int argc, char *argv[]) {
sd_bus *a, *b;
int r, bus_ref;
sd_bus_message *m;
sd_bus *a, *b;
int r, bus_ref;
sd_bus_message *m;
-
sd_memfd *
f;
+
int
f;
uint64_t sz;
uint32_t u32;
size_t i, l;
uint64_t sz;
uint32_t u32;
size_t i, l;
@@
-93,8
+93,8
@@
int main(int argc, char *argv[]) {
memset(p+1, 'L', FIRST_ARRAY-2);
p[FIRST_ARRAY-1] = '>';
memset(p+1, 'L', FIRST_ARRAY-2);
p[FIRST_ARRAY-1] = '>';
-
r = sd_memfd_new_and_map(&f,
NULL, STRING_SIZE, (void**) &s);
- assert_se(
r
>= 0);
+
f = memfd_new_and_map(
NULL, STRING_SIZE, (void**) &s);
+ assert_se(
f
>= 0);
s[0] = '<';
for (i = 1; i < STRING_SIZE-2; i++)
s[0] = '<';
for (i = 1; i < STRING_SIZE-2; i++)
@@
-103,31
+103,31
@@
int main(int argc, char *argv[]) {
s[STRING_SIZE-1] = 0;
munmap(s, STRING_SIZE);
s[STRING_SIZE-1] = 0;
munmap(s, STRING_SIZE);
- r =
sd_
memfd_get_size(f, &sz);
+ r = memfd_get_size(f, &sz);
assert_se(r >= 0);
assert_se(sz == STRING_SIZE);
r = sd_bus_message_append_string_memfd(m, f);
assert_se(r >= 0);
assert_se(r >= 0);
assert_se(sz == STRING_SIZE);
r = sd_bus_message_append_string_memfd(m, f);
assert_se(r >= 0);
-
sd_memfd_fre
e(f);
+
clos
e(f);
-
r = sd_memfd_new_and_map(&f,
NULL, SECOND_ARRAY, (void**) &p);
- assert_se(
r
>= 0);
+
f = memfd_new_and_map(
NULL, SECOND_ARRAY, (void**) &p);
+ assert_se(
f
>= 0);
p[0] = '<';
memset(p+1, 'P', SECOND_ARRAY-2);
p[SECOND_ARRAY-1] = '>';
munmap(p, SECOND_ARRAY);
p[0] = '<';
memset(p+1, 'P', SECOND_ARRAY-2);
p[SECOND_ARRAY-1] = '>';
munmap(p, SECOND_ARRAY);
- r =
sd_
memfd_get_size(f, &sz);
+ r = memfd_get_size(f, &sz);
assert_se(r >= 0);
assert_se(sz == SECOND_ARRAY);
r = sd_bus_message_append_array_memfd(m, 'y', f);
assert_se(r >= 0);
assert_se(r >= 0);
assert_se(sz == SECOND_ARRAY);
r = sd_bus_message_append_array_memfd(m, 'y', f);
assert_se(r >= 0);
-
sd_memfd_fre
e(f);
+
clos
e(f);
r = sd_bus_message_close_container(m);
assert_se(r >= 0);
r = sd_bus_message_close_container(m);
assert_se(r >= 0);
@@
-138,7
+138,7
@@
int main(int argc, char *argv[]) {
r = bus_message_seal(m, 55, 99*USEC_PER_SEC);
assert_se(r >= 0);
r = bus_message_seal(m, 55, 99*USEC_PER_SEC);
assert_se(r >= 0);
- bus_message_dump(m, stdout,
true
);
+ bus_message_dump(m, stdout,
BUS_MESSAGE_DUMP_WITH_HEADER
);
r = sd_bus_send(b, m, NULL);
assert_se(r >= 0);
r = sd_bus_send(b, m, NULL);
assert_se(r >= 0);
@@
-148,7
+148,7
@@
int main(int argc, char *argv[]) {
r = sd_bus_process(a, &m);
assert_se(r > 0);
r = sd_bus_process(a, &m);
assert_se(r > 0);
- bus_message_dump(m, stdout,
true
);
+ bus_message_dump(m, stdout,
BUS_MESSAGE_DUMP_WITH_HEADER
);
sd_bus_message_rewind(m, true);
r = sd_bus_message_enter_container(m, 'r', "aysay");
sd_bus_message_rewind(m, true);
r = sd_bus_message_enter_container(m, 'r', "aysay");