Changeset aa0c5c5

Timestamp:

03/12/10 13:40:20 (11 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

5e26f1d

Parents:

29d4438

Message:

Fix missed conflict in previous commit

File:

• lib/wandio.c (modified) (6 diffs)

lib/wandio.c

@@ -48 +48 @@
         { "GZ",         "gz",   WANDIO_COMPRESS_ZLIB    },
         { "BZ2",        "bz2",  WANDIO_COMPRESS_BZ2     },
+        { "LZO",        "lzo",  WANDIO_COMPRESS_LZO     },
         { "NONE",       "",     WANDIO_COMPRESS_NONE    }
 };
@@ -100 +101 @@
 
 
+>>>>>>> .r1529
 #define READ_TRACE 0
 #define WRITE_TRACE 0
@@ -110 +112 @@
          * determine what type of compression may have been used to write
          * the file */
+
         io_t *io = peek_open(stdio_open(filename));
         char buffer[1024];
@@ -194 +197 @@
 
         assert ( compression_level >= 0 && compression_level <= 9 );
+        fprintf(stderr,"Compression level= %d\n",compression_level);
+        fprintf(stderr,"flags=%d\n",flags);
 
         iow=stdio_wopen(filename);
@@ -202 +207 @@
         if (compression_level != 0 && 
             (flags & WANDIO_COMPRESS_MASK) == WANDIO_COMPRESS_ZLIB) {
+                fprintf(stderr,"GZip compression\n");
                 iow = zlib_wopen(iow,compression_level);
+        }
+#endif
+#if HAVE_LIBLZO2
+        else if (compression_level != 0 && 
+            (flags & WANDIO_COMPRESS_MASK) == WANDIO_COMPRESS_LZO) {
+                fprintf(stderr,"Using LZO\n");
+                iow = lzo_wopen(iow,compression_level);
         }
 #endif
@@ -208 +221 @@
         else if (compression_level != 0 && 
             (flags & WANDIO_COMPRESS_MASK) == WANDIO_COMPRESS_BZ2) {
+                fprintf(stderr,"BZ compression\n");
                 iow = bz_wopen(iow,compression_level);
         }
 #endif
+        else if (compression_level != 0) {
+                fprintf(stderr,"Compression %d unavailable\n",flags);
+        }
+        else {
+                fprintf(stderr,"No compression requested\n");
+        }
         /* Open a threaded writer */
         if (use_threads)