Changeset 1762

Timestamp:

05/28/12 14:07:07 (13 months ago)

Author:

salcock

Message:

• Detect if a user is attempting to read a compressed format that their libtrace build does not support and provide an appropriate error. Previously, we'd just try to read the trace with a stdout reader, resulting in some very confusing results.

Location:

trunk

Files:

• lib/format_helper.c (modified) (1 diff)
• lib/libtrace.h.in (modified) (2 diffs)
• libwandio/wandio.c (modified) (2 diffs)

trunk/lib/format_helper.c

@@ -266 +266 @@
         io_t *io=wandio_create(trace->uridata);
         if (!io) {
-                trace_set_err(trace,errno,"Unable to open %s",trace->uridata);
+                if (errno != 0) {
+                        trace_set_err(trace,errno,"Unable to open %s",trace->uridata);
+                } else {
+                        trace_set_err(trace,TRACE_ERR_UNSUPPORTED_COMPRESS,"Unsupported compression error: %s", trace->uridata);
+                }
         }
         return io;

trunk/lib/libtrace.h.in

@@ -226 +226 @@
         TRACE_ERR_BAD_FILTER    = -9,
         /** RT communication breakdown */
-        TRACE_ERR_RT_FAILURE    = -10
+        TRACE_ERR_RT_FAILURE    = -10,
+        /** Compression format unsupported */
+        TRACE_ERR_UNSUPPORTED_COMPRESS  = -11
 };
 
@@ -744 +746 @@
         LT_BITFIELD32      to_ds:1;     /**< Packet to Distribution Service */
 #endif
+        
         uint16_t     duration;  /**< Duration value for NAV calculation */
         uint8_t      mac1[6];   /**< MAC Address 1 */

trunk/libwandio/wandio.c

@@ -141 +141 @@
                 return NULL;
         len = wandio_peek(io, buffer, sizeof(buffer));
-#if HAVE_LIBZ
         /* Auto detect gzip compressed data */
         if (len>=2 && buffer[0] == '\037' && buffer[1] == '\213') { 
+#if HAVE_LIBZ
                 DEBUG_PIPELINE("zlib");
                 io = zlib_open(io);
+#else
+                fprintf(stderr, "File %s is gzip compressed but libtrace has not been built with zlib support!\n", filename);
+                return NULL;
+#endif
         }
         /* Auto detect compress(1) compressed data (gzip can read this) */
         if (len>=2 && buffer[0] == '\037' && buffer[1] == '\235') {
+#if HAVE_LIBZ
                 DEBUG_PIPELINE("zlib");
                 io = zlib_open(io);
-        }
-#endif
-#if HAVE_LIBBZ2
+#else
+                fprintf(stderr, "File %s is compress(1) compressed but libtrace has not been built with zlib support!\n", filename);
+                return NULL;
+#endif
+        }
+
         /* Auto detect bzip compressed data */
         if (len>=3 && buffer[0] == 'B' && buffer[1] == 'Z' && buffer[2] == 'h') { 
+#if HAVE_LIBBZ2
                 DEBUG_PIPELINE("bzip");
                 io = bz_open(io);
-        }
-#endif
+#else
+                fprintf(stderr, "File %s is bzip compressed but libtrace has not been built with bzip2 support!\n", filename);
+                return NULL;
+#endif
+        }
         
         /* Now open a threaded, peekable reader using the appropriate module
@@ -218 +230 @@
 DLLEXPORT void wandio_destroy(io_t *io)
 { 
+        if (!io)
+                return;
+        
         if (keep_stats) 
                 fprintf(stderr,"LIBTRACEIO STATS: %"PRIu64" blocks on read\n", read_waits);