circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-08-28 16:01:09 +01:00
parent 84eabb2658 b0940bdf54
commit 486421ceff
10 changed files with 75 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
session.c
View File

@ -32,6 +32,8 @@ struct session_groups session_groups;
void session_free(int, short, void *);
void session_lock_timer(int, short, void *);
struct winlink *session_next_alert(struct winlink *);
struct winlink *session_previous_alert(struct winlink *);
@ -107,14 +109,10 @@ session_create(const char *name, int argc, char **argv, const char *path,
struct session *s;
struct winlink *wl;
s = xmalloc(sizeof *s);
s = xcalloc(1, sizeof *s);
s->references = 1;
s->flags = 0;
if (gettimeofday(&s->creation_time, NULL) != 0)
fatal("gettimeofday failed");
session_update_activity(s);
s->cwd = dup(cwd);
s->curw = NULL;
@ -132,6 +130,10 @@ session_create(const char *name, int argc, char **argv, const char *path,
memcpy(s->tio, tio, sizeof *s->tio);
}
if (gettimeofday(&s->creation_time, NULL) != 0)
fatal("gettimeofday failed");
session_update_activity(s, &s->creation_time);
s->sx = sx;
s->sy = sy;
@ -148,6 +150,10 @@ session_create(const char *name, int argc, char **argv, const char *path,
}
RB_INSERT(sessions, &sessions, s);
if (gettimeofday(&s->creation_time, NULL) != 0)
fatal("gettimeofday failed");
session_update_activity(s, &s->creation_time);
if (argc >= 0) {
wl = session_new(s, NULL, argc, argv, path, cwd, idx, cause);
if (wl == NULL) {
@ -182,8 +188,10 @@ session_free(unused int fd, unused short events, void *arg)
log_debug("sesson %s freed (%d references)", s->name, s->references);
if (s->references == 0)
if (s->references == 0) {
free(s->name);
free(s);
}
}
/* Destroy a session. */
@ -199,6 +207,9 @@ session_destroy(struct session *s)
free(s->tio);
if (event_initialized(&s->lock_timer))
event_del(&s->lock_timer);
session_group_remove(s);
environ_free(&s->environ);
options_free(&s->options);
@ -223,12 +234,46 @@ session_check_name(const char *name)
return (*name != '\0' && name[strcspn(name, ":.")] == '\0');
}
/* Update session active time. */
/* Lock session if it has timed out. */
void
session_update_activity(struct session *s)
session_lock_timer(unused int fd, unused short events, void *arg)
{
if (gettimeofday(&s->activity_time, NULL) != 0)
fatal("gettimeofday");
struct session *s = arg;
if (s->flags & SESSION_UNATTACHED)
return;
log_debug("session %s locked, activity time %lld", s->name,
(long long)s->activity_time.tv_sec);
server_lock_session(s);
recalculate_sizes();
}
/* Update activity time. */
void
session_update_activity(struct session *s, struct timeval *from)
{
struct timeval *last = &s->last_activity_time;
struct timeval tv;
memcpy(last, &s->activity_time, sizeof *last);
if (from == NULL)
gettimeofday(&s->activity_time, NULL);
else
memcpy(&s->activity_time, from, sizeof s->activity_time);
if (evtimer_initialized(&s->lock_timer))
evtimer_del(&s->lock_timer);
else
evtimer_set(&s->lock_timer, session_lock_timer, s);
if (~s->flags & SESSION_UNATTACHED) {
timerclear(&tv);
tv.tv_sec = options_get_number(&s->options, "lock-after-time");
if (tv.tv_sec != 0)
evtimer_add(&s->lock_timer, &tv);
}
}
/* Find the next usable session. */