diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2011-01-01 01:12:09 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2011-01-01 01:12:09 +0000 |
commit | 04b32fa734d491e7ae9b915dc309858310d96185 (patch) | |
tree | 877284af9511a2c46a1f9a949ca6cbab3184a0be /server.c | |
parent | 91218f8714dafa83f49ece4435cc3d26a738a02e (diff) | |
download | rtmux-04b32fa734d491e7ae9b915dc309858310d96185.tar.gz rtmux-04b32fa734d491e7ae9b915dc309858310d96185.tar.bz2 rtmux-04b32fa734d491e7ae9b915dc309858310d96185.zip |
Don't reset the activity timer for unattached sessions every second,
this screws up the choice of most-recently-used. Instead, break the time
update into a little function and do it when the session is attached.
Pointed out by joshe@.
Diffstat (limited to 'server.c')
-rw-r--r-- | server.c | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -494,12 +494,8 @@ server_lock_server(void) t = time(NULL); RB_FOREACH(s, sessions, &sessions) { - if (s->flags & SESSION_UNATTACHED) { - if (gettimeofday(&s->activity_time, NULL) != 0) - fatal("gettimeofday failed"); + if (s->flags & SESSION_UNATTACHED) continue; - } - timeout = options_get_number(&s->options, "lock-after-time"); if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout) return; /* not timed out */ @@ -519,12 +515,8 @@ server_lock_sessions(void) t = time(NULL); RB_FOREACH(s, sessions, &sessions) { - if (s->flags & SESSION_UNATTACHED) { - if (gettimeofday(&s->activity_time, NULL) != 0) - fatal("gettimeofday failed"); + if (s->flags & SESSION_UNATTACHED) continue; - } - timeout = options_get_number(&s->options, "lock-after-time"); if (timeout > 0 && t > s->activity_time.tv_sec + timeout) { server_lock_session(s); |