1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
From ee8b84b9c183edadb6d7daad61a1d7ce80a0abc2 Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Mon, 9 Feb 2015 22:31:25 -0800
Subject: [PATCH 05/11] epoll/kqueue on older rubies (without
rb_wait_for_single_fd) should use rb_thread_select with regular fdset
epoll/kqueue fds are created early during ruby boot, so it is highly
unlikely that they will ever overflow FD_SETSIZE
---
ext/em.cpp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/ext/em.cpp b/ext/em.cpp
index a279893..392bc9d 100644
--- a/ext/em.cpp
+++ b/ext/em.cpp
@@ -524,12 +524,12 @@ void EventMachine_t::_RunEpollOnce()
#ifdef HAVE_RB_WAIT_FOR_SINGLE_FD
if ((ret = rb_wait_for_single_fd(epfd, RB_WAITFD_IN|RB_WAITFD_PRI, &tv)) < 1) {
#else
- rb_fdset_t fdreads;
+ fd_set fdreads;
- rb_fd_init(&fdreads);
- rb_fd_set(epfd, &fdreads);
+ FD_ZERO(&fdreads);
+ FD_SET(epfd, &fdreads);
- if ((ret = rb_thread_fd_select(epfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
+ if ((ret = rb_thread_select(epfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
#endif
if (ret == -1) {
assert(errno != EINVAL);
@@ -601,12 +601,12 @@ void EventMachine_t::_RunKqueueOnce()
#ifdef HAVE_RB_WAIT_FOR_SINGLE_FD
if ((ret = rb_wait_for_single_fd(kqfd, RB_WAITFD_IN|RB_WAITFD_PRI, &tv)) < 1) {
#else
- rb_fdset_t fdreads;
+ fd_set fdreads;
- rb_fd_init(&fdreads);
- rb_fd_set(kqfd, &fdreads);
+ FD_ZERO(&fdreads);
+ FD_SET(kqfd, &fdreads);
- if ((ret = rb_thread_fd_select(kqfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
+ if ((ret = rb_thread_select(kqfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
#endif
if (ret == -1) {
assert(errno != EINVAL);
@@ -848,9 +848,9 @@ void EventMachine_t::_RunSelectOnce()
SelectData_t SelectData;
/*
- rb_fdset_t fdreads, fdwrites;
- rb_fd_init (&fdreads);
- rb_fd_init (&fdwrites);
+ fd_set fdreads, fdwrites;
+ FD_ZERO (&fdreads);
+ FD_ZERO (&fdwrites);
int maxsocket = 0;
*/
--
2.1.4
|
