chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: make sure %m resolves to the specified error in bus_error_set_errnofv()
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
test-bus-kernel-benchmark.c
diff --git
a/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
b/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
index 04627d9a779475b700ca193782e1a9a1fa390cbb..35f87e91bd9c927f7420dc91eb1dcc7ebeb9adaa 100644
(file)
--- a/
src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
+++ b/
src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
@@
-33,7
+33,7
@@
#include "bus-internal.h"
#include "bus-util.h"
#include "bus-internal.h"
#include "bus-util.h"
-#define MAX_SIZE (
4
*1024*1024)
+#define MAX_SIZE (
2
*1024*1024)
static usec_t arg_loop_usec = 100 * USEC_PER_MSEC;
static usec_t arg_loop_usec = 100 * USEC_PER_MSEC;
@@
-47,7
+47,7
@@
static void server(sd_bus *b, size_t *result) {
assert_se(r >= 0);
if (r == 0)
assert_se(r >= 0);
if (r == 0)
- assert_se(sd_bus_wait(b,
(usec_t) -1
) >= 0);
+ assert_se(sd_bus_wait(b,
USEC_INFINITY
) >= 0);
if (!m)
continue;
if (!m)
continue;
@@
-77,7
+77,7
@@
static void transaction(sd_bus *b, size_t sz) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
uint8_t *p;
_cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
uint8_t *p;
- assert_se(sd_bus_message_new_method_call(b,
":1.1", "/", "benchmark.server", "Work", &m
) >= 0);
+ assert_se(sd_bus_message_new_method_call(b,
&m, ":1.1", "/", "benchmark.server", "Work"
) >= 0);
assert_se(sd_bus_message_append_array_space(m, 'y', sz, (void**) &p) >= 0);
memset(p, 0x80, sz);
assert_se(sd_bus_message_append_array_space(m, 'y', sz, (void**) &p) >= 0);
memset(p, 0x80, sz);
@@
-151,7
+151,7
@@
static void client_bisect(const char *address) {
}
b->use_memfd = 1;
}
b->use_memfd = 1;
- assert_se(sd_bus_message_new_method_call(b,
":1.1", "/", "benchmark.server", "Exit", &x
) >= 0);
+ assert_se(sd_bus_message_new_method_call(b,
&x, ":1.1", "/", "benchmark.server", "Exit"
) >= 0);
assert_se(sd_bus_message_append(x, "t", csize) >= 0);
assert_se(sd_bus_send(b, x, NULL) >= 0);
assert_se(sd_bus_message_append(x, "t", csize) >= 0);
assert_se(sd_bus_send(b, x, NULL) >= 0);
@@
-207,7
+207,7
@@
static void client_chart(const char *address) {
}
b->use_memfd = 1;
}
b->use_memfd = 1;
- assert_se(sd_bus_message_new_method_call(b,
":1.1", "/", "benchmark.server", "Exit", &x
) >= 0);
+ assert_se(sd_bus_message_new_method_call(b,
&x, ":1.1", "/", "benchmark.server", "Exit"
) >= 0);
assert_se(sd_bus_message_append(x, "t", csize) >= 0);
assert_se(sd_bus_send(b, x, NULL) >= 0);
assert_se(sd_bus_message_append(x, "t", csize) >= 0);
assert_se(sd_bus_send(b, x, NULL) >= 0);
@@
-270,7
+270,7
@@
int main(int argc, char *argv[]) {
CPU_SET(0, &cpuset);
pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
CPU_SET(0, &cpuset);
pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
-
close_nointr_nofail
(bus_ref);
+
safe_close
(bus_ref);
sd_bus_unref(b);
switch (mode) {
sd_bus_unref(b);
switch (mode) {