diff options
| author | Erlang/OTP <[email protected]> | 2011-12-27 15:20:41 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-12-27 15:20:41 +0100 |
| commit | a86e7ed23239cca282dc8aec28c06e2fd880c977 (patch) | |
| tree | 907bc1af89e3e731476bda4c8eb537a9ddf53fdf /erts/emulator/sys/common/erl_poll.c | |
| parent | 23a74bb235342e374b4da9eade8faf2d36fc66c2 (diff) | |
| parent | df828dcd8e4d42eee9d88f4747cff1730151e351 (diff) | |
| download | otp-a86e7ed23239cca282dc8aec28c06e2fd880c977.tar.gz otp-a86e7ed23239cca282dc8aec28c06e2fd880c977.tar.bz2 otp-a86e7ed23239cca282dc8aec28c06e2fd880c977.zip | |
Merge branch 'rickard/no-smp-dev-poll-bug/OTP-9844' into maint-r15
* rickard/no-smp-dev-poll-bug/OTP-9844:
Include wakeup pipe in /dev/poll poll-set also on non-SMP
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 |