All of lore.kernel.org
 help / color / mirror / Atom feed
From: mwilck@suse.com
To: Christophe Varoqui <christophe.varoqui@opensvc.com>,
	Benjamin Marzinski <bmarzins@redhat.com>
Cc: lixiaokeng@huawei.com, Chongyun Wu <wu.chongyun@h3c.com>,
	dm-devel@redhat.com, Martin Wilck <mwilck@suse.com>
Subject: [dm-devel] [PATCH v3 18/35] multipathd: uxlsnr: data structure for stateful client connection
Date: Sat, 27 Nov 2021 16:19:11 +0100	[thread overview]
Message-ID: <20211127151929.7727-19-mwilck@suse.com> (raw)
In-Reply-To: <20211127151929.7727-1-mwilck@suse.com>

From: Martin Wilck <mwilck@suse.com>

Currently the uxlsnr handles each client request (receive requset -
handle request - respond) in a single loop iteration. This has
severe disadvantages. In particular, the code may wait in poll()
called from read_all(), or wait for the vecs lock, while other
clients are ready to be serviced or signals to be handled.

This patch adds some fields to "struct client" which will be used
by later patches to change this into a state machine that basically
waits only in place, the ppoll() call in uxsock_listen().

For now, we just introduce and initialize the fields.

Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 multipathd/uxlsnr.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/multipathd/uxlsnr.c b/multipathd/uxlsnr.c
index 7bbec29..38a9d97 100644
--- a/multipathd/uxlsnr.c
+++ b/multipathd/uxlsnr.c
@@ -39,10 +39,30 @@
 #include "main.h"
 #include "cli.h"
 #include "uxlsnr.h"
+#include "strbuf.h"
+
+/* state of client connection */
+enum {
+	CLT_RECV,
+	CLT_PARSE,
+	CLT_LOCKED_WORK,
+	CLT_WORK,
+	CLT_SEND,
+};
 
 struct client {
 	struct list_head node;
+	struct timespec expires;
+	int state;
 	int fd;
+	vector cmdvec;
+	/* NUL byte at end */
+	char cmd[_MAX_CMD_LEN + 1];
+	struct strbuf reply;
+	struct handler *handler;
+	size_t cmd_len, len;
+	int error;
+	bool is_root;
 };
 
 /* Indices for array of poll fds */
@@ -110,6 +130,7 @@ static void new_client(int ux_sock)
 	}
 	INIT_LIST_HEAD(&c->node);
 	c->fd = fd;
+	c->state = CLT_RECV;
 
 	/* put it in our linked list */
 	pthread_mutex_lock(&client_lock);
@@ -125,6 +146,9 @@ static void _dead_client(struct client *c)
 	int fd = c->fd;
 	list_del_init(&c->node);
 	c->fd = -1;
+	reset_strbuf(&c->reply);
+	if (c->cmdvec)
+		free_keys(c->cmdvec);
 	free(c);
 	close(fd);
 }
-- 
2.33.1


--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel


  parent reply	other threads:[~2021-11-27 15:20 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-27 15:18 [dm-devel] [PATCH v3 00/35] multipathd: uxlsnr overhaul mwilck
2021-11-27 15:18 ` [dm-devel] [PATCH v3 01/35] libmultipath: add timespeccmp() utility function mwilck
2021-11-27 15:18 ` [dm-devel] [PATCH v3 02/35] libmultipath: add trylock() helper mwilck
2021-11-27 15:18 ` [dm-devel] [PATCH v3 03/35] libmultipath: add optional wakeup functionality to lock.c mwilck
2021-11-27 15:18 ` [dm-devel] [PATCH v3 04/35] libmultipath: print: add __snprint_config() mwilck
2021-11-27 15:18 ` [dm-devel] [PATCH v3 05/35] libmultipath: improve cleanup of uevent queues on exit mwilck
2021-11-27 15:18 ` [dm-devel] [PATCH v3 06/35] multipathd: fix systemd notification when stopping while reloading mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 07/35] multipathd: improve delayed reconfigure mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 08/35] multipathd: cli.h: formatting improvements mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 09/35] multipathd: cli_del_map: fix reply for delayed action mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 10/35] multipathd: add prototype for cli_handler functions mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 11/35] multipathd: make all cli_handlers static mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 12/35] multipathd: add and set cli_handlers in a single step mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 13/35] multipathd: cli.c: use ESRCH for "command not found" mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 14/35] multipathd: uxlsnr: avoid stalled clients during reconfigure mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 15/35] multipathd: uxlsnr: handle client HUP mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 16/35] multipathd: uxlsnr: use symbolic values for pollfd indices mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 17/35] multipathd: uxlsnr: avoid using fd -1 in ppoll() mwilck
2021-11-27 15:19 ` mwilck [this message]
2021-11-27 15:19 ` [dm-devel] [PATCH v3 19/35] multipathd: move uxsock_trigger() to uxlsnr.c mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 20/35] multipathd: move parse_cmd() " mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 21/35] multipathd: uxlsnr: remove check_timeout() mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 22/35] multipathd: uxlsnr: move client handling to separate function mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 23/35] multipathd: uxlsnr: use main poll loop for receiving mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 24/35] multipathd: use strbuf in cli_handler functions mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 25/35] multipathd: uxlsnr: check root on connection startup mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 26/35] multipathd: uxlsnr: pass struct client to uxsock_trigger() and parse_cmd() mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 27/35] multipathd: uxlsnr: move handler execution to separate function mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 28/35] multipathd: uxlsnr: use parser to determine non-root commands mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 29/35] multipathd: uxlsnr: merge uxsock_trigger() into state machine mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 30/35] multipathd: uxlsnr: add idle notification mwilck
2021-11-29 20:16   ` Benjamin Marzinski
2021-11-27 15:19 ` [dm-devel] [PATCH v3 31/35] multipathd: uxlsnr: add timeout handling mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 31/35] rmultipathd: " mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 32/35] multipathd: uxlsnr: use poll loop for sending, too mwilck
2021-11-29 20:29   ` Benjamin Marzinski
2021-11-29 20:57     ` Martin Wilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 33/35] multipathd: uxlsnr: drop client_lock mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 34/35] multipathd: uxclt: allow client mode for non-root, too mwilck
2021-11-27 15:19 ` [dm-devel] [PATCH v3 35/35] multipathd: uxlsnr: use recv() for command length mwilck

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=20211127151929.7727-19-mwilck@suse.com \
    --to=mwilck@suse.com \
    --cc=bmarzins@redhat.com \
    --cc=christophe.varoqui@opensvc.com \
    --cc=dm-devel@redhat.com \
    --cc=lixiaokeng@huawei.com \
    --cc=wu.chongyun@h3c.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.