Changeset f240823 for lib

Timestamp:

11/29/12 13:20:08 (9 years ago)

Author:

Richard Sanger <rjs51@…>

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:

2627439

Parents:

1935565

Message:

Added in a working trace_event handler, Shanes tests showed the default handler was not working for PACKET_MMAP. Also fixed minor calculate_buffers bugs resulting in larger buffer allocation then needed.

File:

• lib/format_linux.c (modified) (8 diffs)

lib/format_linux.c

@@ -272 +272 @@
         /* Calculate frame size */
         req->tp_frame_size = pagesize;
-        do {
+        while(req->tp_frame_size < mtu && req->tp_frame_size < LIBTRACE_PACKET_BUFSIZE){
                 req->tp_frame_size <<= 1;
-        } while(req->tp_frame_size < mtu && req->tp_frame_size < LIBTRACE_PACKET_BUFSIZE);
+        }
         if(req->tp_frame_size > LIBTRACE_PACKET_BUFSIZE)
                 req->tp_frame_size >>= 1;
@@ -282 +282 @@
         do{
                 req->tp_block_size >>= 1;
-        } while((CONF_RING_FRAMES * req->tp_frame_size) < req->tp_block_size);
+        } while((CONF_RING_FRAMES * req->tp_frame_size) <= req->tp_block_size);
         req->tp_block_size <<= 1;
         
@@ -295 +295 @@
                         (req->tp_block_size / req->tp_frame_size);
 
-        printf("MaxO 0x%x BS 0x%x BN 0x%x FS 0x%x FN 0x%x\n", 
+        /*printf("MaxO 0x%x BS 0x%x BN 0x%x FS 0x%x FN 0x%x\n", 
                 max_order, 
                 req->tp_block_size, 
                 req->tp_block_nr, 
                 req->tp_frame_size, 
-                req->tp_frame_nr);
+                req->tp_frame_nr);*/
         
         /* In case we have some silly values*/
@@ -933 +933 @@
 static int linuxring_get_framing_length(const libtrace_packet_t *packet);
 
-static int linuxring_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) {
-
-        struct tpacket2_hdr *header;
-        struct pollfd pollset;  
-        int ret;
-        
+/* Release a frame back to the kernel or free() if it's a malloc'd buffer 
+ */
+inline static void ring_release_frame(libtrace_t *libtrace, libtrace_packet_t *packet ){
         /* Free the old packet */
+        if(packet->buffer == NULL)
+                return;
+
         if(packet->buf_control == TRACE_CTRL_PACKET){
                 free(packet->buffer);
+                packet->buffer = NULL;
         }
         if(packet->buf_control == TRACE_CTRL_EXTERNAL) {
@@ -955 +956 @@
                 }
         }
+}
+
+static int linuxring_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) {
+
+        struct tpacket2_hdr *header;
+        struct pollfd pollset;  
+        int ret;
+        
+        ring_release_frame(libtrace, packet);
         
         packet->buf_control = TRACE_CTRL_EXTERNAL;
@@ -968 +978 @@
          */
         while (!(header->tp_status & TP_STATUS_USER)) {
+                printf("I shouldn't run if event handler\n");
                 pollset.fd = FORMAT(libtrace->format_data)->fd;
                 pollset.events = POLLIN;
@@ -994 +1005 @@
                                 linuxring_get_capture_length(packet);
 
+}
+
+/* Non-blocking read */
+static libtrace_eventobj_t linuxring_event(libtrace_t *libtrace, libtrace_packet_t *packet) {
+        struct tpacket2_hdr *header;
+        libtrace_eventobj_t event = {0,0,0.0,0};
+
+        /* We must free the old packet, otherwise select() will instantly return 
+         */
+        ring_release_frame(libtrace, packet);
+
+        /* Fetch the current frame */
+        header = GET_CURRENT_BUFFER(libtrace);
+        if(header->tp_status & TP_STATUS_USER){
+                /* We have a frame waiting */
+                event.size = linuxring_read_packet(libtrace, packet);
+                event.type = TRACE_EVENT_PACKET;
+        } else {
+                /* Ok we don't have a packet waiting */
+                event.type = TRACE_EVENT_IOWAIT;
+                event.fd = FORMAT(libtrace->format_data)->fd;
+        }
+
+        return event;
 }
 
@@ -1468 +1503 @@
         linuxnative_get_captured_packets,/* get_captured_packets */
         linuxnative_get_fd,             /* get_fd */
-        trace_event_device,             /* trace_event */
+        linuxring_event,                /* trace_event */
         linuxring_help,         /* help */
         NULL