Changeset 979a84f4

Timestamp:

09/20/11 15:50:53 (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:

50c5053

Parents:

c0ccccd

Message:

• We now cache the wire length as well
• If we're going to cache the link type, we should probably use it whenever we call trace_get_link_type()!

Location:

lib

Files:

• libtrace.h.in (modified) (1 diff)
• protocols_l2.c (modified) (2 diffs)
• trace.c (modified) (3 diffs)

lib/libtrace.h.in

@@ -420 +420 @@
         buf_control_t buf_control;      /**< Describes memory ownership */
         int capture_length;             /**< Cached capture length */
+        int wire_length;                /**< Cached wire length */
         int payload_length;             /**< Cached payload length */
         void *l2_header;                /**< Cached link header */

lib/protocols_l2.c

@@ -381 +381 @@
                 case TRACE_TYPE_METADATA:
                 case TRACE_TYPE_NONDATA:
-                        ((libtrace_packet_t*)packet)->link_type = *linktype;
                         ((libtrace_packet_t*)packet)->l2_header = meta;
                         ((libtrace_packet_t*)packet)->l2_remaining = *remaining;
@@ -414 +413 @@
                                 case TRACE_TYPE_METADATA:
                                 case TRACE_TYPE_NONDATA:
-                                        ((libtrace_packet_t*)packet)->link_type = *linktype;
                                         ((libtrace_packet_t*)packet)->l2_header = meta;
                                         ((libtrace_packet_t*)packet)->l2_remaining = *remaining;

lib/trace.c

@@ -1041 +1041 @@
  */ 
 DLLEXPORT size_t trace_get_wire_length(const libtrace_packet_t *packet){
-        if (packet->trace->format->get_wire_length) {
-                return packet->trace->format->get_wire_length(packet);
-        }
-        return ~0U;
+        
+        if (packet->wire_length == -1) {
+                if (!packet->trace->format->get_wire_length) 
+                        return ~0U;
+                ((libtrace_packet_t *)packet)->wire_length = 
+                        packet->trace->format->get_wire_length(packet);
+        }
+
+        assert(packet->wire_length < LIBTRACE_PACKET_BUFSIZE);
+        return packet->wire_length;
 
 }
@@ -1068 +1074 @@
  */
 DLLEXPORT libtrace_linktype_t trace_get_link_type(const libtrace_packet_t *packet ) {
-        if (packet->trace->format->get_link_type) {
-                return packet->trace->format->get_link_type(packet);
-        }
-        return (libtrace_linktype_t)-1;
+
+        if (packet->link_type == 0) {
+                if (!packet->trace->format->get_link_type)
+                        return (libtrace_linktype_t)-1;
+                ((libtrace_packet_t *)packet)->link_type =
+                        packet->trace->format->get_link_type(packet);
+        }
+
+        return packet->link_type;
 }
 
@@ -1834 +1845 @@
         packet->transport_proto = 0;
         packet->capture_length = -1;
+        packet->wire_length = -1;
         packet->payload_length = -1;
         packet->l2_remaining = 0;