Changeset f3e1f19 for lib

Timestamp:

10/16/18 15:55:10 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop, master, ringperformance

Children:

928db3d, dab79f2

Parents:

fe4940e

Message:

Make sure we use cached framing length wherever possible

Location:

lib

Files:

• format_erf.c (modified) (4 diffs)
• trace.c (modified) (2 diffs)

lib/format_erf.c

@@ -469 +469 @@
                 packet->payload = NULL;
         } else {
-                packet->payload = (char*)packet->buffer + erf_get_framing_length(packet);
+                packet->payload = (char*)packet->buffer + trace_get_framing_length(packet);
         }
 
@@ -765 +765 @@
         dag_record_t *erfptr = 0;
         int caplen;
+        size_t framinglen;
+        uint16_t wlen, rlen;
+
         if (packet->payload == NULL)
-                return 0; 
-        
+                return 0;
+
         erfptr = (dag_record_t *)packet->header;
-        caplen = ntohs(erfptr->rlen) - erf_get_framing_length(packet);
-        if (ntohs(erfptr->wlen) < caplen)
-                return ntohs(erfptr->wlen);
-
-        return (ntohs(erfptr->rlen) - erf_get_framing_length(packet));
+        framinglen = trace_get_framing_length(packet);
+        rlen = ntohs(erfptr->rlen);
+        wlen = ntohs(erfptr->wlen);
+
+        caplen = rlen - framinglen;
+        if (wlen < caplen)
+                return wlen;
+
+        return caplen;
 }
 
@@ -788 +795 @@
 size_t erf_set_capture_length(libtrace_packet_t *packet, size_t size) {
         dag_record_t *erfptr = 0;
+        uint16_t wlen;
+
         assert(packet);
         erfptr = (dag_record_t *)packet->header;
@@ -800 +809 @@
          * return the wrong value. */
         packet->capture_length = -1;
-        erfptr->rlen = htons(size + erf_get_framing_length(packet));
-        return trace_get_capture_length(packet);
+        erfptr->rlen = htons(size + trace_get_framing_length(packet));
+        wlen = ntohs(erfptr->wlen);
+
+        if (wlen < size) {
+                return wlen;
+        }
+
+        return size;
 }
 

lib/trace.c

@@ -1382 +1382 @@
         }
 
+        if (packet->framing_length >= 0) {
+                return packet->framing_length;
+        }
+
         if (packet->trace->format->get_framing_length) {
-                return packet->trace->format->get_framing_length(packet);
+                ((libtrace_packet_t *)packet)->framing_length =
+                       packet->trace->format->get_framing_length(packet);
+                return packet->framing_length;
         }
         return ~0U;
@@ -2403 +2409 @@
         packet->capture_length = -1;
         packet->wire_length = -1;
+        packet->framing_length = -1;
         packet->payload_length = -1;
         packet->l2_remaining = 0;