X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftape.c;h=edcf5d691925a6532dd71e8b30f75514d8190109;hp=6f829f88802083d8992b5ffd50462489c9298909;hb=b8db960b14856a2ab86e044b2ffa53612d2aa489;hpb=241ddca30657af0cb9dbc60685712d7a4989ee49

diff --git a/dump/tape.c b/dump/tape.c
index 6f829f8..edcf5d6 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.87 2004/11/22 10:32:32 stelian Exp $";
+	"$Id: tape.c,v 1.91 2009/06/18 09:50:54 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -187,6 +187,41 @@ static sigjmp_buf jmpbuf;	/* where to jump to if we are ready when the */
 static int gtperr = 0;
 #endif
 
+/*
+ * Determine if we can use Linux' clone system call.  If so, call it
+ * with the CLONE_IO flag so that all processes will share the same I/O
+ * context, allowing the I/O schedulers to make better scheduling decisions.
+ */
+#ifdef __linux__
+/* first, pull in the header files that define sys_clone and CLONE_IO */
+#include <syscall.h>
+#define _GNU_SOURCE
+#include <sched.h>
+#include <unistd.h>
+#undef _GNU_SOURCE
+
+/* If either is not present, fall back on the fork behaviour */
+#if ! defined(SYS_clone) || ! defined (CLONE_IO)
+#define fork_clone_io fork
+#else /* SYS_clone */
+/* CLONE_IO is available, determine which version of sys_clone to use */
+#include <linux/version.h>
+/*
+ * Kernel 2.5.49 introduced two extra parameters to the clone system call.
+ * Neither is useful in our case, so this is easy to handle.
+ */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,49)
+/* clone_flags, child_stack, parent_tidptr, child_tidptr */
+#define CLONE_ARGS SIGCHLD|CLONE_IO, 0, NULL, NULL
+#else
+#define CLONE_ARGS SIGCHLD|CLONE_IO, 0
+#endif /* LINUX_VERSION_CODE */
+pid_t fork_clone_io(void);
+#endif /* SYS_clone */
+#else /* __linux__ not defined */
+#define fork_clone_io fork
+#endif /* __linux__ */
+
 int
 alloctape(void)
 {
@@ -246,7 +281,7 @@ writerec(const void *dp, int isspcl)
 	/* Need to write it to the archive file */
 	if (! AfileActive && isspcl && (spcl.c_type == TS_END))
 		AfileActive = 1;
-	if (AfileActive && Afile >= 0) {
+	if (AfileActive && Afile >= 0 && !(spcl.c_flags & DR_EXTATTRIBUTES)) {
 		/* When we dump an inode which is not a directory,
 		 * it means we ended the archive contents */
 		if (isspcl && (spcl.c_type == TS_INODE) &&
@@ -420,6 +455,10 @@ flushtape(void)
 
 	int siz = (char *)nextblock - (char *)slp->req;
 
+	/* make sure returned has sane values in case we don't read 
+	 * them from the slave in this pass */
+	returned.unclen = returned.clen = writesize;
+
 	slp->req[trecno].count = 0;			/* Sentinel */
 
 	if (dump_atomic_write( slp->fd, (char *)slp->req, siz) != siz)
@@ -620,6 +659,10 @@ rollforward(void)
 	tslp = &slaves[SLAVES];
 	ntb = (union u_spcl *)tslp->tblock[1];
 
+	/* make sure returned has sane values in case we don't read 
+	 * them from the slave in this pass */
+	returned.unclen = returned.clen = writesize;
+
 	/*
 	 * Each of the N slaves should have requests that need to
 	 * be replayed on the next tape.  Use the extra slave buffers
@@ -747,6 +790,16 @@ rollforward(void)
 #endif
 }
 
+#ifdef __linux__
+#if defined(SYS_clone) && defined(CLONE_IO)
+pid_t
+fork_clone_io(void)
+{
+	return syscall(SYS_clone, CLONE_ARGS);
+}
+#endif
+#endif
+
 /*
  * We implement taking and restoring checkpoints on the tape level.
  * When each tape is opened, a new process is created by forking; this
@@ -793,7 +846,7 @@ restore_check_point:
 	/*
 	 *	All signals are inherited...
 	 */
-	childpid = fork();
+	childpid = fork_clone_io();
 	if (childpid < 0) {
 		msg("Context save fork fails in parent %d\n", parentpid);
 		Exit(X_ABORT);
@@ -1009,7 +1062,7 @@ enslave(void)
 		}
 
 		if (socketpair(AF_UNIX, SOCK_STREAM, 0, cmd) < 0 ||
-		    (slaves[i].pid = fork()) < 0)
+		    (slaves[i].pid = fork_clone_io()) < 0)
 			quit("too many slaves, %d (recompile smaller): %s\n",
 			    i, strerror(errno));
 
@@ -1302,7 +1355,8 @@ doslave(int cmd,
 				if ((spclptr->c_magic == NFS_MAGIC) && 
 							(spclptr->c_type == TS_INODE) &&
 							(spclptr->c_date == gThisDumpDate) &&
-							!(spclptr->c_dinode.di_mode & S_IFDIR)
+							!(spclptr->c_dinode.di_mode & S_IFDIR) &&
+							!(spclptr->c_flags & DR_EXTATTRIBUTES)
 						) {
 					foundone = 1;
 					/* if (cntntrecs >= maxntrecs) {	 only write every maxntrecs amount of data */