Unlimited fast inode exclusion.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index c7affa8413cd586fa54d2c46ac3289e963404a65..007a37d8b0fbc97171de505be17f4fe4d07e3cdd 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.84 2003/03/30 15:40:36 stelian Exp $";
+       "$Id: main.c,v 1.86 2003/05/12 14:16:39 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -101,7 +101,7 @@ char        *tapeprefix;    /* prefix of the tape file */
 char   *dumpdates;     /* name of the file containing dump date information*/
 char   lastlevel;      /* dump level of previous dump */
 char   level;          /* dump level of this dump */
-int    bzipflag;       /* compression is done using bzlib */
+int    zipflag;        /* which compression method */
 int    Afile = -1;     /* archive file descriptor */
 int    AfileActive = 1;/* Afile flag */
 int    uflag;          /* update flag */
@@ -186,8 +186,8 @@ static void do_exclude_from_file __P((char *));
 static void do_exclude_ino_str __P((char *));
 static void incompat_flags __P((int, char, char));
 
-static dump_ino_t iexclude_list[IEXCLUDE_MAXNUM];/* the inode exclude list */
-static int iexclude_num = 0;                   /* number of elements in the list */
+static char* iexclude_bitmap = NULL;   /* the inode exclude bitmap */
+static int iexclude_bitmap_bytes = 0;  /* size of bitmap in bytes */
 
 int
 main(int argc, char *argv[])
@@ -254,6 +254,9 @@ main(int argc, char *argv[])
                            "Q:"
 #endif
                            "s:ST:uvWw"
+#ifdef HAVE_LZO
+                           "y"
+#endif
 #ifdef HAVE_ZLIB
                            "z::"
 #endif
@@ -340,7 +343,7 @@ main(int argc, char *argv[])
 #ifdef HAVE_BZLIB
                case 'j':
                        compressed = 2;
-                       bzipflag = 1;
+                       zipflag = COMPRESS_BZLIB;
                        if (optarg)
                                compressed = numarg("compress level", 1L, 9L);
                        break;
@@ -429,9 +432,17 @@ main(int argc, char *argv[])
                case 'w':
                        lastdump(ch);
                        exit(X_FINOK);  /* do nothing else */
+#ifdef HAVE_LZO
+               case 'y':
+                       compressed = 2;
+                       zipflag = COMPRESS_LZO;
+                       break;
+#endif /* HAVE_LZO */
+
 #ifdef HAVE_ZLIB
                case 'z':
                        compressed = 2;
+                       zipflag = COMPRESS_ZLIB;
                        if (optarg)
                                compressed = numarg("compress level", 1L, 9L);
                        break;
@@ -754,9 +765,13 @@ main(int argc, char *argv[])
                
                msg("Writing %d Kilobyte records\n", ntrec);
 
-               if (compressed)
-                       msg("Compressing output at compression level %d (%s)\n", 
-                           compressed, bzipflag ? "bzlib" : "zlib");
+               if (compressed) {
+                       if (zipflag == COMPRESS_LZO) 
+                               msg("Compressing output (lzo)\n");
+                       else
+                               msg("Compressing output at compression level %d (%s)\n", 
+                                       compressed, zipflag == COMPRESS_ZLIB ? "zlib" : "bzlib");
+               }
        }
 
 #if defined(SIGINFO)
@@ -1050,10 +1065,13 @@ usage(void)
                "[-j zlevel] "
 #endif
 #ifdef USE_QFA
-               "[-Q file] "
+               "[-Q file]\n"
+#endif
+               "\t%s [-s feet] "
+               "[-T date] "
+#ifdef HAVE_LZO
+               "[-y] "
 #endif
-               "[-s feet]\n"
-               "\t%s [-T date] "
 #ifdef HAVE_ZLIB
                "[-z zlevel] "
 #endif
@@ -1206,40 +1224,66 @@ obsolete(int *argcp, char **argvp[])
 }
 
 /*
- * This tests whether an inode is in the exclude list
+ * This tests whether an inode is in the exclude bitmap
  */
 int
 exclude_ino(dump_ino_t ino)
 {
-       /* 04-Feb-00 ILC */
-       if (iexclude_num) {     /* if there are inodes in the exclude list */
-               int idx;        /* then check this inode against it */
-               for (idx = 0; idx < iexclude_num; idx++)
-                       if (ino == iexclude_list[idx])
-                               return 1;
+       /* if the inode exclude bitmap exists and covers given inode */
+       if (iexclude_bitmap && iexclude_bitmap_bytes > ino / 8) {
+               /* then check this inode against it */
+               int idx = iexclude_bitmap[ino / 8];
+               if (idx & (1 << (ino % 8)))
+                       return 1;
        }
        return 0;
 }
 
 /*
- * This tests adds an inode to the exclusion list if it isn't already there
+ * This adds an inode to the exclusion bitmap if it isn't already there
  */
 void
 do_exclude_ino(dump_ino_t ino, const char *reason)
 {
-       if (!exclude_ino(ino)) {
-               if (iexclude_num == IEXCLUDE_MAXNUM) {
-                       msg("Too many exclude options\n");
-                       msg("The ENTIRE dump is aborted.\n");
-                       exit(X_STARTUP);
-               }
+       if (exclude_ino(ino))
+               return;
+
+       if (vflag) {
                if (reason)
-                       msg("Excluding inode %u (%s) from dump\n", 
-                           ino, reason);
+                       msg("Excluding inode %u (%s) from dump\n", ino, reason);
                else
                        msg("Excluding inode %u from dump\n", ino);
-               iexclude_list[iexclude_num++] = ino;
        }
+
+       /* check for enough mem; initialize */
+       if ((ino/8 + 1) > iexclude_bitmap_bytes) {
+               if (iexclude_bitmap_bytes == 0) {
+                       iexclude_bitmap_bytes = 2 * (ino/8 + 1);
+                       iexclude_bitmap = (char*) malloc(iexclude_bitmap_bytes);
+                       if (iexclude_bitmap == NULL) {
+                               msg("allocating memory failed\n");
+                               exit(X_STARTUP);
+                       }
+                       int j;
+                       for (j = 0; j < iexclude_bitmap_bytes; j++)
+                               iexclude_bitmap[j] = 0;
+               }
+               else {
+                       int oldsize = iexclude_bitmap_bytes;
+                       iexclude_bitmap_bytes *= 
+                               (ino / 8 + 1) / iexclude_bitmap_bytes + 1;
+                       iexclude_bitmap = (char*) realloc(iexclude_bitmap, 
+                               iexclude_bitmap_bytes);
+                       if (iexclude_bitmap == NULL) {
+                               msg("allocating memory failed\n");
+                               exit(X_STARTUP);
+                       }
+                       for( ; oldsize < iexclude_bitmap_bytes; oldsize++)
+                               iexclude_bitmap[oldsize] = 0;
+               }
+       }
+               
+       iexclude_bitmap[ino / 8] |= 1 << (ino % 8);
 }
 
 static void