From: Alexander Oleinik
This makes it simple to swap the transport functions for qtest commands
to and from the qtest client. For example, now it is possible to
directly pass qtest commands to a server handler that exists within the
same process, without the standard way of writing to a file descriptor.
Signed-off-by: Alexander Oleinik
---
tests/libqtest.c | 56 +++-
tests/libqtest.h | 1 -
2 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 3706bccd8d..822bfe208b 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -35,6 +35,13 @@
#define SOCKET_TIMEOUT 50
#define SOCKET_MAX_FDS 16
+
+typedef struct QTestClientTransportOps {
+void (*send)(QTestState* , const char*, size_t);
+
+GString* (*recv_line)(QTestState *);
+} QTestTransportOps;
+
struct QTestState
{
int fd;
@@ -45,6 +52,7 @@ struct QTestState
bool big_endian;
bool irq_level[MAX_IRQ];
GString *rx;
+QTestTransportOps ops;
};
static GHookList abrt_hooks;
@@ -52,6 +60,18 @@ static struct sigaction sigact_old;
static int qtest_query_target_endianness(QTestState *s);
+static void qtest_client_socket_send(QTestState*,
+const char *buf, size_t size);
+static void socket_send(int fd, const char *buf, size_t size);
+
+static GString *qtest_client_socket_recv_line(QTestState *);
+
+static void qtest_client_set_tx_handler(QTestState *s,
+void (*send)(QTestState*, const char *, size_t));
+static void qtest_client_set_rx_handler(QTestState *s,
+GString * (*recv)(QTestState *));
+
+
static int init_socket(const char *socket_path)
{
struct sockaddr_un addr;
@@ -234,6 +254,9 @@ QTestState *qtest_init_without_qmp_handshake(const char
*extra_args)
sock = init_socket(socket_path);
qmpsock = init_socket(qmp_socket_path);
+qtest_client_set_rx_handler(s, qtest_client_socket_recv_line);
+qtest_client_set_tx_handler(s, qtest_client_socket_send);
+
qtest_add_abrt_handler(kill_qemu_hook_func, s);
command = g_strdup_printf("exec %s "
@@ -360,6 +383,7 @@ void qtest_quit(QTestState *s)
g_free(s);
}
+
static void socket_send(int fd, const char *buf, size_t size)
{
size_t offset;
@@ -379,22 +403,23 @@ static void socket_send(int fd, const char *buf, size_t
size)
}
}
-static void socket_sendf(int fd, const char *fmt, va_list ap)
+static void qtest_client_socket_send(QTestState *s,
+ const char *buf, size_t size)
{
-gchar *str = g_strdup_vprintf(fmt, ap);
-size_t size = strlen(str);
-
-socket_send(fd, str, size);
-g_free(str);
+socket_send(s->fd, buf, size);
}
static void GCC_FMT_ATTR(2, 3) qtest_sendf(QTestState *s, const char *fmt, ...)
{
va_list ap;
-
va_start(ap, fmt);
-socket_sendf(s->fd, fmt, ap);
+gchar *str = g_strdup_vprintf(fmt, ap);
va_end(ap);
+
+size_t size = strlen(str);
+
+s->ops.send(s, str, size);
+g_free(str);
}
/* Sends a message and file descriptors to the socket.
@@ -431,7 +456,7 @@ static void socket_send_fds(int socket_fd, int *fds, size_t
fds_num,
g_assert_cmpint(ret, >, 0);
}
-static GString *qtest_recv_line(QTestState *s)
+static GString *qtest_client_socket_recv_line(QTestState *s)
{
GString *line;
size_t offset;
@@ -468,7 +493,7 @@ static gchar **qtest_rsp(QTestState *s, int expected_args)
int i;
redo:
-line = qtest_recv_line(s);
+line = s->ops.recv_line(s);
words = g_strsplit(line->str, " ", 0);
g_string_free(line, TRUE);
@@ -1336,3 +1361,14 @@ void qmp_assert_error_class(QDict *rsp, const char
*class)
qobject_unref(rsp);
}
+
+static void qtest_client_set_tx_handler(QTestState *s,
+void (*send)(QTestState*, const char*, size_t))
+{
+s->ops.send = send;
+}
+static void qtest_client_set_rx_handler(QTestState *s,
+GString* (*recv)(QTestState *))
+{
+s->ops.recv_line = recv;
+}
diff --git a/tests/libqtest.h b/tests/libqtest.h
index c9e21e05b3..31267fc915 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -728,5 +728,4 @@ bool qtest_probe_child(QTestState *s);
* Set expected exit status of the child.
*/
void qtest_set_expected_status(QTestState *s, int status);
-
#endif
--
2.23.0
