circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-13 23:58:51 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 379:

Browse Source 
Put all jobs on a global all_jobs list and use that in server.c instead of
running through all the clients.
This commit is contained in:
Tiago Cunha 2009-10-12 00:12:33 +00:00
parent 256a55b33b
commit d7fa9bc056
3 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
job.c
View File

@ -1,4 +1,4 @@
/* $Id: job.c,v 1.2 2009-10-11 23:59:34 tcunha Exp $ */ /* $Id: job.c,v 1.3 2009-10-12 00:12:32 tcunha Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -29,6 +29,9 @@
* output. * output.
*/ */
/* All jobs list. */
struct joblist all_jobs = SLIST_HEAD_INITIALIZER(&all_jobs);
RB_GENERATE(jobs, job, entry, job_cmp); RB_GENERATE(jobs, job, entry, job_cmp);
int int
@ -66,6 +69,7 @@ job_tree_free(struct jobs *jobs)
while (!RB_EMPTY(jobs)) { while (!RB_EMPTY(jobs)) {
job = RB_ROOT(jobs); job = RB_ROOT(jobs);
RB_REMOVE(jobs, jobs, job); RB_REMOVE(jobs, jobs, job);
SLIST_REMOVE(&all_jobs, job, job, lentry);
job_free(job); job_free(job);
} }
} }
@ -89,6 +93,7 @@ job_add(struct jobs *jobs, struct client *c, const char *cmd,
job = xmalloc(sizeof *job); job = xmalloc(sizeof *job);
job->cmd = xstrdup(cmd); job->cmd = xstrdup(cmd);
job->pid = -1;
job->client = c; job->client = c;
@ -100,6 +105,7 @@ job_add(struct jobs *jobs, struct client *c, const char *cmd,
job->data = data; job->data = data;
RB_INSERT(jobs, jobs, job); RB_INSERT(jobs, jobs, job);
SLIST_INSERT_HEAD(&all_jobs, job, lentry);
return (job); return (job);
} }

40
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.200 2009-10-11 23:55:26 tcunha Exp $ */ /* $Id: server.c,v 1.201 2009-10-12 00:12:32 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -72,9 +72,7 @@ void server_handle_windows(void);
void server_fill_clients(void); void server_fill_clients(void);
void server_handle_clients(void); void server_handle_clients(void);
void server_fill_jobs(void); void server_fill_jobs(void);
void server_fill_jobs1(struct jobs *);
void server_handle_jobs(void); void server_handle_jobs(void);
void server_handle_jobs1(struct jobs *);
void server_accept_client(int); void server_accept_client(int);
void server_handle_client(struct client *); void server_handle_client(struct client *);
void server_handle_window(struct window *, struct window_pane *); void server_handle_window(struct window *, struct window_pane *);
@ -417,11 +415,7 @@ server_main(int srv_fd)
/* Set window names. */ /* Set window names. */
set_window_names(); set_window_names();
/* /* Handle window and client sockets. */
* Handle window and client sockets. Clients can create
* windows, so windows must come first to avoid messing up by
* increasing the array size.
*/
server_handle_jobs(); server_handle_jobs();
server_handle_windows(); server_handle_windows();
server_handle_clients(); server_handle_clients();
@ -766,23 +760,10 @@ server_fill_clients(void)
/* Fill in job fds. */ /* Fill in job fds. */
void void
server_fill_jobs(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; struct job *job;
RB_FOREACH(job, jobs, jobs) { SLIST_FOREACH(job, &all_jobs, lentry) {
if (job->fd == -1) if (job->fd == -1)
continue; continue;
server_poll_add(job->fd, POLLIN); server_poll_add(job->fd, POLLIN);
@ -792,24 +773,11 @@ server_fill_jobs1(struct jobs *jobs)
/* Handle job fds. */ /* Handle job fds. */
void void
server_handle_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 job *job;
struct pollfd *pfd; struct pollfd *pfd;
RB_FOREACH(job, jobs, jobs) { SLIST_FOREACH(job, &all_jobs, lentry) {
if (job->fd == -1) if (job->fd == -1)
continue; continue;
if ((pfd = server_poll_lookup(job->fd)) == NULL) if ((pfd = server_poll_lookup(job->fd)) == NULL)

6
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.465 2009-10-12 00:08:12 tcunha Exp $ */ /* $Id: tmux.h,v 1.466 2009-10-12 00:12:33 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -576,8 +576,10 @@ struct job {
void *data; void *data;
RB_ENTRY(job) entry; RB_ENTRY(job) entry;
SLIST_ENTRY(job) lentry;
}; };
RB_HEAD(jobs, job); RB_HEAD(jobs, job);
SLIST_HEAD(joblist, job);
/* Screen selection. */ /* Screen selection. */
struct screen_sel { struct screen_sel {
@ -1197,7 +1199,7 @@ struct options_entry *options_set_data(
void *options_get_data(struct options *, const char *); void *options_get_data(struct options *, const char *);
/* job.c */ /* job.c */
extern struct jobs jobs_tree; extern struct joblist all_jobs;
int job_cmp(struct job *, struct job *); int job_cmp(struct job *, struct job *);
RB_PROTOTYPE(jobs, job, entry, job_cmp); RB_PROTOTYPE(jobs, job, entry, job_cmp);
void job_tree_init(struct jobs *); void job_tree_init(struct jobs *);