From 6c0fd53b323fe1e401dc8c67516a053bfe61f962 Mon Sep 17 00:00:00 2001 From: phk Date: Wed, 13 Nov 1996 20:00:03 +0000 Subject: Bruce says: "You have been programming in the kernel for too long :-)." and he's right ... I forgot about this floating point stuff you can use in user-land :-) Increase precision of duration to microseconds. No heuristics to avoid overflow in calculation needed - just depend on DBL_MAX being a bit larger than LONG_MAX. Use double instead of `struct timeval' in dd.h so that everything doesn't have to include . Fixed style bugs in recent and old FreeBSD changes. Reviewed by: phk Submitted by: bde --- bin/dd/args.c | 5 ++--- bin/dd/conv.c | 11 +++++------ bin/dd/dd.c | 10 ++++++---- bin/dd/dd.h | 4 ++-- bin/dd/misc.c | 35 ++++++++++------------------------- 5 files changed, 25 insertions(+), 40 deletions(-) (limited to 'bin/dd') diff --git a/bin/dd/args.c b/bin/dd/args.c index 59ccefe..b3cc1a8 100644 --- a/bin/dd/args.c +++ b/bin/dd/args.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: args.c,v 1.3 1994/09/24 02:54:42 davidg Exp $ + * $Id: args.c,v 1.4 1996/11/12 23:08:58 phk Exp $ */ #ifndef lint @@ -49,7 +49,6 @@ static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94"; #include #include #include -#include #include "dd.h" #include "extern.h" @@ -101,7 +100,7 @@ jcl(argv) in.dbsz = out.dbsz = 512; - while ((oper = *++argv)) {/* JEAG */ + while ((oper = *++argv) != NULL) { if ((arg = strchr(oper, '=')) == NULL) errx(1, "unknown operand %s", oper); *arg++ = '\0'; diff --git a/bin/dd/conv.c b/bin/dd/conv.c index 41c5909..09ee56a 100644 --- a/bin/dd/conv.c +++ b/bin/dd/conv.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: conv.c,v 1.3 1994/09/24 02:54:44 davidg Exp $ + * $Id: conv.c,v 1.4 1996/11/12 23:09:04 phk Exp $ */ #ifndef lint @@ -45,7 +45,6 @@ static char sccsid[] = "@(#)conv.c 8.3 (Berkeley) 4/2/94"; #include #include -#include #include "dd.h" #include "extern.h" @@ -62,7 +61,7 @@ def() int cnt; u_char *inp, *t; - if ((t = ctab)) + if ((t = ctab) != NULL) for (inp = in.dbp - (cnt = in.dbrcnt); cnt--; ++inp) *inp = t[*inp]; @@ -106,7 +105,6 @@ block() int ch, cnt, maxlen; u_char *inp, *outp, *t; - ch = 0; /* * Record truncation can cross block boundaries. If currently in a * truncation state, keep tossing characters until reach a newline. @@ -131,9 +129,10 @@ block() * Copy records (max cbsz size chunks) into the output buffer. The * translation is done as we copy into the output buffer. */ + ch = 0; /* Help the compiler. */ for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) { maxlen = MIN(cbsz, in.dbcnt); - if ((t = ctab)) + if ((t = ctab) != NULL) for (cnt = 0; cnt < maxlen && (ch = *inp++) != '\n'; ++cnt) *outp++ = t[ch]; @@ -217,7 +216,7 @@ unblock() u_char *inp, *t; /* Translation and case conversion. */ - if ((t = ctab)) + if ((t = ctab) != NULL) for (cnt = in.dbrcnt, inp = in.dbp; cnt--;) *--inp = t[*inp]; /* diff --git a/bin/dd/dd.c b/bin/dd/dd.c index a0c6f7a..a86c130 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dd.c,v 1.5 1995/10/23 21:31:48 ache Exp $ + * $Id: dd.c,v 1.6 1996/11/12 23:09:09 phk Exp $ */ #ifndef lint @@ -56,12 +56,12 @@ static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; #include #include #include +#include #include #include #include #include #include -#include #include "dd.h" #include "extern.h" @@ -85,7 +85,7 @@ main(argc, argv) int argc; char *argv[]; { - (void) setlocale(LC_CTYPE, ""); + (void)setlocale(LC_CTYPE, ""); jcl(argv); setup(); @@ -105,6 +105,7 @@ static void setup() { u_int cnt; + struct timeval tv; if (in.name == NULL) { in.name = "stdin"; @@ -213,7 +214,8 @@ setup() ctab[cnt] = cnt; } } - (void)gettimeofday(&st.start, 0); /* Statistics timestamp. */ + (void)gettimeofday(&tv, (struct timezone *)NULL); + st.start = tv.tv_sec + tv.tv_usec * 1e-6; } static void diff --git a/bin/dd/dd.h b/bin/dd/dd.h index 6ebc3a7..b0635ed 100644 --- a/bin/dd/dd.h +++ b/bin/dd/dd.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)dd.h 8.3 (Berkeley) 4/2/94 - * $Id: dd.h,v 1.2 1994/09/24 02:54:54 davidg Exp $ + * $Id: dd.h,v 1.3 1996/11/12 23:09:12 phk Exp $ */ /* Input/output stream state. */ @@ -70,7 +70,7 @@ typedef struct { u_long trunc; /* # of truncated records */ u_long swab; /* # of odd-length swab blocks */ u_long bytes; /* # of bytes written */ - struct timeval start; /* start time of dd */ + double start; /* start time of dd */ } STAT; /* Flags (in ddflags). */ diff --git a/bin/dd/misc.c b/bin/dd/misc.c index 7e6932f..9b577ef 100644 --- a/bin/dd/misc.c +++ b/bin/dd/misc.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: misc.c,v 1.2 1994/09/24 02:55:01 davidg Exp $ + * $Id: misc.c,v 1.3 1996/11/12 23:09:15 phk Exp $ */ #ifndef lint @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include +#include #include #include @@ -49,7 +50,6 @@ static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; #include #include #include -#include #include "dd.h" #include "extern.h" @@ -58,22 +58,13 @@ void summary() { struct timeval tv; - long msec; + double secs; char buf[100]; - (void)gettimeofday(&tv, 0); - tv.tv_sec -= st.start.tv_sec; - tv.tv_usec -= st.start.tv_usec; - if (tv.tv_usec < 0) { - tv.tv_usec += 1000000; - tv.tv_sec--; - } - - msec = tv.tv_sec * 1000; - msec += tv.tv_usec / 1000; - - if (msec == 0) - msec = 1; + (void)gettimeofday(&tv, (struct timezone *)NULL); + secs = tv.tv_sec + tv.tv_usec * 1e-6 - st.start; + if (secs < 1e-6) + secs = 1e-6; /* Use snprintf(3) so that we don't reenter stdio(3). */ (void)snprintf(buf, sizeof(buf), "%u+%u records in\n%u+%u records out\n", @@ -89,15 +80,9 @@ summary() st.trunc, (st.trunc == 1) ? "block" : "blocks"); (void)write(STDERR_FILENO, buf, strlen(buf)); } - if (msec > 1000000) { - (void)snprintf(buf, sizeof(buf), - "%u bytes transferred in %u.%03d secs (%u bytes/sec)\n", - st.bytes, tv.tv_sec, 0, st.bytes / tv.tv_sec); - } else { - (void)snprintf(buf, sizeof(buf), - "%u bytes transferred in %u.%03d secs (%u bytes/sec)\n", - st.bytes, msec/1000, msec%1000, st.bytes*1000 / msec); - } + (void)snprintf(buf, sizeof(buf), + "%u bytes transferred in %.6f secs (%.0f bytes/sec)\n", + st.bytes, secs, st.bytes / secs); (void)write(STDERR_FILENO, buf, strlen(buf)); } -- cgit v1.1