diff options
| author | Rickard Green <[email protected]> | 2011-12-30 15:21:24 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-12-30 15:21:24 +0100 |
| commit | 34dca57472ba2f4e82bb03d3713e3318613093bb (patch) | |
| tree | 9dfc465ec5f64edd5c2304117228ba834b43dcae /erts/emulator/sys/common/erl_poll.c | |
| parent | 8769a849dbbb70cb92733f484b2a0e1693e97eb7 (diff) | |
| parent | c6d37ba58c505ead46a3e939b3d38236dbd20aa5 (diff) | |
| download | otp-34dca57472ba2f4e82bb03d3713e3318613093bb.tar.gz otp-34dca57472ba2f4e82bb03d3713e3318613093bb.tar.bz2 otp-34dca57472ba2f4e82bb03d3713e3318613093bb.zip | |
Merge branch 'maint-r15' into maint
Conflicts:
erts/vsn.mk
Diffstat (limited to 'erts/emulator/sys/common/erl_poll.c')
| -rw-r--r-- | erts/emulator/sys/common/erl_poll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c index b6cb271f17..3817b1e4d5 100644 --- a/erts/emulator/sys/common/erl_poll.c +++ b/erts/emulator/sys/common/erl_poll.c @@ -1949,7 +1949,7 @@ check_fd_events(ErtsPollSet ps, SysTimeval *tv, int max_res) */ struct dvpoll poll_res; int nfds = (int) erts_smp_atomic_read_nob(&ps->no_of_user_fds); -#ifdef ERTS_SMP +#if ERTS_POLL_USE_WAKEUP_PIPE nfds++; /* Wakeup pipe */ #endif if (timeout > INT_MAX) @@ -2487,7 +2487,7 @@ ERTS_POLL_EXPORT(erts_poll_info)(ErtsPollSet ps, ErtsPollInfo *pip) pip->memory_size = size; pip->poll_set_size = (int) erts_smp_atomic_read_nob(&ps->no_of_user_fds); -#ifdef ERTS_SMP +#if ERTS_POLL_USE_WAKEUP_PIPE pip->poll_set_size++; /* Wakeup pipe */ #endif |