Changeset 2808e89


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • libwandio/ior-thread.c

    r10f924c rcd37cdc  
    4444#include <stdbool.h>
    4545#include <errno.h>
     46#include <signal.h>
    4647#ifdef HAVE_SYS_PRCTL_H
    4748#include <sys/prctl.h>
     
    167168{
    168169        io_t *state;
     170        sigset_t set;
     171        int s;
    169172
    170173        if (!parent) {
     
    172175        }
    173176       
    174 
     177        sigfillset(&set);
    175178        state = malloc(sizeof(io_t));
    176179        state->data = calloc(1,sizeof(struct state_t));
     
    189192
    190193        /* Create the reading thread */
     194        s = pthread_sigmask(SIG_SETMASK, &set, NULL);
    191195        pthread_create(&DATA(state)->producer,NULL,thread_producer,state);
     196        sigemptyset(&set);
     197        s = pthread_sigmask(SIG_SETMASK, &set, NULL);
    192198
    193199        return state;
Note: See TracChangeset for help on using the changeset viewer.