diff options
author | Tiago Cunha <tcunha@gmx.com> | 2009-11-08 22:56:04 +0000 |
---|---|---|
committer | Tiago Cunha <tcunha@gmx.com> | 2009-11-08 22:56:04 +0000 |
commit | 53ef4c2babc3d4bf8df16ba6bbd596d0b9a8240b (patch) | |
tree | 286476b1c81ce35d95e0cedce4dee1a728bfa5fb /server.c | |
parent | 5116aaa51a6059904a6b8ae75bffa77c95ceb41a (diff) |
Sync OpenBSD patchset 493:
Switch jobs over to use a bufferevent.
Diffstat (limited to 'server.c')
-rw-r--r-- | server.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.217 2009-11-08 22:40:36 tcunha Exp $ */ +/* $Id: server.c,v 1.218 2009-11-08 22:56:04 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -218,14 +218,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(); @@ -474,8 +472,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; } } } |