Correction of block estimate.

[dump.git] / dump / tape.c

diff --git a/dump/tape.c b/dump/tape.c
index 7851719381ee78f3702acbbe2fc0bc70a2f5c2e7..890c77b8e3ed6f93d53412706ddd09fe56e2a15e 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.36 2001/03/20 10:02:48 stelian Exp $";
+       "$Id: tape.c,v 1.40 2001/03/28 12:59:48 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -253,7 +253,8 @@ tperror(int errnum)
                quit("Cannot recover\n");
                /* NOTREACHED */
        }
-       msg("write error %d blocks into volume %d: %s\n", blocksthisvol, tapeno, strerror(errnum));
+       msg("write error %d blocks into volume %d: %s\n", 
+           blocksthisvol, tapeno, strerror(errnum));
        broadcast("DUMP WRITE ERROR!\n");
        if (query("Do you want to rewrite this volume?")) {
                msg("Closing this volume.  Prepare to restart with new media;\n");
@@ -297,13 +298,13 @@ do_stats(void)
                long txfrate = volkb / ttaken;
                msg("Volume %d took %d:%02d:%02d\n", tapeno,
                        ttaken / 3600, (ttaken % 3600) / 60, ttaken % 60);
-               msg("Volume %d transfer rate: %ld KB/s\n", tapeno,
+               msg("Volume %d transfer rate: %ld kB/s\n", tapeno,
                        txfrate);
                xferrate += txfrate;
                if (compressed) {
                        double rate = .0005 + (double) blocks / (double) volkb;
-                       msg("Volume %d %ldKB uncompressed, %ldKB compressed,"
-                               " compression ratio %1.3f\n",
+                       msg("Volume %d %ldkB uncompressed, %ldkB compressed,"
+                               " %1.3f:1\n",
                                tapeno, blocks, volkb, rate);
                }
        }
@@ -326,7 +327,7 @@ mktimeest(time_t tnow)
                / blockswritten * tapesize;
        if (tnow > tstart_volume)
                (void)snprintf(msgbuf, sizeof(msgbuf),
-                       "%3.2f%% done at %ld KB/s, finished in %d:%02d\n",
+                       "%3.2f%% done at %ld kB/s, finished in %d:%02d\n",
                        (blockswritten * 100.0) / tapesize,
                        (spcl.c_tapea - tapea_volume) / (tnow - tstart_volume),
                        (int)(deltat / 3600), (int)((deltat % 3600) / 60));
@@ -1038,7 +1039,7 @@ doslave(int cmd, int slave_number)
        char *buffer;
 #ifdef HAVE_ZLIB
        struct tapebuf *comp_buf = NULL;
-       int compresult, complevel = 6, do_compress = 0;
+       int compresult, do_compress = 0;
        unsigned long worklen;
 #endif /* HAVE_ZLIB */
        struct slave_results returns;
@@ -1095,13 +1096,6 @@ doslave(int cmd, int slave_number)
                                       quit("master/slave protocol botched.\n");
                        }
                }
-               if (sigsetjmp(jmpbuf, 1) == 0) {
-                       ready = 1;
-                       if (!caught)
-                               (void) pause();
-               }
-               ready = 0;
-               caught = 0;
 
                /* Try to write the data... */
                wrote = 0;
@@ -1113,7 +1107,6 @@ doslave(int cmd, int slave_number)
 
 #ifdef HAVE_ZLIB
                /* 
-                * The first NR_SLAVE blocks are not compressed.
                 * When writing a compressed dump, each block is
                 * written from struct tapebuf with an 4 byte prefix
                 * followed by the data. This can be less than
@@ -1121,6 +1114,7 @@ doslave(int cmd, int slave_number)
                 * length read to the compressed length in the header
                 * to verify that the read was good. Blocks which don't
                 * compress well are written uncompressed.
+                * The first block written by each slave is not compressed.
                 */
 
                if (compressed) {
@@ -1128,7 +1122,7 @@ doslave(int cmd, int slave_number)
                        worklen = TP_BSIZE + writesize;
                        if (do_compress)
                                compresult = compress2(comp_buf->buf, &worklen,
-                                       (char *)slp->tblock[0], writesize, complevel);
+                                       (char *)slp->tblock[0], writesize, compressed);
                        if (compresult == Z_OK && worklen <= writesize-32) {
                                /* write the compressed buffer */
                                comp_buf->length = worklen;
@@ -1150,6 +1144,14 @@ doslave(int cmd, int slave_number)
                do_compress = compressed;
 #endif /* HAVE_ZLIB */
 
+               if (sigsetjmp(jmpbuf, 1) == 0) {
+                       ready = 1;
+                       if (!caught)
+                               (void) pause();
+               }
+               ready = 0;
+               caught = 0;
+
                while (eot_count < 10 && size < bufsize) {
 #ifdef RDUMP
                        if (host)