circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 483:

Browse Source 
Change session and client activity and creation time members to have more
meaningful names.

Also, remove the code to try and update the session activity time for the
command client when a command message is received as is pointless because it
des not have a session.
This commit is contained in:
Tiago Cunha
2009-11-04 22:42:31 +00:00
parent a090b78e8d
commit bbad75fb6c
7 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.215 2009-11-02 21:39:34 tcunha Exp $ */
/* $Id: server.c,v 1.216 2009-11-04 22:42:31 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -568,12 +568,13 @@ server_lock_server(void)
continue;
if (s->flags & SESSION_UNATTACHED) {
s->activity = time(NULL);
if (gettimeofday(&s->activity_time, NULL) != 0)
fatal("gettimeofday failed");
continue;
}
timeout = options_get_number(&s->options, "lock-after-time");
if (timeout <= 0 || t <= s->activity + timeout)
if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout)
return; /* not timed out */
}
@ -596,12 +597,13 @@ server_lock_sessions(void)
continue;
if (s->flags & SESSION_UNATTACHED) {
s->activity = time(NULL);
if (gettimeofday(&s->activity_time, NULL) != 0)
fatal("gettimeofday failed");
continue;
}
timeout = options_get_number(&s->options, "lock-after-time");
if (timeout > 0 && t > s->activity + timeout) {
if (timeout > 0 && t > s->activity_time.tv_sec + timeout) {
server_lock_session(s);
recalculate_sizes();
}