Changeset 15e9390 for lib

Timestamp:

10/15/09 17:49:42 (13 years ago)

Author:

Perry Lorier <perry@…>

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:

3c26e2a

Parents:

db03808

Message:

Rearrange struct fields to get better packing on 64bit machines.

Location:

lib

Files:

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

lib/dagformat.h

@@ -16 +16 @@
         uint32_t  hdlc;
         uint8_t   pload[1];             /**< payload */
-}  pos_rec_t;
+}  PACKED pos_rec_t;
 
 /** GPP Type 2 */
@@ -26 +26 @@
         uint16_t  etype;                /**< ether type (?) */
         uint8_t   pload[1];             /**< payload */
-}  eth_rec_t;
+}  PACKED eth_rec_t;
 
 /** GPP Type 3 */
@@ -32 +32 @@
         uint32_t  header; 
         uint8_t   pload[1];             /**< payload */
-}  atm_rec_t;
+}  PACKED atm_rec_t;
 
 /** GPP Type 4 */
@@ -38 +38 @@
         uint32_t  header; 
         uint8_t   pload[1];             /**< payload */
-}  aal5_rec_t;
+}  PACKED aal5_rec_t;
 
 /** Flags */

lib/format_pcapfile.c

@@ -62 +62 @@
                 int real_time;
         } options;
+        pcapfile_header_t header;
         bool started;
-        pcapfile_header_t header;
 };
 

lib/ior-thread.c

@@ -28 +28 @@
         pthread_cond_t data_ready;
         pthread_mutex_t mutex;
+        io_t *io;
         bool closing;
-        io_t *io;
 };
 

lib/ior-zlib.c

@@ -16 +16 @@
         z_stream strm;
         Bytef inbuff[1024*1024]; /* bytef is what zlib uses for buffer pointers */
+        io_t *parent;
         int outoffset;
-        io_t *parent;
         enum err_t err;
 };
@@ -53 +53 @@
 
 
-static off_t zlib_read(io_t *io, char *buffer, off_t len)
+static off_t zlib_read(io_t *io, void *buffer, off_t len)
 {
         if (DATA(io)->err == ERR_EOF)

lib/iow-thread.c

@@ -22 +22 @@
 struct state_t {
         struct buffer_t buffer[BUFFERS];
-        int out_buffer;
         off_t offset;
         pthread_t consumer;
-        bool closing;
         iow_t *iow;
         pthread_cond_t data_ready;
         pthread_cond_t space_avail;
         pthread_mutex_t mutex;
+        int out_buffer;
+        bool closing;
 };
 

lib/wandio.c

@@ -6 +6 @@
 
 struct compression_type compression_type[]  = {
-        { "GZ",         WANDIO_COMPRESS_ZLIB,   "gz" },
-        { "BZ2",        WANDIO_COMPRESS_BZ2,    "bz2" },
-        { "NONE",       WANDIO_COMPRESS_NONE,   ""}
+        { "GZ",         "gz",   WANDIO_COMPRESS_ZLIB    },
+        { "BZ2",        "bz2",  WANDIO_COMPRESS_BZ2     },
+        { "NONE",       "",     WANDIO_COMPRESS_NONE    }
 };
 

lib/wandio.h

@@ -9 +9 @@
 struct compression_type {
         const char *name;
+        const char *ext;
         int compress_flag;
-        const char *ext;
 };
 extern struct compression_type compression_type[];