#ifndef lint
static const char rcsid[] =
- "$Id: tape.c,v 1.31 2001/02/21 16:13:05 stelian Exp $";
+ "$Id: tape.c,v 1.37 2001/03/20 20:15:59 stelian Exp $";
#endif /* not lint */
#include <config.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
+#include <compaterr.h>
+#ifdef __STDC__
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#else
+int write(), read();
+#endif
+
#ifdef __linux__
#include <sys/types.h>
+#include <time.h>
#include <linux/types.h>
#endif
#include <sys/param.h>
#include <sys/wait.h>
#ifdef __linux__
#include <linux/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
#include <bsdcompat.h>
-#else /* __linux__ */
-#ifdef sunos
+#elif defined sunos
#include <sys/vnode.h>
#include <ufs/fs.h>
#else
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
-#endif
#endif /* __linux__ */
#include <protocols/dumprestore.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <compaterr.h>
-#ifdef __STDC__
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#else
-int write(), read();
-#endif
-
-#ifdef __linux__
-#include <ext2fs/ext2fs.h>
-#endif
-
#ifdef HAVE_ZLIB
#include <zlib.h>
#endif /* HAVE_ZLIB */
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));
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);
}
}
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;
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.
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__
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);
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;
comp_buf = malloc(sizeof(struct tapebuf) + TP_BSIZE + writesize);
if (comp_buf == NULL)
quit("couldn't allocate a compress buffer.\n");
+ comp_buf->flags = 0;
}
#endif /* HAVE_ZLIB */
#ifdef HAVE_ZLIB
/*
- * If the data can't be compressed it's written with no
- * prefix as writesize bytes. If it's compressible, it's
- * written from struct tapebuf with an 8 byte prefix
- * followed by the data. This will always be less than
+ * 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
* writesize. Restore, on a short read, can compare the
* length read to the compressed length in the header
- * to verify that the read was good.
+ * 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 (do_compress) { /* don't compress the first block */
- comp_buf->clen = comp_buf->unclen = bufsize;
+ if (compressed) {
+ comp_buf->length = bufsize;
worklen = TP_BSIZE + writesize;
- compresult = compress2(comp_buf->buf, &worklen,
- (char *)slp->tblock[0], writesize, complevel);
+ if (do_compress)
+ compresult = compress2(comp_buf->buf, &worklen,
+ (char *)slp->tblock[0], writesize, compressed);
if (compresult == Z_OK && worklen <= writesize-32) {
/* write the compressed buffer */
- comp_buf->clen = worklen;
+ comp_buf->length = worklen;
+ comp_buf->compressed = 1;
+ buffer = (char *) comp_buf;
+ returns.clen = bufsize = worklen + sizeof(struct tapebuf);
+ }
+ else {
+ /* write the data uncompressed */
+ comp_buf->length = writesize;
+ comp_buf->compressed = 0;
buffer = (char *) comp_buf;
- returns.clen = bufsize = worklen + 8;
+ returns.clen = bufsize = writesize + sizeof(struct tapebuf);
+ returns.unclen = returns.clen;
+ memcpy(comp_buf->buf, (char *)slp->tblock[0], writesize);
}
}
/* compress the remaining blocks */
git.wh0rd.org / dump.git / blobdiff