summaryrefslogtreecommitdiffstats
path: root/server.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-11-04 21:04:43 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-11-04 21:04:43 +0000
commit4d6091379b4486b624070492d45ad390e7442382 (patch)
treee22d1b401b804b13a9cafe71d459a55fdbf376dc /server.c
parentea8c8c5f33e0dcbf563dc54615a6c172aea70518 (diff)
Switch jobs over to use a bufferevent.
Diffstat (limited to 'server.c')
-rw-r--r--server.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/server.c b/server.c
index 236cd201..680ac93f 100644
--- a/server.c
+++ b/server.c
@@ -214,14 +214,12 @@ server_loop(void)
while (!server_should_shutdown()) {
server_update_socket();
- server_job_prepare();
server_window_prepare();
server_client_prepare();
event_loopexit(&tv);
event_loop(EVLOOP_ONCE);
- server_job_loop();
server_window_loop();
server_client_loop();
@@ -470,8 +468,8 @@ server_child_exited(pid_t pid, int status)
SLIST_FOREACH(job, &all_jobs, lentry) {
if (pid == job->pid) {
- job->pid = -1;
- job->status = status;
+ job_died(job, status); /* might free job */
+ break;
}
}
}