Changeset 948ed9a

Timestamp:

01/11/11 13:17:19 (11 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:

09dd4f1

Parents:

5bd27a3

Message:

• Ensure that off_t is a consistent size across all components of libtrace IO - this should fix the threading issue on 32-bit systems.
• Revert previous band-aid fix as it is no longer necessary.

Location:

lib

Files:

• ior-thread.c (modified) (2 diffs)
• ior-zlib.c (modified) (1 diff)
• wandio.h (modified) (1 diff)

lib/ior-thread.c

@@ -76 +76 @@
         int in_buffer;
         /* The read offset into the current buffer */
-        int offset;
+        off_t offset;
         /* The reading thread */
         pthread_t producer;
@@ -192 +192 @@
 }
 
-static off_t thread_read(io_t *state, void *buffer, const off_t to_read)
+static off_t thread_read(io_t *state, void *buffer, off_t len)
 {
         int slice;
         int copied=0;
         int newbuffer;
-        int len = to_read;
 
         while(len>0) {

lib/ior-zlib.c

@@ -33 +33 @@
 
 
+#include "wandio.h"
 #include <zlib.h>
-#include "wandio.h"
 #include <sys/types.h>
 #include <sys/stat.h>

lib/wandio.h

@@ -34 +34 @@
 #ifndef IO_H 
 #define IO_H 1 /**< Guard Define */
+#include "config.h"
 #include <sys/types.h>
 #include <stdio.h>