Changeset 2808e89

Timestamp:

04/02/15 17:43:02 (6 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:

6210f82

Parents:

58bfabf (diff), 03f8943 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/develop' into develop

Include Shane's changes

• Block all signals in libwandio threads.

File:

• libwandio/ior-thread.c (modified) (4 diffs)

libwandio/ior-thread.c

@@ -44 +44 @@
 #include <stdbool.h>
 #include <errno.h>
+#include <signal.h>
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
@@ -167 +168 @@
 {
         io_t *state;
+        sigset_t set;
+        int s;
 
         if (!parent) {
@@ -172 +175 @@
         }
         
-
+        sigfillset(&set);
         state = malloc(sizeof(io_t));
         state->data = calloc(1,sizeof(struct state_t));
@@ -189 +192 @@
 
         /* Create the reading thread */
+        s = pthread_sigmask(SIG_SETMASK, &set, NULL);
         pthread_create(&DATA(state)->producer,NULL,thread_producer,state);
+        sigemptyset(&set);
+        s = pthread_sigmask(SIG_SETMASK, &set, NULL);
 
         return state;