From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
To: barebox@lists.infradead.org
Cc: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Subject: [PATCH 01/13] progress: add close_progress() to display some statistics
Date: Mon, 18 Jul 2022 14:22:16 +0200 [thread overview]
Message-ID: <d6071cf12d7d5610f55c78a50f1b1505f032bc29.1658144543.git.enrico.scholz@sigma-chemnitz.de> (raw)
In-Reply-To: <cover.1658144543.git.enrico.scholz@sigma-chemnitz.de>
With a later patch, this will produce output like
| :/ cp -v /mnt/tftp/tmp /tmp/
| [########...#########] 29138411 bytes, 127413 bytes/s
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
include/progress.h | 1 +
lib/show_progress.c | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/include/progress.h b/include/progress.h
index 7230bd3a9bd5..219d772201bf 100644
--- a/include/progress.h
+++ b/include/progress.h
@@ -16,6 +16,7 @@ void init_progression_bar(loff_t max);
* spinner is printed.
*/
void show_progress(loff_t now);
+void close_progress(loff_t total);
extern struct notifier_head progress_notifier;
diff --git a/lib/show_progress.c b/lib/show_progress.c
index 1b624bcb9af8..5b42a2d74b8f 100644
--- a/lib/show_progress.c
+++ b/lib/show_progress.c
@@ -24,6 +24,7 @@
static loff_t printed;
static loff_t progress_max;
static unsigned spin;
+static uint64_t start_tm;
void show_progress(loff_t now)
{
@@ -47,11 +48,35 @@ void show_progress(loff_t now)
}
}
+void close_progress(loff_t total)
+{
+ uint64_t now = get_time_ns();
+ unsigned long speed;
+ unsigned long delta;
+
+ if (now <= start_tm) {
+ pr_crit("tm mismatch");
+ return;
+ }
+
+ if (total < 0)
+ return;
+
+ /* convert to ms and add '1' to avoid div-by-zero */
+ delta = div_u64(now - start_tm, 1000000) + 1;
+
+ /* speed is bytes/s */
+ speed = div_u64(total * 1000, delta);
+
+ printf("] %llu bytes, %lu bytes/s", (unsigned long long)total, speed);
+}
+
void init_progression_bar(loff_t max)
{
printed = 0;
progress_max = max;
spin = 0;
+ start_tm = get_time_ns();
if (progress_max && progress_max != FILESIZE_MAX)
printf("\t[%*s]\r\t[", HASHES_PER_LINE, "");
else
--
2.36.1
next prev parent reply other threads:[~2022-07-18 12:25 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-18 12:22 [PATCH 00/13] add "windowsize" (RFC 7440) support for tftp Enrico Scholz
2022-07-18 12:22 ` Enrico Scholz [this message]
2022-07-18 12:22 ` [PATCH 02/13] libfile:copy_file: show statistics in verbose mode Enrico Scholz
2022-07-18 12:22 ` [PATCH 03/13] tftp: minor refactoring of RRQ/WRQ packet generation code Enrico Scholz
2022-07-18 12:22 ` [PATCH 04/13] tftp: replace hardcoded blksize by global constant Enrico Scholz
2022-07-18 12:22 ` [PATCH 05/13] tftp: record whether tftp file is opened for lookup operation only Enrico Scholz
2022-07-18 12:22 ` [PATCH 06/13] tftp: reduce block size on lookup requests Enrico Scholz
2022-07-18 12:22 ` [PATCH 07/13] tftp: refactor data processing Enrico Scholz
2022-07-18 12:22 ` [PATCH 08/13] tftp: detect out-of-memory situations Enrico Scholz
2022-07-18 12:22 ` [PATCH 09/13] tftp: implement 'windowsize' (RFC 7440) support Enrico Scholz
2022-07-31 11:36 ` [PATCH v2 " Enrico Scholz
2022-08-09 8:49 ` Sascha Hauer
2022-08-09 9:28 ` Enrico Scholz
2022-08-09 9:52 ` Sascha Hauer
2022-07-18 12:22 ` [PATCH 10/13] tftp: do not use 'priv->block' for RRQ Enrico Scholz
2022-07-18 12:22 ` [PATCH 11/13] tftp: reorder tftp packets Enrico Scholz
2022-08-09 8:58 ` Sascha Hauer
2022-07-18 12:22 ` [PATCH 12/13] tftp: allow to change tftp port Enrico Scholz
2022-08-09 8:12 ` Sascha Hauer
2022-07-18 12:22 ` [PATCH 13/13] tftp: add sanity check for OACK response Enrico Scholz
2022-07-31 11:36 ` [PATCH v2 " Enrico Scholz
2022-08-09 9:02 ` [PATCH 00/13] add "windowsize" (RFC 7440) support for tftp Sascha Hauer
2022-08-09 9:35 ` Enrico Scholz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d6071cf12d7d5610f55c78a50f1b1505f032bc29.1658144543.git.enrico.scholz@sigma-chemnitz.de \
--to=enrico.scholz@sigma-chemnitz.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox