The branch, master has been updated
via f8c86a9515ae863fcbc38769544be983ce494a3c (commit)
via 2c9cddd8760300af8d9ee6f80662f89e43a8f2ce (commit)
from aaeee34c3250892c8a20e9c95efe66c1d0ec4be2 (commit)
- Log -----------------------------------------------------------------
commit f8c86a9515ae863fcbc38769544be983ce494a3c
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Add some additional debug logging.
---
cfg.c | 1 +
cmd-queue.c | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/cfg.c b/cfg.c
index 10cd5b4..1153de6 100644
--- a/cfg.c
+++ b/cfg.c
@@ -41,6 +41,7 @@ load_cfg(const char *path, struct cmd_q *cmdq, char **cause)
size_t len, oldlen;
struct cmd_list *cmdlist;
+ log_debug("loading %s", path);
if ((f = fopen(path, "rb")) == NULL) {
xasprintf(cause, "%s: %s", path, strerror(errno));
return (-1);
diff --git a/cmd-queue.c b/cmd-queue.c
index e5c8413..4b00fce 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -183,6 +183,7 @@ cmdq_continue(struct cmd_q *cmdq)
struct cmd_q_item *next;
enum cmd_retval retval;
int guards, empty;
+ char s[1024];
guards = 0;
if (c != NULL && c->session != NULL)
@@ -204,6 +205,10 @@ cmdq_continue(struct cmd_q *cmdq)
next = TAILQ_NEXT(cmdq->item, qentry);
while (cmdq->cmd != NULL) {
+ cmd_print(cmdq->cmd, s, sizeof s);
+ log_debug("cmdq %p: %s (client %d)", cmdq, s,
+ cmdq->client != NULL ? cmdq->client->ibuf.fd : -1);
+
if (guards)
cmdq_print(cmdq, "%%begin");
retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq);
commit 2c9cddd8760300af8d9ee6f80662f89e43a8f2ce
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Continue the parent cmdq after sourcing a file.
---
cmd-source-file.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cmd-source-file.c b/cmd-source-file.c
index 2528aac..827d4c0 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -98,10 +98,11 @@ cmd_source_file_done(struct cmd_q *cmdq1)
cmdq_free(cmdq1);
cfg_references--;
- if (cmdq_free(cmdq) || cfg_references != 0)
- return;
- cmd_source_file_show(cmdq);
+ if (cmdq_free(cmdq))
+ return;
+ if (cfg_references == 0)
+ cmd_source_file_show(cmdq);
cmdq_continue(cmdq);
}
-----------------------------------------------------------------------
Summary of changes:
cfg.c | 1 +
cmd-queue.c | 5 +++++
cmd-source-file.c | 7 ++++---
3 files changed, 10 insertions(+), 3 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
