Changeset a151dda for lib

Timestamp:

09/30/15 13:58:44 (5 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

348396b

Parents:

d391ce0

Message:

Blind attempt at adding buckets to bpf:

File:

• lib/format_bpf.c (modified) (7 diffs)

lib/format_bpf.c

@@ -117 +117 @@
         /* A boolean flag indicating whether the statistics are up-to-date */
         int stats_valid;
+        /* Bucket data structure for safely storing buffers of packets */
+        libtrace_bucket_t *bucket;
 };
 
@@ -139 +141 @@
         FORMATIN(libtrace)->snaplen = 65536;
         FORMATIN(libtrace)->stats_valid = 0;
+        FORMATIN(libtrace)->bucket = libtrace_bucket_init();
 
         return 0;
@@ -203 +206 @@
         }
 
-        FORMATIN(libtrace)->buffer = malloc(FORMATIN(libtrace)->buffersize);
-        FORMATIN(libtrace)->bufptr = FORMATIN(libtrace)->buffer;
+        FORMATIN(libtrace)->buffer = NULL;
+        FORMATIN(libtrace)->bufptr = NULL;
         FORMATIN(libtrace)->remaining = 0;
 
@@ -344 +347 @@
 static int bpf_fin_input(libtrace_t *libtrace) 
 {
-        free(libtrace->format_data);
+        libtrace_bucket_destroy(FORMATIN(libtrace)->bucket);
+        free(libtrace->format_data);
         return 0;
 }
@@ -457 +461 @@
         packet->type = bpf_linktype_to_rt(FORMATIN(libtrace)->linktype);
 
+        if (FORMATIN(libtrace)->remaining <= 0) {
+                FORMATIN(libtrace)->buffer = malloc(FORMATIN(libtrace)->buffer_size);
+                libtrace_create_new_bucket(FORMATIN(libtrace)->bucket, FORMATIN(libtrace)->buffer);
+        }
+
         while (FORMATIN(libtrace)->remaining <= 0) {
+
                 tout.tv_sec = 0;
                 tout.tv_usec = 500000;
@@ -503 +513 @@
         flags |= TRACE_PREP_DO_NOT_OWN_BUFFER;
 
-        if (packet->buf_control == TRACE_CTRL_PACKET)
+        if (packet->buffer && packet->buf_control == TRACE_CTRL_PACKET)
                 free(packet->buffer);
 
@@ -512 +522 @@
                 return -1;
         }
-        
-
-        /* Skip past the packet record we're going to return, making sure
+
+        packet->internalid = libtrace_push_into_bucket(FORMATIN(libtrace)->bucket);
+        packet->srcbucket = FORMATIN(libtrace)->bucket;
+
+        /* Skip past the packet record we're going to return, making sure
          * that we deal with padding correctly */
         FORMATIN(libtrace)->bufptr+=