From bee17719d8212fa3ff87b4059727849bd3c807b2 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 8 Nov 2009 23:09:36 +0000 Subject: Sync OpenBSD patchset 503: Don't reenlist the client imsg event every loop, instead have a small function to it and call it after the event triggers or after a imsg is added. --- server.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'server.c') diff --git a/server.c b/server.c index 300019ca..d40366f5 100644 --- a/server.c +++ b/server.c @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.221 2009-11-08 23:06:25 tcunha Exp $ */ +/* $Id: server.c,v 1.222 2009-11-08 23:09:36 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -164,11 +164,11 @@ server_start(char *path) setproctitle("server (%s)", rpathbuf); #endif + event_init(); + server_fd = server_create_socket(); server_client_create(pair[1]); - event_init(); - if (access(SYSTEM_CFG, R_OK) == 0) { if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0) goto error; @@ -219,8 +219,6 @@ server_loop(void) while (!server_should_shutdown()) { server_update_socket(); - server_client_prepare(); - event_loopexit(&tv); event_loop(EVLOOP_ONCE); -- cgit