From owner-svn-src-user@FreeBSD.ORG Wed Jun 15 23:45:36 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25908106566B; Wed, 15 Jun 2011 23:45:36 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F14338FC08; Wed, 15 Jun 2011 23:45:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5FNjZJi003482; Wed, 15 Jun 2011 23:45:35 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5FNjZiX003480; Wed, 15 Jun 2011 23:45:35 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201106152345.p5FNjZiX003480@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Wed, 15 Jun 2011 23:45:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223131 - user/brooks/openssh-hpn X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2011 23:45:36 -0000 Author: bz Date: Wed Jun 15 23:45:35 2011 New Revision: 223131 URL: http://svn.freebsd.org/changeset/base/223131 Log: Manually backout openssh5.8-peaktput.diff which was distributed within openssh5.8-dynwindow_noneswitch.diff. Modified: user/brooks/openssh-hpn/progressmeter.c Modified: user/brooks/openssh-hpn/progressmeter.c ============================================================================== --- user/brooks/openssh-hpn/progressmeter.c Wed Jun 15 23:41:25 2011 (r223130) +++ user/brooks/openssh-hpn/progressmeter.c Wed Jun 15 23:45:35 2011 (r223131) @@ -68,8 +68,6 @@ static time_t last_update; /* last progr static char *file; /* name of the file being transferred */ static off_t end_pos; /* ending position of transfer */ static off_t cur_pos; /* transfer position as of last refresh */ -static off_t last_pos; -static off_t max_delta_pos = 0; static volatile off_t *counter; /* progress counter */ static long stalled; /* how long we have been stalled */ static int bytes_per_second; /* current speed in bytes per second */ @@ -130,17 +128,12 @@ refresh_progress_meter(void) int hours, minutes, seconds; int i, len; int file_len; - off_t delta_pos; transferred = *counter - cur_pos; cur_pos = *counter; now = time(NULL); bytes_left = end_pos - cur_pos; - delta_pos = cur_pos - last_pos; - if (delta_pos > max_delta_pos) - max_delta_pos = delta_pos; - if (bytes_left > 0) elapsed = now - last_update; else { @@ -165,7 +158,7 @@ refresh_progress_meter(void) /* filename */ buf[0] = '\0'; - file_len = win_size - 45; + file_len = win_size - 35; if (file_len > 0) { len = snprintf(buf, file_len + 1, "\r%s", file); if (len < 0) @@ -195,16 +188,6 @@ refresh_progress_meter(void) (off_t)bytes_per_second); strlcat(buf, "/s ", win_size); - /* instantaneous rate */ - if (bytes_left > 0) { - format_rate(buf + strlen(buf), win_size - strlen(buf), - delta_pos); - } else { - format_rate(buf + strlen(buf), win_size - strlen(buf), - max_delta_pos); - } - strlcat(buf, "/s ", win_size); - /* ETA */ if (!transferred) stalled += elapsed; @@ -241,7 +224,6 @@ refresh_progress_meter(void) atomicio(vwrite, STDOUT_FILENO, buf, win_size - 1); last_update = now; - last_pos = cur_pos; } /*ARGSUSED*/