Changeset 808eeef for libwandio/wandio.c

Timestamp:

05/15/13 10:57:59 (9 years ago)

Author:

Shane Alcock <salcock@…>

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:

8a7d4b5

Parents:

d57ae6f

Message:

• Added 'noautodetect' option to the LIBTRACEIO environment variable so that automatic compression detection can be disabled for any libtrace format
• Removed debug output from format_erf.c

File:

• libwandio/wandio.c (modified) (5 diffs)

libwandio/wandio.c

@@ -55 +55 @@
 int force_directio_write = 0;
 int force_directio_read = 0;
+int use_autodetect = 1;
 unsigned int use_threads = -1;
 unsigned int max_buffers = 50;
@@ -65 +66 @@
  * directwrite -- bypass the diskcache on write
  * directread -- bypass the diskcache on read
+ * noautodetect -- disable autodetection of file compression, assume all files
+ *                 are uncompressed
  * nothreads -- Don't use threads
  * threads=n -- Use a maximum of 'n' threads for thread farms
@@ -82 +85 @@
         else if (strcmp(option,"nothreads") == 0)
                 use_threads = 0;
+        else if (strcmp(option,"noautodetect") == 0)
+                use_autodetect = 0;
         else if (strncmp(option,"threads=",8) == 0)
                 use_threads = atoi(option+8);
@@ -127 +132 @@
 static io_t *create_io_reader(const char *filename, int autodetect)
 {
-        parse_env();
 
         /* Use a peeking reader to look at the start of the trace file and
@@ -191 +195 @@
 
 DLLEXPORT io_t *wandio_create(const char *filename) {
-        return create_io_reader(filename, 1);
+        parse_env();
+        return create_io_reader(filename, use_autodetect);
 }
 
 DLLEXPORT io_t *wandio_create_uncompressed(const char *filename) {
+        parse_env();
         return create_io_reader(filename, 0);
 }