Some compression patches.

[dump.git] / dump / tape.c

diff --git a/dump/tape.c b/dump/tape.c
index f43c3a20a9b3d4aae071afcb90ca90bd3641ebac..b4bf6d4eb808b97a00cb72ae91c53b52cb539bf1 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.34 2001/03/19 13:22:48 stelian Exp $";
+       "$Id: tape.c,v 1.37 2001/03/20 20:15:59 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -285,19 +285,10 @@ do_stats(void)
        time_t tnow, ttaken;
        int blocks;
 
-#ifdef __linux__
-       (void)time4(&tnow);
-#else
-       (void)time(&tnow);
-#endif
+       tnow = time(NULL);
        ttaken = tnow - tstart_volume;
        blocks = spcl.c_tapea - tapea_volume;
-       msg("Volume %d completed at: %s", tapeno, 
-#ifdef __linux__
-                                         ctime4(&tnow));
-#else
-                                         ctime(&tnow));
-#endif
+       msg("Volume %d completed at: %s", tapeno, ctime(&tnow));
        if (! compressed)
                msg("Volume %d %ld tape blocks (%.2fMB)\n", tapeno, 
                        blocks, ((double)blocks * TP_BSIZE / 1048576));
@@ -312,7 +303,7 @@ do_stats(void)
                if (compressed) {
                        double rate = .0005 + (double) blocks / (double) volkb;
                        msg("Volume %d %ldKB uncompressed, %ldKB compressed,"
-                               " compression ratio %1.3f\n",
+                               " %1.3f:1\n",
                                tapeno, blocks, volkb, rate);
                }
        }
@@ -356,16 +347,10 @@ mktimeest(time_t tnow)
 void
 statussig(int notused)
 {
-       time_t tnow;
        int save_errno = errno;
        char *buf;
 
-#ifdef __linux__
-       (void) time4(&tnow);
-#else
-       (void) time((time_t *) &tnow);
-#endif
-       buf = mktimeest(tnow);
+       buf = mktimeest(time(NULL));
        if (buf)
                write(STDERR_FILENO, buf, strlen(buf));
        errno = save_errno;
@@ -405,13 +390,13 @@ flushtape(void)
                        uncomprblks++;
                slp->sent = 0;
 
-               /* Check for errors */
-               if (got < 0)
-                       tperror(-got);
-               
-               /* Check for end of tape */
-               if (got == 0) {
-                       msg("End of tape detected\n");
+               /* Check for errors or end of tape */
+               if (got <= 0) {
+                       /* Check for errors */
+                       if (got < 0)
+                               tperror(-got);
+                       else
+                               msg("End of tape detected\n");
 
                        /*
                         * Drain the results, don't care what the values were.
@@ -769,11 +754,7 @@ startnewtape(int top)
        parentpid = getpid();
        tapea_volume = spcl.c_tapea;
        tapea_bytes = bytes_written;
-#ifdef __linux__
-       (void)time4(&tstart_volume);
-#else
-       (void)time((&tstart_volume);
-#endif
+       tstart_volume = time(NULL);
 
 restore_check_point:
 #ifdef __linux__
@@ -903,14 +884,10 @@ restore_check_point:
                spcl.c_flags |= DR_NEWHEADER;
                if (compressed)
                        spcl.c_flags |= DR_COMPRESSED;
-               writeheader((ino_t)slp->inode);
+               writeheader((dump_ino_t)slp->inode);
                spcl.c_flags &=~ DR_NEWHEADER;
-               msg("Volume %d started at: %s", tapeno, 
-#ifdef __linux__
-                                               ctime4(&tstart_volume));
-#else
-                                               ctime(&tstart_volume));
-#endif
+               msg("Volume %d started with block %ld at: %s", tapeno, 
+                   spcl.c_tapea, ctime(&tstart_volume));
                if (tapeno > 1)
                        msg("Volume %d begins with blocks from inode %d\n",
                                tapeno, slp->inode);
@@ -1061,7 +1038,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;
@@ -1136,7 +1113,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
@@ -1144,6 +1120,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) {
@@ -1151,7 +1128,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;