mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-31 22:25:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

connection: Move closure object out of wl_connection

Browse source
This commit is contained in:
Kristian Høgsberg 2012-04-22 13:49:35 -04:00
parent 0d6dea17b4
commit 1901d66ffc
6 changed files with 96 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/Makefile.am
View file

@ -29,7 +29,7 @@ os_wrappers_test_SOURCES = \
../src/wayland-os.c \
$(test_runner_src)
AM_CFLAGS = $(GCC_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS)
LDADD = $(top_builddir)/src/libwayland-util.la \
$(top_builddir)/src/libwayland-server.la \
-lrt -ldl $(FFI_LIBS)

44
tests/connection-test.c
View file

@ -185,20 +185,20 @@ release_marshal_data(struct marshal_data *data)
static void
marshal(struct marshal_data *data, const char *format, int size, ...)
{
struct wl_closure *closure;
struct wl_closure closure;
static const uint32_t opcode = 4444;
static struct wl_object sender = { NULL, NULL, 1234 };
struct wl_message message = { "test", format, NULL };
va_list ap;
int ret;
va_start(ap, size);
closure = wl_connection_vmarshal(data->write_connection,
&sender, opcode, ap, &message);
ret = wl_closure_vmarshal(&closure, &sender, opcode, ap, &message);
va_end(ap);
assert(closure);
assert(wl_closure_send(closure, data->write_connection) == 0);
wl_closure_destroy(closure);
assert(ret == 0);
assert(wl_closure_send(&closure, data->write_connection) == 0);
wl_closure_destroy(&closure);
assert(data->write_mask ==
(WL_CONNECTION_WRITABLE | WL_CONNECTION_READABLE));
assert(wl_connection_data(data->write_connection,
@ -292,10 +292,10 @@ demarshal(struct marshal_data *data, const char *format,
uint32_t *msg, void (*func)(void))
{
struct wl_message message = { "test", format, NULL };
struct wl_closure *closure;
struct wl_closure closure;
struct wl_map objects;
struct wl_object object;
int size = msg[1];
int size = msg[1], ret;
assert(write(data->s[1], msg, size) == size);
assert(wl_connection_data(data->read_connection,
@ -303,9 +303,10 @@ demarshal(struct marshal_data *data, const char *format,
wl_map_init(&objects);
object.id = msg[0];
closure = wl_connection_demarshal(data->read_connection,
size, &objects, &message);
wl_closure_invoke(closure, &object, func, data);
ret = wl_connection_demarshal(data->read_connection,
&closure, size, &objects, &message);
assert(ret == 0);
wl_closure_invoke(&closure, &object, func, data);
}
TEST(connection_demarshal)
@ -341,7 +342,7 @@ static void
marshal_demarshal(struct marshal_data *data,
void (*func)(void), int size, const char *format, ...)
{
struct wl_closure *closure;
struct wl_closure closure;
static const int opcode = 4444;
static struct wl_object sender = { NULL, NULL, 1234 };
struct wl_message message = { "test", format, NULL };
@ -349,15 +350,15 @@ marshal_demarshal(struct marshal_data *data,
struct wl_object object;
va_list ap;
uint32_t msg[1] = { 1234 };
int ret;
va_start(ap, format);
closure = wl_connection_vmarshal(data->write_connection,
&sender, opcode, ap, &message);
ret = wl_closure_vmarshal(&closure, &sender, opcode, ap, &message);
va_end(ap);
assert(closure);
assert(wl_closure_send(closure, data->write_connection) == 0);
wl_closure_destroy(closure);
assert(ret == 0);
assert(wl_closure_send(&closure, data->write_connection) == 0);
wl_closure_destroy(&closure);
assert(data->write_mask ==
(WL_CONNECTION_WRITABLE | WL_CONNECTION_READABLE));
assert(wl_connection_data(data->write_connection,
@ -369,11 +370,10 @@ marshal_demarshal(struct marshal_data *data,
wl_map_init(&objects);
object.id = msg[0];
closure = wl_connection_demarshal(data->read_connection,
size, &objects, &message);
wl_closure_invoke(closure, &object, func, data);
wl_closure_destroy(closure);
ret = wl_connection_demarshal(data->read_connection,
&closure, size, &objects, &message);
wl_closure_invoke(&closure, &object, func, data);
wl_closure_destroy(&closure);
}
TEST(connection_marshal_demarshal)