From cc9ef11985305b29988ba34022d662f85771c765 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Fri, 23 Oct 2009 17:49:47 +0000
Subject: Sync OpenBSD patchset 438:

Split the server code handling clients, jobs and windows off into separate
files from server.c (merging server-msg.c into the client file) and rather than
iterating over each set after poll(), allow a callback to be specified when the
fd is added and just walk once over the returned pollfds calling each callback
where needed.

More to come, getting this in so it is tested.
---
 server-job.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 server-job.c

(limited to 'server-job.c')

diff --git a/server-job.c b/server-job.c
new file mode 100644
index 00000000..a3d4d0dd
--- /dev/null
+++ b/server-job.c
@@ -0,0 +1,57 @@
+/* $Id: server-job.c,v 1.1 2009-10-23 17:49:47 tcunha Exp $ */
+
+/*
+ * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include <unistd.h>
+
+#include "tmux.h"
+
+/* Process a single job event. */
+void
+server_job_callback(int fd, int events, void *data)
+{
+	struct job	*job = data;
+
+	if (job->fd == -1)
+		return;
+
+	if (buffer_poll(fd, events, job->out, NULL) != 0) {
+		close(job->fd);
+		job->fd = -1;
+	}
+}
+
+/* Job functions that happen once a loop. */
+void
+server_job_loop(void)
+{
+	struct job	*job;
+	
+restart:
+	SLIST_FOREACH(job, &all_jobs, lentry) {
+		if (job->flags & JOB_DONE || job->fd != -1 || job->pid != -1)
+			continue;
+		job->flags |= JOB_DONE;
+
+		if (job->callbackfn != NULL) {
+			job->callbackfn(job);
+			goto restart;	/* could be freed by callback */
+		}
+	}
+}
-- 
cgit