Changeset 74ecbc7 for lib

Timestamp:

03/21/14 16:23:48 (8 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:

dad224b

Parents:

1ca603b

Message:

Add more user-friendly checks for output file compression options

• No longer assert fail if the level is outside the allowed range
• Actually check that a valid compression method has been provided
• Failing either check will result in NULL being returned by trace_open_file_out and the libtrace error being set appropriately
• Added TRACE_OPTION_COMPRESSTYPE_LAST to compression method enum, so we can always easily tell if the value is outside the expected range.

Location:

lib

Files:

• format_helper.c (modified) (1 diff)
• libtrace.h.in (modified) (1 diff)

lib/format_helper.c

@@ -263 +263 @@
 {
         iow_t *io = NULL;
-        assert(level<10);
-        assert(level>=0);
+
+        if (level < 0 || level > 9) {
+                trace_set_err_out(trace, TRACE_ERR_UNSUPPORTED_COMPRESS, 
+                                "Compression level %d is invalid, must be between 0 and 9 inclusive", 
+                                level);
+                return NULL;
+        }
+
+        if (compress_type < 0 || 
+                        compress_type >= TRACE_OPTION_COMPRESSTYPE_LAST) {
+                trace_set_err_out(trace, TRACE_ERR_UNSUPPORTED_COMPRESS,
+                                "Invalid compression type %d", compress_type);
+                return NULL;
+        }
 
         io = wandio_wcreate(trace->uridata, compress_type, level, fileflag);

lib/libtrace.h.in

@@ -1210 +1210 @@
         TRACE_OPTION_COMPRESSTYPE_ZLIB = 1, /**< GZip Compression */
         TRACE_OPTION_COMPRESSTYPE_BZ2  = 2, /**< BZip2 Compression */
-        TRACE_OPTION_COMPRESSTYPE_LZO  = 3  /**< LZO Compression */
+        TRACE_OPTION_COMPRESSTYPE_LZO  = 3,  /**< LZO Compression */
+        TRACE_OPTION_COMPRESSTYPE_LAST
 } trace_option_compresstype_t;