Changeset 24ca459

Timestamp:

09/16/11 10:13:25 (9 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:

f258932

Parents:

204872da

Message:

• Why not cache the capture length when we first read the packet, seeing as we had to look it up then anyway?

File:

• lib/format_pcapfile.c (modified) (3 diffs)

lib/format_pcapfile.c

@@ -137 +137 @@
 
 
-static uint16_t swaps(libtrace_t *libtrace, uint16_t num)
+static inline uint16_t swaps(libtrace_t *libtrace, uint16_t num)
 {
         /* To deal with open_dead traces that might try and use this
@@ -152 +152 @@
 }
 
-static uint32_t swapl(libtrace_t *libtrace, uint32_t num)
+static inline uint32_t swapl(libtrace_t *libtrace, uint32_t num)
 {
         /* To deal with open_dead traces that might try and use this
@@ -380 +380 @@
                 return -1;
         }
-        
+
+        /* We may as well cache this value now, seeing as we already had to 
+         * look it up */
+        packet->capture_length = bytes_to_read; 
         return sizeof(libtrace_pcapfile_pkt_hdr_t) + bytes_to_read;
 }