Changeset e4f27d1

Timestamp:

02/19/15 13:05:59 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

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:

694823f

Parents:

5ab626a

Message:

Move the ring sizes to the stream structures, it's possible rings could end up different sizes.
Other than that their are many operation related to reading packets which rely upon it and
it seems more natural to include this against the stream.

Location:

lib

Files:

• format_linux_common.c (modified) (3 diffs)
• format_linux_common.h (modified) (2 diffs)
• format_linux_int.c (modified) (2 diffs)
• format_linux_ring.c (modified) (8 diffs)

lib/format_linux_common.c

@@ -221 +221 @@
                 close(stream->fd);
         stream->fd = -1;
-        /* TODO maybe store size against stream XXX */
         if (stream->rx_ring != MAP_FAILED)
                 munmap(stream->rx_ring,
-                       FORMAT_DATA->req.tp_block_size *
-                       FORMAT_DATA->req.tp_block_nr);
+                       stream->req.tp_block_size *
+                       stream->req.tp_block_nr);
         stream->rx_ring = MAP_FAILED;
         FORMAT_DATA->dev_stats.if_name[0] = 0;
@@ -422 +421 @@
                    MSG_DONTWAIT) != -1) { count++; }
         free(buf);
-        fprintf(stderr, "set offset %d", count);
 
         /* Mark that the stats are valid and apply an offset */
@@ -493 +491 @@
                                  libtrace_thread_t *t,
                                  bool reading) {
-        fprintf(stderr, "registering thread %d!!\n", t->perpkt_num);
         if (reading) {
                 /* XXX TODO remove this oneday make sure hasher thread still works */

lib/format_linux_common.h

@@ -216 +216 @@
         /* Flag indicating whether the statistics are current or not */
         int stats_valid;
-        /* The current ring buffer layout */
-        struct tpacket_req req;
         /* Used to determine buffer size for the ring buffer */
         uint32_t max_order;
@@ -257 +255 @@
         /* Offset within the mapped buffer */
         int rxring_offset;
+        /* The ring buffer layout */
+        struct tpacket_req req;
 } ALIGN_STRUCT(CACHE_LINE_SIZE);
 
-#define ZERO_LINUX_STREAM {-1, MAP_FAILED, 0}
+#define ZERO_LINUX_STREAM {-1, MAP_FAILED, 0, {0}}
 
 

lib/format_linux_int.c

@@ -132 +132 @@
         
 }
-
 
 #define LIBTRACE_MIN(a,b) ((a)<(b) ? (a) : (b))
@@ -457 +456 @@
         return trace_get_capture_length(packet);
 }
-
-
-
-
 
 #ifdef HAVE_NETPACKET_PACKET_H

lib/format_linux_ring.c

@@ -65 +65 @@
 #ifdef HAVE_NETPACKET_PACKET_H
 /* Get current frame in the ring buffer*/
-#define GET_CURRENT_BUFFER(libtrace, stream) \
+#define GET_CURRENT_BUFFER(stream) \
         ((void *)stream->rx_ring +                              \
          (stream->rxring_offset *                               \
-          FORMAT_DATA->req.tp_frame_size))
+          stream->req.tp_frame_size))
 #endif
 
@@ -120 +120 @@
         /* Calculate block size */
         req->tp_block_size = pagesize << max_order;
+        /* If max order is too high this might become 0 */
+        if (req->tp_block_size == 0) {
+                calculate_buffers(req, fd, uri, max_order-1);
+                return;
+        }
         do {
                 req->tp_block_size >>= 1;
@@ -178 +183 @@
          */
         while(1) {
-                fprintf(stderr, "max_order=%d\n", *max_order);
                 if (*max_order <= 0) {
                         strncpy(error,
@@ -202 +206 @@
                 } else break;
         }
-        fprintf(stderr, "max_order=%d\n", *max_order);
 
         /* Map the ring buffer into userspace */
@@ -260 +263 @@
         if(socket_to_packetmmap(libtrace->uridata, PACKET_RX_RING,
                                 stream->fd,
-                                &FORMAT_DATA->req,
+                                &stream->req,
                                 &stream->rx_ring,
                                 &FORMAT_DATA->max_order,
@@ -468 +471 @@
         
         /* Fetch the current frame */
-        header = GET_CURRENT_BUFFER(libtrace, stream);
+        header = GET_CURRENT_BUFFER(stream);
         assert((((unsigned long) header) & (pagesize - 1)) == 0);
 
@@ -534 +537 @@
         /* Move to next buffer */
         stream->rxring_offset++;
-        stream->rxring_offset %= FORMAT_DATA->req.tp_frame_nr;
+        stream->rxring_offset %= stream->req.tp_frame_nr;
 
         /* We just need to get prepare_packet to set all our packet pointers
@@ -575 +578 @@
 
         /* Fetch the current frame */
-        header = GET_CURRENT_BUFFER(libtrace, FORMAT_DATA_FIRST);
+        header = GET_CURRENT_BUFFER(FORMAT_DATA_FIRST);
         if (header->tp_status & TP_STATUS_USER) {
                 /* We have a frame waiting */