Changeset 9b533c6

Timestamp:

01/08/15 18:52:13 (7 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:

706561a

Parents:

1960910

Message:

Converts int and ring to support the batch pread interface

File:

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

lib/format_linux.c

@@ -1148 +1148 @@
                         }
                         // Otherwise we must have a packet
-                        hdr->wirelen = recvmsg(fd, &msghdr, 0);
+                        hdr->wirelen = recvmsg(fd, &msghdr, MSG_TRUNC);
                 }
         } else {
@@ -1261 +1261 @@
 }
 
-static int linuxnative_pread_packet(libtrace_t *libtrace, libtrace_thread_t *t, libtrace_packet_t *packet)
-{
+static int linuxnative_pread_packets(libtrace_t *libtrace,
+                                     libtrace_thread_t *t,
+                                     libtrace_packet_t **packets,
+                                     UNUSED size_t nb_packets) {
+        /* For now just read one packet */
         int fd = PERPKT_FORMAT(t)->fd;
-        //fprintf(stderr, "Thread number is #%d fd=%d\n", t->perpkt_num, PERPKT_FORMAT(t)->fd);
-        return linuxnative_read_packet_fd(libtrace, packet, fd, 1);
+        packets[0]->error = linuxnative_read_packet_fd(libtrace, packets[0],
+                                                       fd, 1);
+        if (packets[0]->error >= 1)
+                return 1;
+        else
+                return packets[0]->error;
 }
 
@@ -1415 +1422 @@
 }
 
-static int linuxring_pread_packet(libtrace_t *libtrace, libtrace_thread_t *t, libtrace_packet_t *packet) {
+static int linuxring_pread_packets(libtrace_t *libtrace,
+                                   libtrace_thread_t *t,
+                                   libtrace_packet_t **packets,
+                                   UNUSED size_t nb_packets) {
         //fprintf(stderr, "Thread number is #%d\n", t->perpkt_num);
         int fd = PERPKT_FORMAT(t)->fd;
         int *rxring_offset = &PERPKT_FORMAT(t)->rxring_offset;
         char *rx_ring = PERPKT_FORMAT(t)->rx_ring;
-        return linuxring_read_packet_fd(libtrace, packet, fd, rxring_offset, rx_ring, 1);
+        packets[0]->error = linuxring_read_packet_fd(libtrace, packets[0], fd,
+                                                     rxring_offset, rx_ring, 1);
+        if (packets[0]->error >= 1)
+                return 1;
+        else
+                return packets[0]->error;
 }
 
@@ -1951 +1966 @@
         {true, -1},              /* Live, no thread limit */
         linuxnative_pstart_input,                       /* pstart_input */
-        linuxnative_pread_packet,                       /* pread_packet */
+        linuxnative_pread_packets,                      /* pread_packets */
         linuxnative_ppause_input,                       /* ppause */
         linuxnative_fin_input,                          /* p_fin */
@@ -2002 +2017 @@
         {true, -1},              /* Live, no thread limit */
         linuxnative_pstart_input,                       /* pstart_input */
-        linuxring_pread_packet,                 /* pread_packet */
+        linuxring_pread_packets,                        /* pread_packets */
         linuxnative_ppause_input,                       /* ppause */
         linuxnative_fin_input,                          /* p_fin */