From owner-svn-src-all@FreeBSD.ORG Sun Dec 9 19:01:33 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 065D44B9; Sun, 9 Dec 2012 19:01:33 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by mx1.freebsd.org (Postfix) with ESMTP id 0BC808FC14; Sun, 9 Dec 2012 19:01:31 +0000 (UTC) Received: by mail-wi0-f174.google.com with SMTP id hm9so679611wib.13 for ; Sun, 09 Dec 2012 11:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=8eRDa8ifi1KxbXGDQY7hAuZmOkSeVgHqMJ0GSy1N/IE=; b=H2zbTIPRi9AuUCAwJnHH+tvGobvtoDEFBnfzI/7GSA2nCNfdw008zAIjzt/GrytKZk nCndFK+EczHoLZcyPhVkHpRHa1zJJjgIS768MfhdISkDrvYSqLXRtZc6Uz1MTVfxbTRl 14T2SHtpR2gpUMiAzs/XDEytek2HXvosB8dxRQPQ94P91dg5ww2vk4YCudTzKT5rYswW TmCiJCBCQ6rZZWa5zvp6PdPDAVoHPm5Q1wedT+NboXJHI0NOlJOVZGx8bfPVErfrNc7h 78sDTHleKjf6pAKwoqkQAZXwkYi8BjNzOpHz9y0Mu3KiUfYZs6tARp/lwfW7D9UQ237C sSxQ== Received: by 10.180.75.135 with SMTP id c7mr7309616wiw.10.1355079690935; Sun, 09 Dec 2012 11:01:30 -0800 (PST) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by mx.google.com with ESMTPS id w5sm8159012wiz.10.2012.12.09.11.01.28 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Dec 2012 11:01:29 -0800 (PST) Date: Sun, 9 Dec 2012 20:01:20 +0100 From: Mateusz Guzik To: Florian Smeets Subject: Re: svn commit: r243147 - head/usr.bin/fetch Message-ID: <20121209190120.GB28989@dft-labs.eu> References: <201211161205.qAGC5Bwr081144@svn.freebsd.org> <50C4D31E.4080000@smeets.im> <20121209182730.GA28989@dft-labs.eu> <50C4DB7A.9050302@smeets.im> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <50C4DB7A.9050302@smeets.im> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Andre Oppermann X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2012 19:01:33 -0000 On Sun, Dec 09, 2012 at 07:42:02PM +0100, Florian Smeets wrote: > On 09.12.12 19:27, Mateusz Guzik wrote: > > On Sun, Dec 09, 2012 at 07:06:22PM +0100, Florian Smeets wrote: > >> On 16.11.12 13:05, Andre Oppermann wrote: > >>> Author: andre > >>> Date: Fri Nov 16 12:05:10 2012 > >>> New Revision: 243147 > >>> URL: http://svnweb.freebsd.org/changeset/base/243147 > >>> > >>> Log: > >>> Change fetch(1) to: > >>> > >>> o Report the instantaneous bandwidth instead of an average since the > >>> beginning of the download. > >>> > >>> o At the finish of the download report the average bandwidth and also > >>> the total time it took instead of 00m00s. > >>> > >> > >> Andre, > >> > >> it looks like this change breaks the bandwidth calculation when using -r > >> > >> 52% of 146 MB -25199509 Bps 03m28s > >> > >> Going back to r243146 fixes it. > >> > > > > Try this: > > diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c > > index 025fcdc..e723d40 100644 > > --- a/usr.bin/fetch/fetch.c > > +++ b/usr.bin/fetch/fetch.c > > @@ -243,7 +243,7 @@ stat_start(struct xferstat *xs, const char *name, off_t size, off_t of > > gettimeofday(&xs->start, NULL); > > xs->last.tv_sec = xs->last.tv_usec = 0; > > xs->size = size; > > - xs->offset = offset; > > + xs->offset = 0; > > xs->rcvd = offset; > > xs->lastrcvd = offset; > > if (v_tty && v_level > 0) > > > > That way the bandwidth calculation looks OK but now it counts the time > since starting to resume the download and not the time left :) > > 63% of 146 MB 7069 kBps 00m07s > Oops.. revert that and try this instead: diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c index 025fcdc..d3e9b21 100644 --- a/usr.bin/fetch/fetch.c +++ b/usr.bin/fetch/fetch.c @@ -183,7 +183,7 @@ stat_bps(struct xferstat *xs) if (delta == 0.0) { snprintf(str, sizeof str, "?? Bps"); } else { - bps = (xs->rcvd - xs->lastrcvd - xs->offset) / delta; + bps = (xs->rcvd - xs->lastrcvd) / delta; snprintf(str, sizeof str, "%sps", stat_bytes((off_t)bps)); } return (str); -- Mateusz Guzik