From a4b4b299875d833019cb829ca1bee41d71724f37 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 16 Sep 2015 22:24:54 +0000
Subject: Rename cmd_q dead flag to a general flags bitmask (will be more flags
 later).

---
 cmd-queue.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'cmd-queue.c')

diff --git a/cmd-queue.c b/cmd-queue.c
index af987f59..217045fa 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -35,7 +35,7 @@ cmdq_new(struct client *c)
 
 	cmdq = xcalloc(1, sizeof *cmdq);
 	cmdq->references = 1;
-	cmdq->dead = 0;
+	cmdq->flags = 0;
 
 	cmdq->client = c;
 	cmdq->client_exit = -1;
@@ -51,8 +51,11 @@ cmdq_new(struct client *c)
 int
 cmdq_free(struct cmd_q *cmdq)
 {
-	if (--cmdq->references != 0)
-		return (cmdq->dead);
+	if (--cmdq->references != 0) {
+		if (cmdq->flags & CMD_Q_DEAD)
+			return (1);
+		return (0);
+	}
 
 	cmdq_flush(cmdq);
 	free(cmdq);
-- 
cgit 


From c1d0b6a6eed2fd393ea30d257ce147e8f6b5e6c8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 16 Sep 2015 22:41:00 +0000
Subject: Log when cmdq_continue is called.

---
 cmd-queue.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'cmd-queue.c')

diff --git a/cmd-queue.c b/cmd-queue.c
index 217045fa..1fe34dce 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -195,6 +195,7 @@ cmdq_continue_one(struct cmd_q *cmdq)
 int
 cmdq_continue(struct cmd_q *cmdq)
 {
+	struct client           *c = cmdq->client;
 	struct cmd_q_item	*next;
 	enum cmd_retval		 retval;
 	int			 empty;
@@ -202,6 +203,9 @@ cmdq_continue(struct cmd_q *cmdq)
 	cmdq->references++;
 	notify_disable();
 
+	log_debug("continuing cmdq %p: flags=%#x, client=%d", cmdq, cmdq->flags,
+	    c != NULL ? c->ibuf.fd : -1);
+
 	empty = TAILQ_EMPTY(&cmdq->queue);
 	if (empty)
 		goto empty;
-- 
cgit