[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 02/10] tests/vhost-user-bridge: add client mode
From: |
Marc-André Lureau |
Subject: |
Re: [Qemu-devel] [PATCH 02/10] tests/vhost-user-bridge: add client mode |
Date: |
Thu, 9 Jun 2016 12:11:45 +0200 |
Hi
On Thu, Jun 9, 2016 at 11:53 AM, Victor Kaplansky <address@hidden> wrote:
> On Mon, Jun 06, 2016 at 06:45:00PM +0200, address@hidden wrote:
>> From: Marc-André Lureau <address@hidden>
>>
>> If -c is specified, vubr will try to connect to the socket instead of
>> listening for connections.
>>
>> Signed-off-by: Marc-André Lureau <address@hidden>
>> Tested-by: Yuanhan Liu <address@hidden>
>> Reviewed-by: Yuanhan Liu <address@hidden>
>> ---
>> tests/vhost-user-bridge.c | 38 ++++++++++++++++++++++++++------------
>> 1 file changed, 26 insertions(+), 12 deletions(-)
>>
>> diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c
>> index 0779ba2..f907ce7 100644
>> --- a/tests/vhost-user-bridge.c
>> +++ b/tests/vhost-user-bridge.c
>> @@ -1204,12 +1204,13 @@ vubr_accept_cb(int sock, void *ctx)
>> }
>>
>> static VubrDev *
>> -vubr_new(const char *path)
>> +vubr_new(const char *path, bool client)
>> {
>> VubrDev *dev = (VubrDev *) calloc(1, sizeof(VubrDev));
>> dev->nregions = 0;
>> int i;
>> struct sockaddr_un un;
>> + CallbackFunc cb;
>> size_t len;
>>
>> for (i = 0; i < MAX_NR_VIRTQUEUE; i++) {
>> @@ -1238,19 +1239,27 @@ vubr_new(const char *path)
>> un.sun_family = AF_UNIX;
>> strcpy(un.sun_path, path);
>> len = sizeof(un.sun_family) + strlen(path);
>> - unlink(path);
>>
>> - if (bind(dev->sock, (struct sockaddr *) &un, len) == -1) {
>> - vubr_die("bind");
>> - }
>> + if (!client) {
>> + unlink(path);
>> +
>> + if (bind(dev->sock, (struct sockaddr *) &un, len) == -1) {
>> + vubr_die("bind");
>> + }
>>
>> - if (listen(dev->sock, 1) == -1) {
>> - vubr_die("listen");
>> + if (listen(dev->sock, 1) == -1) {
>> + vubr_die("listen");
>> + }
>> + cb = vubr_accept_cb;
>> + } else {
>> + if (connect(dev->sock, (struct sockaddr *)&un, len) == -1) {
>> + vubr_die("connect");
>> + }
>> + cb = vubr_receive_cb;
>> }
>>
>> dispatcher_init(&dev->dispatcher);
>> - dispatcher_add(&dev->dispatcher, dev->sock, (void *)dev,
>> - vubr_accept_cb);
>> + dispatcher_add(&dev->dispatcher, dev->sock, (void *)dev, cb);
>>
>> DPRINT("Waiting for connections on UNIX socket %s ...\n", path);
>
> I think this message should be issued only for server mode.
That should improve this patch:
diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c
index 38963e4..36b3cd8 100644
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@ -1258,6 +1258,8 @@ vubr_new(const char *path, bool client)
vubr_die("listen");
}
cb = vubr_accept_cb;
+
+ DPRINT("Waiting for connections on UNIX socket %s ...\n", path);
} else {
if (connect(dev->sock, (struct sockaddr *)&un, len) == -1) {
vubr_die("connect");
@@ -1268,7 +1270,6 @@ vubr_new(const char *path, bool client)
dispatcher_init(&dev->dispatcher);
dispatcher_add(&dev->dispatcher, dev->sock, (void *)dev, cb);
- DPRINT("Waiting for connections on UNIX socket %s ...\n", path);
return dev;
}
@@ -1427,13 +1428,14 @@ main(int argc, char *argv[])
out:
fprintf(stderr, "Usage: %s ", argv[0]);
- fprintf(stderr, "[-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]\n");
+ fprintf(stderr, "[-c] [-u ud_socket_path] [-l lhost:lport] [-r
rhost:rport]\n");
fprintf(stderr, "\t-u path to unix doman socket. default: %s\n",
DEFAULT_UD_SOCKET);
fprintf(stderr, "\t-l local host and port. default: %s:%s\n",
DEFAULT_LHOST, DEFAULT_LPORT);
fprintf(stderr, "\t-r remote host and port. default: %s:%s\n",
DEFAULT_RHOST, DEFAULT_RPORT);
+ fprintf(stderr, "\t-c client mode\n");
return 1;
}
--
Marc-André Lureau
- [Qemu-devel] [PATCH 00/10] vhost-user: simple reconnection support, marcandre . lureau, 2016/06/06
- [Qemu-devel] [PATCH 01/10] vhost-user: add ability to know vhost-user backend disconnection, marcandre . lureau, 2016/06/06
- [Qemu-devel] [PATCH 03/10] tests/vhost-user-bridge: workaround stale vring base, marcandre . lureau, 2016/06/06
- [Qemu-devel] [PATCH 02/10] tests/vhost-user-bridge: add client mode, marcandre . lureau, 2016/06/06
- [Qemu-devel] [PATCH 04/10] qemu-char: add qemu_chr_disconnect to close a fd accepted by listen fd, marcandre . lureau, 2016/06/06
- [Qemu-devel] [PATCH 05/10] vhost-user: disconnect on start failure, marcandre . lureau, 2016/06/06
- [Qemu-devel] [PATCH 07/10] vhost-net: save & restore vhost-user acked features, marcandre . lureau, 2016/06/06
- [Qemu-devel] [PATCH 06/10] vhost-net: do not crash if backend is not present, marcandre . lureau, 2016/06/06
- [Qemu-devel] [PATCH 08/10] vhost-net: save & restore vring enable state, marcandre . lureau, 2016/06/06
- [Qemu-devel] [PATCH 09/10] tests: append i386 tests, marcandre . lureau, 2016/06/06
- [Qemu-devel] [PATCH 10/10] test: start vhost-user reconnect test, marcandre . lureau, 2016/06/06
- Re: [Qemu-devel] [PATCH 00/10] vhost-user: simple reconnection support, Victor Kaplansky, 2016/06/09