summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-queue.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2016-10-15 00:01:01 +0000
committernicm <nicm@openbsd.org>2016-10-15 00:01:01 +0000
commit10b426e0d8142a54ee59afeb8d59c2f810b0ac0f (patch)
tree30204a9bc4a5f513e37152dba04ee18cb477d64f /usr.bin/tmux/cmd-queue.c
parentfix typo (diff)
downloadwireguard-openbsd-10b426e0d8142a54ee59afeb8d59c2f810b0ac0f.tar.xz
wireguard-openbsd-10b426e0d8142a54ee59afeb8d59c2f810b0ac0f.zip
Drain notifys once at the end of the server loop instead of doing it
from the end of every command queue (which could be nested).
Diffstat (limited to 'usr.bin/tmux/cmd-queue.c')
-rw-r--r--usr.bin/tmux/cmd-queue.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c
index 1c5e08dfffb..7fc277e84b4 100644
--- a/usr.bin/tmux/cmd-queue.c
+++ b/usr.bin/tmux/cmd-queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.41 2016/10/14 18:41:53 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.42 2016/10/15 00:01:01 nicm Exp $ */
/*
* Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -248,10 +248,8 @@ cmdq_continue(struct cmd_q *cmdq)
enum cmd_retval retval;
int empty;
- cmdq->references++;
- notify_disable();
-
log_debug("continuing cmdq %p: flags %#x (%p)", cmdq, cmdq->flags, c);
+ cmdq->references++;
empty = TAILQ_EMPTY(&cmdq->queue);
if (empty)
@@ -296,9 +294,7 @@ empty:
empty = 1;
out:
- notify_enable();
cmdq_free(cmdq);
-
return (empty);
}