Sync OpenBSD patchset 806:

Store sessions in an RB tree by name rather than a list, this is tidier
and allows them to easily be shown sorted in various lists
(list-sessions/choose-sessions).

Keep a session index which is used in a couple of places internally but
make it an ever-increasing number rather than filling in gaps with new
sessions.
This commit is contained in:
Tiago Cunha
2010-12-22 15:36:44 +00:00
parent 9f3399da00
commit a373235106
12 changed files with 155 additions and 195 deletions

12
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.590 2010-12-22 15:31:56 tcunha Exp $ */
/* $Id: tmux.h,v 1.591 2010-12-22 15:36:44 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -928,6 +928,8 @@ struct session_group {
TAILQ_HEAD(session_groups, session_group);
struct session {
u_int idx;
char *name;
char *cwd;
@ -955,8 +957,10 @@ struct session {
int references;
TAILQ_ENTRY(session) gentry;
RB_ENTRY(session) entry;
};
ARRAY_DECL(sessions, struct session *);
RB_HEAD(sessions, session);
ARRAY_DECL(sessionslist, struct session *);
/* TTY information. */
struct tty_key {
@ -1965,13 +1969,15 @@ void clear_signals(int);
extern struct sessions sessions;
extern struct sessions dead_sessions;
extern struct session_groups session_groups;
int session_cmp(struct session *, struct session *);
RB_PROTOTYPE(sessions, session, entry, session_cmp);
int session_alive(struct session *);
struct session *session_find(const char *);
struct session *session_find_by_index(u_int);
struct session *session_create(const char *, const char *, const char *,
struct environ *, struct termios *, int, u_int, u_int,
char **);
void session_destroy(struct session *);
int session_index(struct session *, u_int *);
struct session *session_next_session(struct session *);
struct session *session_previous_session(struct session *);
struct winlink *session_new(struct session *,