diff options
| author |   nicm <nicm@openbsd.org> | 2015-11-18 09:22:29 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-11-18 09:22:29 +0000 |
| commit | e215b69e58e9f7c12c65463bb64876491217e352 (patch) | |
| tree | 4161bb954358a7a7b071fc4f5cd58d52de3c99ad | |
| parent | fix "ssh-keygen -l" of private key, broken in support for (diff) | |
| download | wireguard-openbsd-e215b69e58e9f7c12c65463bb64876491217e352.tar.xz wireguard-openbsd-e215b69e58e9f7c12c65463bb64876491217e352.zip | |
Don't update activity time twice for new sessions, and add some logging.
| -rw-r--r-- | usr.bin/tmux/session.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/tmux/session.c b/usr.bin/tmux/session.c index a912183cc7f..da6ade9844a 100644 --- a/usr.bin/tmux/session.c +++ b/usr.bin/tmux/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.58 2015/10/31 08:13:58 nicm Exp $ */ +/* $OpenBSD: session.c,v 1.59 2015/11/18 09:22:29 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -131,10 +131,6 @@ 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; @@ -151,6 +147,8 @@ session_create(const char *name, int argc, char **argv, const char *path, } RB_INSERT(sessions, &sessions, s); + log_debug("new session %s $%u", s->name, s->id); + if (gettimeofday(&s->creation_time, NULL) != 0) fatal("gettimeofday failed"); session_update_activity(s, &s->creation_time); @@ -265,6 +263,10 @@ session_update_activity(struct session *s, struct timeval *from) else memcpy(&s->activity_time, from, sizeof s->activity_time); + log_debug("session %s activity %lld.%06d (last %lld.%06d)", s->name, + (long long)s->activity_time.tv_sec, (int)s->activity_time.tv_usec, + (long long)last->tv_sec, (int)last->tv_usec); + if (evtimer_initialized(&s->lock_timer)) evtimer_del(&s->lock_timer); else |