mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-24 11:29:10 +00:00
ac5d5b054f
Output padding is specified via outlen, which is set using the return value of fprintf. Because it's printing that padding plus a trailing byte, it grows by one each iteration rather than reflecting actual length. Additionally, iec was sized improperly for scaling up similarly to si. Fixing this revealed that the humanize_number(3) call to populate persec was using the wrong width. Submitted by: Thomas Hurst <tom@hur.st> Reviewed by: imp Approved by: re (kib) Differential Revision: https://reviews.freebsd.org/D16960
158 lines
4.3 KiB
C
158 lines
4.3 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*
|
|
* Copyright (c) 1991, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Keith Muller of the University of California, San Diego and Lance
|
|
* Visser of Convex Computer Corporation.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef lint
|
|
#if 0
|
|
static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
|
|
#endif
|
|
#endif /* not lint */
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <inttypes.h>
|
|
#include <libutil.h>
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
|
|
#include "dd.h"
|
|
#include "extern.h"
|
|
|
|
double
|
|
secs_elapsed(void)
|
|
{
|
|
struct timespec end, ts_res;
|
|
double secs, res;
|
|
|
|
if (clock_gettime(CLOCK_MONOTONIC, &end))
|
|
err(1, "clock_gettime");
|
|
if (clock_getres(CLOCK_MONOTONIC, &ts_res))
|
|
err(1, "clock_getres");
|
|
secs = (end.tv_sec - st.start.tv_sec) + \
|
|
(end.tv_nsec - st.start.tv_nsec) * 1e-9;
|
|
res = ts_res.tv_sec + ts_res.tv_nsec * 1e-9;
|
|
if (secs < res)
|
|
secs = res;
|
|
|
|
return (secs);
|
|
}
|
|
|
|
void
|
|
summary(void)
|
|
{
|
|
double secs;
|
|
|
|
if (ddflags & C_NOINFO)
|
|
return;
|
|
|
|
if (ddflags & C_PROGRESS)
|
|
fprintf(stderr, "\n");
|
|
|
|
secs = secs_elapsed();
|
|
|
|
(void)fprintf(stderr,
|
|
"%ju+%ju records in\n%ju+%ju records out\n",
|
|
st.in_full, st.in_part, st.out_full, st.out_part);
|
|
if (st.swab)
|
|
(void)fprintf(stderr, "%ju odd length swab %s\n",
|
|
st.swab, (st.swab == 1) ? "block" : "blocks");
|
|
if (st.trunc)
|
|
(void)fprintf(stderr, "%ju truncated %s\n",
|
|
st.trunc, (st.trunc == 1) ? "block" : "blocks");
|
|
if (!(ddflags & C_NOXFER)) {
|
|
(void)fprintf(stderr,
|
|
"%ju bytes transferred in %.6f secs (%.0f bytes/sec)\n",
|
|
st.bytes, secs, st.bytes / secs);
|
|
}
|
|
need_summary = 0;
|
|
}
|
|
|
|
void
|
|
progress(void)
|
|
{
|
|
static int outlen;
|
|
char si[4 + 1 + 2 + 1]; /* 123 <space> <suffix> NUL */
|
|
char iec[4 + 1 + 3 + 1]; /* 123 <space> <suffix> NUL */
|
|
char persec[4 + 1 + 2 + 1]; /* 123 <space> <suffix> NUL */
|
|
char *buf;
|
|
double secs;
|
|
|
|
secs = secs_elapsed();
|
|
humanize_number(si, sizeof(si), (int64_t)st.bytes, "B", HN_AUTOSCALE,
|
|
HN_DECIMAL | HN_DIVISOR_1000);
|
|
humanize_number(iec, sizeof(iec), (int64_t)st.bytes, "B", HN_AUTOSCALE,
|
|
HN_DECIMAL | HN_IEC_PREFIXES);
|
|
humanize_number(persec, sizeof(persec), (int64_t)(st.bytes / secs), "B",
|
|
HN_AUTOSCALE, HN_DECIMAL | HN_DIVISOR_1000);
|
|
asprintf(&buf, " %'ju bytes (%s, %s) transferred %.3fs, %s/s",
|
|
(uintmax_t)st.bytes, si, iec, secs, persec);
|
|
outlen = fprintf(stderr, "%-*s\r", outlen, buf) - 1;
|
|
fflush(stderr);
|
|
free(buf);
|
|
need_progress = 0;
|
|
}
|
|
|
|
/* ARGSUSED */
|
|
void
|
|
siginfo_handler(int signo __unused)
|
|
{
|
|
|
|
need_summary = 1;
|
|
}
|
|
|
|
/* ARGSUSED */
|
|
void
|
|
sigalarm_handler(int signo __unused)
|
|
{
|
|
|
|
need_progress = 1;
|
|
}
|
|
|
|
/* ARGSUSED */
|
|
void
|
|
terminate(int sig)
|
|
{
|
|
|
|
summary();
|
|
_exit(sig == 0 ? 0 : 1);
|
|
}
|