diff options
Diffstat (limited to 'server.c')
| -rw-r--r-- | server.c | 38 |
1 files changed, 3 insertions, 35 deletions
@@ -73,9 +73,7 @@ void server_handle_windows(void); void server_fill_clients(void); void server_handle_clients(void); void server_fill_jobs(void); -void server_fill_jobs1(struct jobs *); void server_handle_jobs(void); -void server_handle_jobs1(struct jobs *); void server_accept_client(int); void server_handle_client(struct client *); void server_handle_window(struct window *, struct window_pane *); @@ -414,11 +412,7 @@ server_main(int srv_fd) /* Set window names. */ set_window_names(); - /* - * Handle window and client sockets. Clients can create - * windows, so windows must come first to avoid messing up by - * increasing the array size. - */ + /* Handle window and client sockets. */ server_handle_jobs(); server_handle_windows(); server_handle_clients(); @@ -764,22 +758,9 @@ server_fill_clients(void) void server_fill_jobs(void) { - struct client *c; - u_int i; - - for (i = 0; i < ARRAY_LENGTH(&clients); i++) { - c = ARRAY_ITEM(&clients, i); - if (c != NULL) - server_fill_jobs1(&c->status_jobs); - } -} - -void -server_fill_jobs1(struct jobs *jobs) -{ struct job *job; - RB_FOREACH(job, jobs, jobs) { + SLIST_FOREACH(job, &all_jobs, lentry) { if (job->fd == -1) continue; server_poll_add(job->fd, POLLIN); @@ -790,23 +771,10 @@ server_fill_jobs1(struct jobs *jobs) void server_handle_jobs(void) { - struct client *c; - u_int i; - - for (i = 0; i < ARRAY_LENGTH(&clients); i++) { - c = ARRAY_ITEM(&clients, i); - if (c != NULL) - server_handle_jobs1(&c->status_jobs); - } -} - -void -server_handle_jobs1(struct jobs *jobs) -{ struct job *job; struct pollfd *pfd; - RB_FOREACH(job, jobs, jobs) { + SLIST_FOREACH(job, &all_jobs, lentry) { if (job->fd == -1) continue; if ((pfd = server_poll_lookup(job->fd)) == NULL) |