Changeset 25024fd

Timestamp:

12/03/07 23:10:18 (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:

4423dc7

Parents:

25a9201

Message:

Rework some structures to avoid padding issues

File:

• lib/libtrace_int.h (modified) (6 diffs)

lib/libtrace_int.h

@@ -119 +119 @@
 struct libtrace_event_status_t {
         libtrace_packet_t *packet;
-        int psize;
         double tdelta;
         double trace_last_ts;
+        int psize;
 };
 
@@ -129 +129 @@
 struct libtrace_t {
         struct libtrace_format_t *format; /**< format driver pointer */
+        struct libtrace_event_status_t event;   /**< the next event */
         void *format_data;              /**<format data pointer */
-        bool started;                   /**< if this trace has started */
-        libtrace_err_t err;             /**< error information */
-        struct libtrace_event_status_t event;   /**< the next event */
         struct libtrace_filter_t *filter; /**< used by libtrace if the module
                                             * doesn't support filters natively
@@ -147 +145 @@
         char *uridata;                  /**< the uri of this trace */
 
+        libtrace_err_t err;             /**< error information */
+        bool started;                   /**< if this trace has started */
 };
 
@@ -155 +155 @@
         struct libtrace_format_t *format;       /**< format driver */
         void *format_data;              /**< format data */
+        char *uridata;                  /**< URI associated with this trace */
+        libtrace_err_t err;             /**< Associated error */
         bool started;                   /**< trace started */
-        libtrace_err_t err;             /**< Associated error */
-        char *uridata;                  /**< URI associated with this trace */
 };
 
@@ -198 +198 @@
         uint8_t    dir;
         uint8_t    pad[3];
-} libtrace_pflog_header_t;
+} PACKED libtrace_pflog_header_t;
 
 
@@ -448 +448 @@
 struct libtrace_filter_t {
         struct bpf_program filter;
+        char * filterstring;
         int flag;
-        char * filterstring;
 };
 #else