circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/1/head
Tiago Cunha 2009-11-08 23:09:36 +00:00
parent 0cd4f4e321
commit bee17719d8
4 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server-client.c
View File

@ -1,4 +1,4 @@
/* $Id: server-client.c,v 1.14 2009-11-08 22:58:37 tcunha Exp $ */
/* $Id: server-client.c,v 1.15 2009-11-08 23:09:36 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -60,6 +60,7 @@ server_client_create(int fd)
c = xcalloc(1, sizeof *c);
c->references = 0;
imsg_init(&c->ibuf, fd);
server_update_event(c);
if (gettimeofday(&c->creation_time, NULL) != 0)
fatal("gettimeofday failed");
@ -149,30 +150,6 @@ server_client_lost(struct client *c)
recalculate_sizes();
}
/* Register clients for poll. */
void
server_client_prepare(void)
{
struct client *c;
u_int i;
int events;
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
if ((c = ARRAY_ITEM(&clients, i)) == NULL)
continue;
events = 0;
if (!(c->flags & CLIENT_BAD))
events |= EV_READ;
if (c->ibuf.w.queued > 0)
events |= EV_WRITE;
event_del(&c->event);
event_set(&c->event,
c->ibuf.fd, events, server_client_callback, c);
event_add(&c->event, NULL);
}
}
/* Process a single client event. */
void
server_client_callback(int fd, short events, void *data)
@ -195,7 +172,8 @@ server_client_callback(int fd, short events, void *data)
if (events & EV_READ && server_client_msg_dispatch(c) != 0)
goto client_lost;
}
server_update_event(c);
return;
client_lost:

18
server-fn.c
View File

@ -1,4 +1,4 @@
/* $Id: server-fn.c,v 1.94 2009-10-12 00:37:41 tcunha Exp $ */
/* $Id: server-fn.c,v 1.95 2009-11-08 23:09:36 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -59,6 +59,7 @@ server_write_client(
return;
log_debug("writing %d to client %d", type, c->ibuf.fd);
imsg_compose(ibuf, type, PROTOCOL_VERSION, -1, -1, (void *) buf, len);
server_update_event(c);
}
void
@ -371,3 +372,18 @@ server_clear_identify(struct client *c)
server_redraw_client(c);
}
}
void
server_update_event(struct client *c)
{
short events;
events = 0;
if (!(c->flags & CLIENT_BAD))
events |= EV_READ;
if (c->ibuf.w.queued > 0)
events |= EV_WRITE;
event_del(&c->event);
event_set(&c->event, c->ibuf.fd, events, server_client_callback, c);
event_add(&c->event, NULL);
}

8
server.c
View File

@ -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 <nicm@users.sourceforge.net>
@ -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);

4
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.502 2009-11-08 23:05:36 tcunha Exp $ */
/* $Id: tmux.h,v 1.503 2009-11-08 23:09:36 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1563,7 +1563,6 @@ void server_signal_clear(void);
/* server-client.c */
void server_client_create(int);
void server_client_lost(struct client *);
void server_client_prepare(void);
void server_client_callback(int, short, void *);
void server_client_loop(void);
@ -1597,6 +1596,7 @@ void server_destroy_session_group(struct session *);
void server_destroy_session(struct session *);
void server_set_identify(struct client *);
void server_clear_identify(struct client *);
void server_update_event(struct client *);
/* status.c */
int status_redraw(struct client *);