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

tests: Use different connections for read and write tests

Browse source 
The connection tests so far only use one connection at a time, but this
prepares for tests that use a connection on both sides of the socket.
This commit is contained in:
Kristian Høgsberg 2012-03-23 11:32:17 -04:00
parent 1c5578e87f
commit f67f6395b1
1 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

58
tests/connection-test.c
View file

@ -140,12 +140,40 @@ TEST(connection_queue)
} }
struct marshal_data { struct marshal_data {
struct wl_connection *connection; struct wl_connection *read_connection;
struct wl_connection *write_connection;
int s[2]; int s[2];
uint32_t mask; uint32_t read_mask;
uint32_t write_mask;
uint32_t buffer[10]; uint32_t buffer[10];
}; };
static void
setup_marshal_data(struct marshal_data *data)
{
assert(socketpair(AF_UNIX,
SOCK_STREAM | SOCK_CLOEXEC, 0, data->s) == 0);
data->read_connection =
wl_connection_create(data->s[0],
update_func, &data->read_mask);
assert(data->read_connection);
assert(data->read_mask == WL_CONNECTION_READABLE);
data->write_connection =
wl_connection_create(data->s[1],
update_func, &data->write_mask);
assert(data->write_connection);
assert(data->write_mask == WL_CONNECTION_READABLE);
}
static void
release_marshal_data(struct marshal_data *data)
{
wl_connection_destroy(data->read_connection);
wl_connection_destroy(data->write_connection);
}
static void static void
marshal(struct marshal_data *data, const char *format, int size, ...) marshal(struct marshal_data *data, const char *format, int size, ...)
{ {
@ -156,19 +184,19 @@ marshal(struct marshal_data *data, const char *format, int size, ...)
va_list ap; va_list ap;
va_start(ap, size); va_start(ap, size);
closure = wl_connection_vmarshal(data->connection, closure = wl_connection_vmarshal(data->write_connection,
&sender, opcode, ap, &message); &sender, opcode, ap, &message);
va_end(ap); va_end(ap);
assert(closure); assert(closure);
assert(wl_closure_send(closure, data->connection) == 0); assert(wl_closure_send(closure, data->write_connection) == 0);
wl_closure_destroy(closure); wl_closure_destroy(closure);
assert(data->mask == assert(data->write_mask ==
(WL_CONNECTION_WRITABLE | WL_CONNECTION_READABLE)); (WL_CONNECTION_WRITABLE | WL_CONNECTION_READABLE));
assert(wl_connection_data(data->connection, assert(wl_connection_data(data->write_connection,
WL_CONNECTION_WRITABLE) == 0); WL_CONNECTION_WRITABLE) == 0);
assert(data->mask == WL_CONNECTION_READABLE); assert(data->write_mask == WL_CONNECTION_READABLE);
assert(read(data->s[1], data->buffer, sizeof data->buffer) == size); assert(read(data->s[0], data->buffer, sizeof data->buffer) == size);
assert(data->buffer[0] == sender.id); assert(data->buffer[0] == sender.id);
assert(data->buffer[1] == (opcode | (size << 16))); assert(data->buffer[1] == (opcode | (size << 16)));
@ -181,7 +209,7 @@ TEST(connection_marshal)
struct wl_array array; struct wl_array array;
static const char text[] = "curry"; static const char text[] = "curry";
data.connection = setup(data.s, &data.mask); setup_marshal_data(&data);
marshal(&data, "i", 12, 42); marshal(&data, "i", 12, 42);
assert(data.buffer[2] == 42); assert(data.buffer[2] == 42);
@ -212,8 +240,7 @@ TEST(connection_marshal)
assert(data.buffer[2] == array.size); assert(data.buffer[2] == array.size);
assert(memcmp(&data.buffer[3], text, array.size) == 0); assert(memcmp(&data.buffer[3], text, array.size) == 0);
wl_connection_destroy(data.connection); release_marshal_data(&data);
close(data.s[1]);
} }
static void static void
@ -254,12 +281,12 @@ demarshal(struct marshal_data *data, const char *format,
int size = msg[1]; int size = msg[1];
assert(write(data->s[1], msg, size) == size); assert(write(data->s[1], msg, size) == size);
assert(wl_connection_data(data->connection, assert(wl_connection_data(data->read_connection,
WL_CONNECTION_READABLE) == size); WL_CONNECTION_READABLE) == size);
wl_map_init(&objects); wl_map_init(&objects);
object.id = msg[0]; object.id = msg[0];
closure = wl_connection_demarshal(data->connection, closure = wl_connection_demarshal(data->read_connection,
size, &objects, &message); size, &objects, &message);
wl_closure_invoke(closure, &object, func, msg); wl_closure_invoke(closure, &object, func, msg);
} }
@ -270,7 +297,7 @@ TEST(connection_demarshal)
uint32_t msg[10]; uint32_t msg[10];
static const char text[] = "superdude"; static const char text[] = "superdude";
data.connection = setup(data.s, &data.mask); setup_marshal_data(&data);
msg[0] = 400200; /* object id */ msg[0] = 400200; /* object id */
msg[1] = 12; /* size = 12, opcode = 0 */ msg[1] = 12; /* size = 12, opcode = 0 */
@ -288,6 +315,5 @@ TEST(connection_demarshal)
memcpy(&msg[3], text, msg[2]); memcpy(&msg[3], text, msg[2]);
demarshal(&data, "s", msg, (void *) validate_demarshal_s); demarshal(&data, "s", msg, (void *) validate_demarshal_s);
wl_connection_destroy(data.connection); release_marshal_data(&data);
close(data.s[1]);
} }