Changeset 723f1af

Timestamp:

11/19/18 11:23:54 (4 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

1e6d795

Parents:

89609d0

Message:

Update linux ring pread to be able to read multiple packets per call.

File:

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

lib/format_linux_ring.c

@@ -500 +500 @@
                                         libtrace_packet_t *packet,
                                         struct linux_per_stream_t *stream,
-                                        libtrace_message_queue_t *queue) {
+                                        libtrace_message_queue_t *queue,
+                                        uint8_t block) {
 
         struct tpacket2_hdr *header;
@@ -512 +513 @@
         /* Fetch the current frame */
         header = GET_CURRENT_BUFFER(stream);
-        assert((((unsigned long) header) & (pagesize - 1)) == 0);
+        if ((((unsigned long) header) & (pagesize - 1)) != 0) {
+                trace_set_err(libtrace, TRACE_ERR_BAD_PACKET,
+                        "ring frame size is not a multiple of the page size");
+                return -1;
+        }
 
         /* TP_STATUS_USER means that we can use the frame.
@@ -519 +524 @@
          */
         while (!(header->tp_status & TP_STATUS_USER) ||
-               header->tp_status == TP_STATUS_LIBTRACE) {
-                if ((ret=is_halted(libtrace)) != -1)
-                        return ret;
+                        header->tp_status == TP_STATUS_LIBTRACE) {
+                if ((ret=is_halted(libtrace)) != -1)
+                        return ret;
+                if (!block) {
+                        return 0;
+                }
+
                 pollset[0].fd = stream->fd;
                 pollset[0].events = POLLIN;
@@ -610 +619 @@
                                    libtrace_thread_t *t,
                                    libtrace_packet_t *packets[],
-                                   UNUSED size_t nb_packets) {
-        /* For now just read one packet */
-        /* If we change this to actually read nb_packets, make sure
-         * we remove the burst_size override in linuxring_pstart_input()
-         */
-        packets[0]->error = linuxring_read_stream(libtrace, packets[0],
-                                                  t->format_data, &t->messages);
-        if (packets[0]->error >= 1)
-                return 1;
-        else
-                return packets[0]->error;
+                                   size_t nb_packets) {
+        size_t i;
+        int ret;
+
+        for (i = 0; i < nb_packets; i++) {
+                ret = linuxring_read_stream(libtrace, packets[i],
+                                t->format_data, &t->messages, i == 0 ? 1 : 0);
+                packets[i]->error = ret;
+                if (ret < 0) {
+                        return ret;
+                }
+
+                if (ret == 0) {
+                        if (is_halted(libtrace) == READ_EOF) {
+                                return READ_EOF;
+                        }
+                        return i;
+                }
+        }
+
+        return nb_packets;
 }
 #endif
@@ -661 +680 @@
         if (packet->buffer == NULL)
                 return;
-        assert(packet->trace);
+        if (!libtrace) {
+                return;
+        }
 
         /* If we own the packet (i.e. it's not a copy), we need to free it */