Changeset 08f5060

Timestamp:

09/05/14 16:21:26 (6 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:

cf686e1

Parents:

9f43919

Message:

bpf: now respects trace_interrupt

File:

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

lib/format_bpf.c

@@ -422 +422 @@
         packet->payload=(char *)buffer + BPFHDR(packet)->bh_hdrlen;
 
-        /*
-        if (libtrace->format_data == NULL) {
-                if (bpf_init_input(libtrace))
-                        return -1;
-        }
-        */
-
         return 0;
 }
@@ -439 +432 @@
 {
         uint32_t flags = 0;
+        fd_set readfds;
+        struct timeval tout;
+        int ret;
 
         packet->type = bpf_linktype_to_rt(FORMATIN(libtrace)->linktype);
+
+        while (FORMATIN(libtrace)->remaining <= 0) {
+                tout.tv_sec = 0;
+                tout.tv_usec = 500000;
+                FD_ZERO(&readfds);
+                FD_SET(FORMATIN(libtrace)->fd, &readfds);
+
+                ret = select(FORMATIN(libtrace)->fd + 1, &readfds, NULL,
+                                NULL, &tout);
+                if (ret < 0 && errno != EINTR) {
+                        trace_set_err(libtrace, errno, "select");
+                        return -1;
+                } else if (ret < 0) {
+                        continue;
+                }
+
+                if (FD_ISSET(FORMATIN(libtrace)->fd, &readfds)) {
+                        /* Packets are available, read into buffer */
+                        ret=read(FORMATIN(libtrace)->fd,
+                                FORMATIN(libtrace)->buffer,
+                                FORMATIN(libtrace)->buffersize);
+
+                        if (ret == -1) {
+                                trace_set_err(libtrace,errno,"Failed to read");
+                                return -1;
+                        }
+
+                        if (ret == 0) {
+                                /* EOF */
+                                return 0;
+                        }
+
+                        FORMATIN(libtrace)->remaining=ret;
+                        FORMATIN(libtrace)->bufptr=
+                                        FORMATIN(libtrace)->buffer;
+                        break;
+                }
+
+                /* Timed out -- check if we should halt */
+                if (libtrace_halt)
+                        return 0;
+        }
         
-        /* Read from the BPF interface into our capture buffer */
-        if (FORMATIN(libtrace)->remaining<=0) {
-                int ret;
-
-                ret=read(FORMATIN(libtrace)->fd,
-                        FORMATIN(libtrace)->buffer,
-                        FORMATIN(libtrace)->buffersize);
-
-                if (ret == -1) {
-                        trace_set_err(libtrace,errno,"Failed to read");
-                        return -1;
-                }
-
-                if (ret == 0) {
-                        /* EOF */
-                        return 0;
-                }
-
-                FORMATIN(libtrace)->remaining=ret;
-                FORMATIN(libtrace)->bufptr=
-                                FORMATIN(libtrace)->buffer;
-        }
-
         /* We do NOT want anything trying to free the memory the packet is
          * stored in */