#ifndef lint
static const char rcsid[] =
- "$Id: tape.c,v 1.33 2001/03/18 15:35:44 stelian Exp $";
+ "$Id: tape.c,v 1.41 2001/04/10 12:46:53 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 <sys/socket.h>
#include <sys/time.h>
#include <sys/wait.h>
+#include <sys/mtio.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 */
/* received the SIGUSR2 signal from the prev slave? */
static sigjmp_buf jmpbuf; /* where to jump to if we are ready when the */
/* SIGUSR2 arrives from the previous slave */
+#ifdef USE_QFA
+static int gtperr = 0;
+#endif
int
alloctape(void)
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");
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));
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);
}
}
/ 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));
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__
open(tape, O_WRONLY|O_CREAT, 0666))) < 0)
#else
while ((tapefd = (pipeout ? fileno(stdout) :
- open(tape, O_WRONLY|O_CREAT, 0666))) < 0)
+ open(tape, O_RDWR|O_CREAT, 0666))) < 0)
#endif
{
msg("Cannot open output \"%s\".\n", tape);
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;
#ifdef __linux__
errcode_t retval;
#endif
+#ifdef USE_QFA
+ long curtapepos;
+ union u_spcl *uspclptr;
+ struct s_spcl *spclptr;
+#endif /* USA_QFA */
/*
* Need our own seek pointer.
quit("master/slave protocol botched.\n");
}
}
- if (sigsetjmp(jmpbuf, 1) == 0) {
- ready = 1;
- if (!caught)
- (void) pause();
- }
- ready = 0;
- caught = 0;
+#ifdef USE_QFA
+ if (gTapeposfd >= 0) {
+ uspclptr = (union u_spcl *)&slp->tblock[0];
+ spclptr = &uspclptr->s_spcl;
+ if ((spclptr->c_magic == NFS_MAGIC) &&
+ (spclptr->c_type == TS_INODE)) {
+ /* if an error occured previously don't
+ * try again */
+ if (gtperr == 0) {
+ if ((gtperr = GetTapePos(&curtapepos)) == 0) {
+#ifdef DEBUG_QFA
+ msg("inode %ld at tapepos %ld\n", spclptr->c_inumber, curtapepos);
+#endif
+ sprintf(gTps, "%ld\t%d\t%ld\n", (unsigned long)spclptr->c_inumber, tapeno, curtapepos);
+ if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps)) {
+ quit("error writing tapepos file.\n");
+ }
+ }
+ }
+ }
+ }
+#endif /* USE_QFA */
+
/* Try to write the data... */
wrote = 0;
eot_count = 0;
#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
* 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) {
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;
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)
} while (got == -1 && errno == EINTR);
return (got < 0 ? got : count - need);
}
+
+
+#ifdef USE_QFA
+/*
+ * read the current tape position
+ */
+int
+GetTapePos(long *pos)
+{
+ int err = 0;
+
+ *pos = 0;
+ if (ioctl(tapefd, MTIOCPOS, pos) == -1) {
+ err = errno;
+ msg("[%ld] error: %d (getting tapepos: %ld)\n", getpid(),
+ err, *pos);
+ return err;
+ }
+ return err;
+}
+#endif /* USE_QFA */