Changeset b020bb9

Timestamp:

10/08/04 15:38:00 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

a1c7b8e

Parents:

725dc40

Message:

poink

File:

• lib/trace.c (modified) (1 diff)

lib/trace.c

@@ -404 +404 @@
                 buffer = malloc(len);
 
-        switch(libtrace->sourcetype) {
-                case SOCKET:
-                case RT:
-                        // read from the network
-                        if ((numbytes=recv(libtrace->input.fd, 
-                                                        buffer, 
-                                                        len, 
-                                                        MSG_NOSIGNAL)) == -1) {
-                                perror("recv");
-                                return -1;
-                        }
-                        break;
-                case DEVICE:
-                        if ((numbytes=read(libtrace->input.fd, 
-                                                        buffer, 
-                                                        len)) == -1) {
-                                perror("read");
-                                return -1;
-                        }
-                        break;
-                default:
-                        if ((numbytes=gzread(libtrace->input.file,
-                                                        buffer,
-                                                        len)) == -1) {
-                                perror("gzread");
-                                return -1;
-                        }
+        while(1) {
+                switch(libtrace->sourcetype) {
+                        case SOCKET:
+                        case RT:
+                                // read from the network
+                                if ((numbytes=recv(libtrace->input.fd, 
+                                                                buffer, 
+                                                                len, 
+                                                                MSG_NOSIGNAL)) == -1) {
+                                        if (errno == EINTR) {
+                                                // ignore EINTR in case 
+                                                // a caller is using signals
+                                                continue;
+                                        }
+                                        perror("recv");
+                                        return -1;
+                                }
+                                break;
+                        case DEVICE:
+                                if ((numbytes=read(libtrace->input.fd, 
+                                                                buffer, 
+                                                                len)) == -1) {
+                                        perror("read");
+                                        return -1;
+                                }
+                                break;
+                        default:
+                                if ((numbytes=gzread(libtrace->input.file,
+                                                                buffer,
+                                                                len)) == -1) {
+                                        perror("gzread");
+                                        return -1;
+                                }
+                }
+                break;
         }
         return numbytes;