#ifndef lint
static const char rcsid[] =
- "$Id: tape.c,v 1.50 2001/07/18 12:54:06 stelian Exp $";
+ "$Id: tape.c,v 1.56 2001/09/12 09:02:51 stelian Exp $";
#endif /* not lint */
#include <config.h>
#endif
#include <sys/param.h>
#include <sys/socket.h>
-#include <sys/time.h>
#include <sys/wait.h>
#include <sys/mtio.h>
#ifdef __linux__
+#include <linux/fs.h>
+#undef atomic_read /* this get wrongly defined in kernel */
+ /* headers and we don't want it */
#ifdef HAVE_EXT2FS_EXT2_FS_H
#include <ext2fs/ext2_fs.h>
#else
#include <zlib.h>
#endif /* HAVE_ZLIB */
+#ifdef HAVE_BZLIB
+#include <bzlib.h>
+#endif /* HAVE_BZLIB */
+
#include "dump.h"
int writesize; /* size of malloc()ed buffer for tape */
static ssize_t atomic_read __P((int, void *, size_t));
static ssize_t atomic_write __P((int, const void *, size_t));
-static void doslave __P((int, int));
+static void doslave __P((int, int, int));
static void enslave __P((void));
static void flushtape __P((void));
static void killall __P((void));
nextblock = slp->tblock;
trecno = 0;
asize += tenths + returned.clen / density;
- csize += returned.clen;
blockswritten += ntrec;
blocksthisvol += ntrec;
if (!pipeout && !unlimited) {
if (blocksperfile) {
- if ( compressed ? csize >= blocksperfile * 1024
+ if ( compressed ? (bytes_written - tapea_bytes + SLAVES * (writesize + sizeof(struct tapebuf))) >= blocksperfile * 1024
: blocksthisvol >= blocksperfile ) {
close_rewind();
startnewtape(0);
void
rollforward(void)
{
- register struct req *p, *q, *prev;
+ register struct req *p, *q = NULL, *prev;
register struct slave *tslp;
int i, size, savedtapea, got;
union u_spcl *ntb, *otb;
slp->count = lastspclrec + blks + 1 - spcl.c_tapea;
slp->inode = curino;
asize += tenths + returned.clen / density;
- csize += returned.clen;
blockswritten += ntrec;
blocksthisvol += ntrec;
#endif
enslave(); /* Share open tape file descriptor with slaves */
asize = 0;
- csize = 0;
blocksthisvol = 0;
if (top)
newtape++; /* new tape signal */
!= sizeof i)
quit("master/slave protocol botched 3\n");
#endif
- doslave(cmd[0], i);
+ doslave(cmd[0], i, (slaves[i].pid == slp->pid));
Exit(X_FINOK);
}
else
* slaves.
*/
static void
-doslave(int cmd, int slave_number)
+doslave(int cmd, int slave_number, int first)
{
register int nread;
int nextslave, size, eot_count, bufsize;
volatile int wrote = 0;
char *buffer;
-#ifdef HAVE_ZLIB
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
struct tapebuf *comp_buf = NULL;
- int compresult, do_compress = slave_number > 0;
+ int compresult, do_compress = !first;
unsigned long worklen;
-#endif /* HAVE_ZLIB */
+#ifdef HAVE_BZLIB
+ unsigned int worklen2;
+#endif
+#endif /* HAVE_ZLIB || HAVE_BZLIB */
struct slave_results returns;
#ifdef __linux__
errcode_t retval;
if ((diskfd = OPEN(disk, O_RDONLY)) < 0)
quit("slave couldn't reopen disk: %s\n", strerror(errno));
#ifdef __linux__
+#ifdef BLKFLSBUF
+ (void)ioctl(diskfd, BLKFLSBUF);
+#endif
ext2fs_close(fs);
retval = dump_fs_open(disk, &fs);
if (retval)
quit("master/slave protocol botched - didn't get pid of next slave.\n");
}
-#ifdef HAVE_ZLIB
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
/* if we're doing a compressed dump, allocate the compress buffer */
if (compressed) {
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;
+ if (bzipflag)
+ comp_buf->flags = COMPRESS_BZLIB;
+ else
+ comp_buf->flags = COMPRESS_ZLIB;
}
-#endif /* HAVE_ZLIB */
+#endif /* HAVE_ZLIB || HAVE_BZLIB */
/*
* Get list of blocks to dump, read the blocks into tape buffer
bufsize = writesize; /* length to write */
returns.clen = returns.unclen = bufsize;
-#ifdef HAVE_ZLIB
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
/*
* When writing a compressed dump, each block except
* the first one on each tape is written
if (compressed && do_compress) {
comp_buf->length = bufsize;
worklen = TP_BSIZE + writesize;
- compresult = compress2(comp_buf->buf, &worklen,
- (char *)slp->tblock[0], writesize, compressed);
- if (compresult == Z_OK && worklen <= (writesize - 16)) {
+#ifdef HAVE_ZLIB
+ if (!bzipflag) {
+ compresult = compress2(comp_buf->buf,
+ &worklen,
+ (char *)slp->tblock[0],
+ writesize,
+ compressed);
+ if (compresult == Z_OK)
+ compresult = 1;
+ else
+ compresult = 0;
+ }
+#endif /* HAVE_ZLIB */
+#ifdef HAVE_BZLIB
+ if (bzipflag) {
+ worklen2 = worklen;
+ compresult = BZ2_bzBuffToBuffCompress(
+ comp_buf->buf,
+ &worklen2,
+ (char *)slp->tblock[0],
+ writesize,
+ compressed,
+ 0, 30);
+ worklen = worklen2;
+ if (compresult == BZ_OK)
+ compresult = 1;
+ else
+ compresult = 0;
+ }
+
+#endif /* HAVE_BZLIB */
+ if (compresult && worklen <= (writesize - 16)) {
/* write the compressed buffer */
comp_buf->length = worklen;
comp_buf->compressed = 1;
}
/* compress the remaining blocks if we're compressing */
do_compress = compressed;
-#endif /* HAVE_ZLIB */
+#endif /* HAVE_ZLIB || HAVE_BZLIB */
if (sigsetjmp(jmpbuf, 1) == 0) {
ready = 1;
uspclptr = (union u_spcl *)&slp->tblock[0];
spclptr = &uspclptr->s_spcl;
if ((spclptr->c_magic == NFS_MAGIC) &&
- (spclptr->c_type == TS_INODE)) {
+ (spclptr->c_type == TS_INODE) &&
+ (spclptr->c_date == gThisDumpDate)) {
/* if an error occured previously don't
* try again */
if (gtperr == 0) {
git.wh0rd.org / dump.git / blobdiff