Changeset cc27c86 for lib/iow-zlib.c

Timestamp:

01/09/12 14:20:33 (10 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:

a0ec6f1

Parents:

a566d9c3

Message:

• Fixed bug where a zlib writer was not being flushed correctly during zlib_wclose(). The problem was that we were not handling the case where Z_BUF_ERROR is returned by the final deflate() call, instead jumping straight to closing as though we had gotten a Z_STREAM_END.

This should fix that annoying problem where the occasionaly trace file written by libtrace reports "Truncated packet" when being read back in.

File:

• lib/iow-zlib.c (modified) (3 diffs)

lib/iow-zlib.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 /* Libtrace IO module implementing a zlib writer */
@@ -142 +143 @@
 static void zlib_wclose(iow_t *iow)
 {
-        while (deflate(&DATA(iow)->strm, Z_FINISH) == Z_OK) {
-                /* Need to flush the output buffer */
+        int res;
+        
+        while (1) {
+                res = deflate(&DATA(iow)->strm, Z_FINISH);
+
+                if (res == Z_STREAM_END)
+                        break;
+                if (res == Z_STREAM_ERROR) {
+                        fprintf(stderr, "Z_STREAM_ERROR while closing output\n");
+                        break;
+                }
+        
                 wandio_wwrite(DATA(iow)->child, 
                                 (char*)DATA(iow)->outbuff,
@@ -150 +161 @@
                 DATA(iow)->strm.avail_out = sizeof(DATA(iow)->outbuff);
         }
+
         deflateEnd(&DATA(iow)->strm);
         wandio_wwrite(DATA(iow)->child,