From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Oleinik, Alexander" <alxndr@bu.edu>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Cc: Laurent Vivier <lvivier@redhat.com>,
"pbonzini@redhat.com" <pbonzini@redhat.com>,
Thomas Huth <thuth@redhat.com>, "bsd@redhat.com" <bsd@redhat.com>,
"stefanha@redhat.com" <stefanha@redhat.com>
Subject: Re: [PATCH v6 05/21] libqtest: Add a layer of abstraciton to send/recv
Date: Fri, 3 Jan 2020 17:29:18 +0100 [thread overview]
Message-ID: <f82b43de-bead-a1d6-8ae7-83ab14ac1ef6@redhat.com> (raw)
In-Reply-To: <20191129213424.6290-6-alxndr@bu.edu>
Hi Aleksander,
Typo in patch subject: "abstraction"
On 11/29/19 10:34 PM, Oleinik, Alexander wrote:
> 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 Bulekov <alxndr@bu.edu>
> ---
> tests/libqtest.c | 50 +++++++++++++++++++++++++++++++++++++++---------
> 1 file changed, 41 insertions(+), 9 deletions(-)
>
> diff --git a/tests/libqtest.c b/tests/libqtest.c
> index 91e9cb220c..ac4b6ab5f0 100644
> --- a/tests/libqtest.c
> +++ b/tests/libqtest.c
> @@ -35,6 +35,17 @@
> #define SOCKET_TIMEOUT 50
> #define SOCKET_MAX_FDS 16
>
> +
> +typedef void (*QTestSendFn)(QTestState *s, const char *buf);
> +typedef void (*ExternalSendFn)(void *s, const char *buf);
> +typedef GString* (*QTestRecvFn)(QTestState *);
> +
> +typedef struct QTestClientTransportOps {
> + QTestSendFn send;
We use strlen() so we also send a send a string. Maybe rename it send_line?
Please add a comment here about what does each function handler in this
structure.
> + ExternalSendFn external_send;
Is external_send used? Apparently in patch #12. Can you add it there,
where it is used? I don't understand why we a "type-safe wrapper" is
called 'external'.
> + QTestRecvFn recv_line;
> +} QTestTransportOps;
> +
> struct QTestState
> {
> int fd;
> @@ -45,6 +56,7 @@ struct QTestState
> bool big_endian;
> bool irq_level[MAX_IRQ];
> GString *rx;
> + QTestTransportOps ops;
> };
>
> static GHookList abrt_hooks;
> @@ -52,6 +64,14 @@ static struct sigaction sigact_old;
>
> static int qtest_query_target_endianness(QTestState *s);
>
> +static void qtest_client_socket_send(QTestState*, const char *buf);
> +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, QTestSendFn send);
> +static void qtest_client_set_rx_handler(QTestState *s, QTestRecvFn recv);
> +
> 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 "
> @@ -379,13 +402,9 @@ 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)
> {
> - 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, strlen(buf));
> }
>
> static void GCC_FMT_ATTR(2, 3) qtest_sendf(QTestState *s, const char *fmt, ...)
> @@ -393,8 +412,11 @@ 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);
> +
> + s->ops.send(s, str);
> + g_free(str);
> }
>
> /* Sends a message and file descriptors to the socket.
> @@ -431,7 +453,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 +490,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);
>
> @@ -1337,3 +1359,13 @@ void qmp_assert_error_class(QDict *rsp, const char *class)
>
> qobject_unref(rsp);
> }
> +
> +static void qtest_client_set_tx_handler(QTestState *s,
> + QTestSendFn send)
> +{
> + s->ops.send = send;
> +}
> +static void qtest_client_set_rx_handler(QTestState *s, QTestRecvFn recv)
> +{
> + s->ops.recv_line = recv;
> +}
>
next prev parent reply other threads:[~2020-01-03 16:30 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 21:34 [PATCH v6 00/21] Add virtual device fuzzing support Oleinik, Alexander
2019-11-29 21:34 ` [PATCH v6 01/21] softmmu: split off vl.c:main() into main.c Oleinik, Alexander
2020-01-03 9:58 ` Stefan Hajnoczi
2020-01-05 19:17 ` Alexander Bulekov
2019-11-29 21:34 ` [PATCH v6 02/21] libqos: Rename i2c_send and i2c_recv Oleinik, Alexander
2019-12-09 12:02 ` Thomas Huth
2020-01-03 11:01 ` Philippe Mathieu-Daudé
2020-01-05 19:50 ` Alexander Bulekov
2020-01-03 9:58 ` Stefan Hajnoczi
2019-11-29 21:34 ` [PATCH v6 03/21] fuzz: Add FUZZ_TARGET module type Oleinik, Alexander
2019-11-29 21:34 ` [PATCH v6 04/21] qtest: add qtest_server_send abstraction Oleinik, Alexander
2019-12-09 14:37 ` Thomas Huth
2019-11-29 21:34 ` [PATCH v6 05/21] libqtest: Add a layer of abstraciton to send/recv Oleinik, Alexander
2020-01-03 11:19 ` Stefan Hajnoczi
2020-01-03 16:29 ` Philippe Mathieu-Daudé [this message]
2019-11-29 21:34 ` [PATCH v6 06/21] module: check module wasn't already initialized Oleinik, Alexander
2020-01-03 16:30 ` Philippe Mathieu-Daudé
2019-11-29 21:34 ` [PATCH v6 07/21] qtest: add in-process incoming command handler Oleinik, Alexander
2020-01-03 11:19 ` Stefan Hajnoczi
2019-11-29 21:34 ` [PATCH v6 08/21] tests: provide test variables to other targets Oleinik, Alexander
2020-01-03 10:51 ` Stefan Hajnoczi
2019-11-29 21:34 ` [PATCH v6 09/21] libqos: split qos-test and libqos makefile vars Oleinik, Alexander
2020-01-03 10:52 ` Stefan Hajnoczi
2020-01-03 16:32 ` Philippe Mathieu-Daudé
2019-11-29 21:34 ` [PATCH v6 10/21] libqos: move useful qos-test funcs to qos_external Oleinik, Alexander
2020-01-03 16:36 ` Philippe Mathieu-Daudé
2019-11-29 21:34 ` [PATCH v6 11/21] libqtest: make bufwrite rely on the TransportOps Oleinik, Alexander
2020-01-03 11:10 ` Stefan Hajnoczi
2020-01-03 16:45 ` Philippe Mathieu-Daudé
2020-01-15 20:38 ` Alexander Bulekov
2019-11-29 21:34 ` [PATCH v6 12/21] libqtest: add in-process qtest.c tx/rx handlers Oleinik, Alexander
2020-01-03 11:15 ` Stefan Hajnoczi
2020-01-05 19:55 ` Alexander Bulekov
2020-01-08 17:03 ` Stefan Hajnoczi
2019-11-29 21:34 ` [PATCH v6 14/21] fuzz: Add target/fuzz makefile rules Oleinik, Alexander
2020-01-03 11:18 ` Stefan Hajnoczi
2019-11-29 21:34 ` [PATCH v6 13/21] fuzz: add configure flag --enable-fuzzing Oleinik, Alexander
2020-01-03 16:48 ` Philippe Mathieu-Daudé
2019-11-29 21:34 ` [PATCH v6 15/21] fuzz: add fuzzer skeleton Oleinik, Alexander
2020-01-03 11:25 ` Stefan Hajnoczi
2019-11-29 21:34 ` [PATCH v6 16/21] fuzz: add support for fork-based fuzzing Oleinik, Alexander
2020-01-03 11:27 ` Stefan Hajnoczi
2019-11-29 21:34 ` [PATCH v6 17/21] fuzz: add support for qos-assisted fuzz targets Oleinik, Alexander
2020-01-03 11:28 ` Stefan Hajnoczi
2019-11-29 21:34 ` [PATCH v6 19/21] fuzz: add virtio-net fuzz target Oleinik, Alexander
2020-01-03 11:30 ` Stefan Hajnoczi
2019-11-29 21:34 ` [PATCH v6 18/21] fuzz: add i440fx fuzz targets Oleinik, Alexander
2019-11-29 21:34 ` [PATCH v6 20/21] fuzz: add virtio-scsi fuzz target Oleinik, Alexander
2020-01-03 11:30 ` Stefan Hajnoczi
2019-11-29 21:34 ` [PATCH v6 21/21] fuzz: add documentation to docs/devel/ Oleinik, Alexander
2020-01-03 11:31 ` Stefan Hajnoczi
2020-01-03 9:55 ` [PATCH v6 00/21] Add virtual device fuzzing support Stefan Hajnoczi
2020-01-03 11:33 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f82b43de-bead-a1d6-8ae7-83ab14ac1ef6@redhat.com \
--to=philmd@redhat.com \
--cc=alxndr@bu.edu \
--cc=bsd@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).