event 0.2.1 → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ext/event/Makefile +266 -0
- data/ext/event/backend/backend.h +2 -0
- data/ext/event/backend/epoll.c +83 -14
- data/ext/event/backend/kqueue.c +184 -50
- data/ext/event/backend/uring.c +191 -80
- data/ext/event/backend/uring.h +1 -0
- data/ext/event/epoll.o +0 -0
- data/ext/event/event.o +0 -0
- data/ext/event/event.so +0 -0
- data/ext/event/extconf.h +5 -0
- data/ext/event/extconf.rb +2 -0
- data/ext/event/mkmf.log +84 -0
- data/ext/event/uring.o +0 -0
- data/lib/event.rb +1 -1
- data/lib/event/backend.rb +49 -0
- data/lib/event/backend/select.rb +14 -1
- data/lib/event/debug/selector.rb +9 -0
- data/lib/event/version.rb +1 -1
- metadata +11 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 94dad12ffcb84e598eae15a76f783046e324ca041f71b55b1d8925ad742fe51d
|
4
|
+
data.tar.gz: 8776e1608c0b321557ea48857157f1496d0ab0babbff3fc186f9308e0a73c8eb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e2714eea3be4dd9119b41a3aa98f9575c9bf0e9a3268a1c4af185bd92b5d56d78db152849cff9453f9337374d2ee6ba2ce2981b468252f9f09db15881c39963a
|
7
|
+
data.tar.gz: 2cc11adfcee9ae1188305691010049775abcdec1ec58b1666cfe5ccfd4276692597bb524e41f106478c0ceb80539e52c6fc3db84d9488f9b70d2c4556f4aece2
|
data/ext/event/Makefile
ADDED
@@ -0,0 +1,266 @@
|
|
1
|
+
|
2
|
+
SHELL = /bin/sh
|
3
|
+
|
4
|
+
# V=0 quiet, V=1 verbose. other values don't work.
|
5
|
+
V = 0
|
6
|
+
Q1 = $(V:1=)
|
7
|
+
Q = $(Q1:0=@)
|
8
|
+
ECHO1 = $(V:1=@ :)
|
9
|
+
ECHO = $(ECHO1:0=@ echo)
|
10
|
+
NULLCMD = :
|
11
|
+
|
12
|
+
#### Start of system configuration section. ####
|
13
|
+
|
14
|
+
srcdir = .
|
15
|
+
topdir = /home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0
|
16
|
+
hdrdir = $(topdir)
|
17
|
+
arch_hdrdir = /home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-linux
|
18
|
+
PATH_SEPARATOR = :
|
19
|
+
VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir)/backend
|
20
|
+
prefix = $(DESTDIR)/home/samuel/.rubies/ruby-3.0.1
|
21
|
+
rubysitearchprefix = $(rubylibprefix)/$(sitearch)
|
22
|
+
rubyarchprefix = $(rubylibprefix)/$(arch)
|
23
|
+
rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
|
24
|
+
exec_prefix = $(prefix)
|
25
|
+
vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
|
26
|
+
sitearchhdrdir = $(sitehdrdir)/$(sitearch)
|
27
|
+
rubyarchhdrdir = $(rubyhdrdir)/$(arch)
|
28
|
+
vendorhdrdir = $(rubyhdrdir)/vendor_ruby
|
29
|
+
sitehdrdir = $(rubyhdrdir)/site_ruby
|
30
|
+
rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
|
31
|
+
vendorarchdir = $(vendorlibdir)/$(sitearch)
|
32
|
+
vendorlibdir = $(vendordir)/$(ruby_version)
|
33
|
+
vendordir = $(rubylibprefix)/vendor_ruby
|
34
|
+
sitearchdir = $(sitelibdir)/$(sitearch)
|
35
|
+
sitelibdir = $(sitedir)/$(ruby_version)
|
36
|
+
sitedir = $(rubylibprefix)/site_ruby
|
37
|
+
rubyarchdir = $(rubylibdir)/$(arch)
|
38
|
+
rubylibdir = $(rubylibprefix)/$(ruby_version)
|
39
|
+
sitearchincludedir = $(includedir)/$(sitearch)
|
40
|
+
archincludedir = $(includedir)/$(arch)
|
41
|
+
sitearchlibdir = $(libdir)/$(sitearch)
|
42
|
+
archlibdir = $(libdir)/$(arch)
|
43
|
+
ridir = $(datarootdir)/$(RI_BASE_NAME)
|
44
|
+
mandir = $(datarootdir)/man
|
45
|
+
localedir = $(datarootdir)/locale
|
46
|
+
libdir = $(exec_prefix)/lib
|
47
|
+
psdir = $(docdir)
|
48
|
+
pdfdir = $(docdir)
|
49
|
+
dvidir = $(docdir)
|
50
|
+
htmldir = $(docdir)
|
51
|
+
infodir = $(datarootdir)/info
|
52
|
+
docdir = $(datarootdir)/doc/$(PACKAGE)
|
53
|
+
oldincludedir = $(DESTDIR)/usr/include
|
54
|
+
includedir = $(prefix)/include
|
55
|
+
runstatedir = $(localstatedir)/run
|
56
|
+
localstatedir = $(prefix)/var
|
57
|
+
sharedstatedir = $(prefix)/com
|
58
|
+
sysconfdir = $(prefix)/etc
|
59
|
+
datadir = $(datarootdir)
|
60
|
+
datarootdir = $(prefix)/share
|
61
|
+
libexecdir = $(exec_prefix)/libexec
|
62
|
+
sbindir = $(exec_prefix)/sbin
|
63
|
+
bindir = $(exec_prefix)/bin
|
64
|
+
archdir = $(rubyarchdir)
|
65
|
+
|
66
|
+
|
67
|
+
CC_WRAPPER =
|
68
|
+
CC = gcc
|
69
|
+
CXX = g++
|
70
|
+
LIBRUBY = $(LIBRUBY_A)
|
71
|
+
LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
|
72
|
+
LIBRUBYARG_SHARED = -Wl,-rpath,$(libdir) -L$(libdir)
|
73
|
+
LIBRUBYARG_STATIC = -Wl,-rpath,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)-static $(MAINLIBS)
|
74
|
+
empty =
|
75
|
+
OUTFLAG = -o $(empty)
|
76
|
+
COUTFLAG = -o $(empty)
|
77
|
+
CSRCFLAG = $(empty)
|
78
|
+
|
79
|
+
RUBY_EXTCONF_H = extconf.h
|
80
|
+
cflags = $(optflags) $(debugflags) $(warnflags)
|
81
|
+
cxxflags =
|
82
|
+
optflags = -O3
|
83
|
+
debugflags = -ggdb3
|
84
|
+
warnflags = -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable
|
85
|
+
cppflags =
|
86
|
+
CCDLFLAGS = -fPIC
|
87
|
+
CFLAGS = $(CCDLFLAGS) $(cflags) -Wall $(ARCH_FLAG)
|
88
|
+
INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
|
89
|
+
DEFS =
|
90
|
+
CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\" $(DEFS) $(cppflags)
|
91
|
+
CXXFLAGS = $(CCDLFLAGS) $(ARCH_FLAG)
|
92
|
+
ldflags = -L. -fstack-protector-strong -rdynamic -Wl,-export-dynamic
|
93
|
+
dldflags = -Wl,--compress-debug-sections=zlib
|
94
|
+
ARCH_FLAG =
|
95
|
+
DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
|
96
|
+
LDSHARED = $(CC) -shared
|
97
|
+
LDSHAREDXX = $(CXX) -shared
|
98
|
+
AR = gcc-ar
|
99
|
+
EXEEXT =
|
100
|
+
|
101
|
+
RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)
|
102
|
+
RUBY_SO_NAME = ruby
|
103
|
+
RUBYW_INSTALL_NAME =
|
104
|
+
RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
|
105
|
+
RUBYW_BASE_NAME = rubyw
|
106
|
+
RUBY_BASE_NAME = ruby
|
107
|
+
|
108
|
+
arch = x86_64-linux
|
109
|
+
sitearch = $(arch)
|
110
|
+
ruby_version = 3.0.0
|
111
|
+
ruby = $(bindir)/$(RUBY_BASE_NAME)
|
112
|
+
RUBY = $(ruby)
|
113
|
+
ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h $(RUBY_EXTCONF_H)
|
114
|
+
|
115
|
+
RM = rm -f
|
116
|
+
RM_RF = $(RUBY) -run -e rm -- -rf
|
117
|
+
RMDIRS = rmdir --ignore-fail-on-non-empty -p
|
118
|
+
MAKEDIRS = /usr/bin/mkdir -p
|
119
|
+
INSTALL = /usr/bin/install -c
|
120
|
+
INSTALL_PROG = $(INSTALL) -m 0755
|
121
|
+
INSTALL_DATA = $(INSTALL) -m 644
|
122
|
+
COPY = cp
|
123
|
+
TOUCH = exit >
|
124
|
+
|
125
|
+
#### End of system configuration section. ####
|
126
|
+
|
127
|
+
preload =
|
128
|
+
libpath = . $(libdir)
|
129
|
+
LIBPATH = -L. -L$(libdir) -Wl,-rpath,$(libdir)
|
130
|
+
DEFFILE =
|
131
|
+
|
132
|
+
CLEANFILES = mkmf.log
|
133
|
+
DISTCLEANFILES =
|
134
|
+
DISTCLEANDIRS =
|
135
|
+
|
136
|
+
extout =
|
137
|
+
extout_prefix =
|
138
|
+
target_prefix = /event
|
139
|
+
LOCAL_LIBS =
|
140
|
+
LIBS = -luring -lm -lc
|
141
|
+
ORIG_SRCS = event.c
|
142
|
+
SRCS = $(ORIG_SRCS) event.c uring.c epoll.c
|
143
|
+
OBJS = event.o uring.o epoll.o
|
144
|
+
HDRS = $(srcdir)/event.h $(srcdir)/extconf.h
|
145
|
+
LOCAL_HDRS =
|
146
|
+
TARGET = event
|
147
|
+
TARGET_NAME = event
|
148
|
+
TARGET_ENTRY = Init_$(TARGET_NAME)
|
149
|
+
DLLIB = $(TARGET).so
|
150
|
+
EXTSTATIC =
|
151
|
+
STATIC_LIB =
|
152
|
+
|
153
|
+
TIMESTAMP_DIR = .
|
154
|
+
BINDIR = $(bindir)
|
155
|
+
RUBYCOMMONDIR = $(sitedir)$(target_prefix)
|
156
|
+
RUBYLIBDIR = $(sitelibdir)$(target_prefix)
|
157
|
+
RUBYARCHDIR = $(sitearchdir)$(target_prefix)
|
158
|
+
HDRDIR = $(rubyhdrdir)/ruby$(target_prefix)
|
159
|
+
ARCHHDRDIR = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
|
160
|
+
TARGET_SO_DIR =
|
161
|
+
TARGET_SO = $(TARGET_SO_DIR)$(DLLIB)
|
162
|
+
CLEANLIBS = $(TARGET_SO)
|
163
|
+
CLEANOBJS = *.o *.bak
|
164
|
+
|
165
|
+
all: $(DLLIB)
|
166
|
+
static: $(STATIC_LIB)
|
167
|
+
.PHONY: all install static install-so install-rb
|
168
|
+
.PHONY: clean clean-so clean-static clean-rb
|
169
|
+
|
170
|
+
clean-static::
|
171
|
+
clean-rb-default::
|
172
|
+
clean-rb::
|
173
|
+
clean-so::
|
174
|
+
clean: clean-so clean-static clean-rb-default clean-rb
|
175
|
+
-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
|
176
|
+
|
177
|
+
distclean-rb-default::
|
178
|
+
distclean-rb::
|
179
|
+
distclean-so::
|
180
|
+
distclean-static::
|
181
|
+
distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
|
182
|
+
-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
|
183
|
+
-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
|
184
|
+
-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
|
185
|
+
|
186
|
+
realclean: distclean
|
187
|
+
install: install-so install-rb
|
188
|
+
|
189
|
+
install-so: $(DLLIB) $(TIMESTAMP_DIR)/.sitearchdir.-.event.time
|
190
|
+
$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
|
191
|
+
clean-static::
|
192
|
+
-$(Q)$(RM) $(STATIC_LIB)
|
193
|
+
install-rb: pre-install-rb do-install-rb install-rb-default
|
194
|
+
install-rb-default: pre-install-rb-default do-install-rb-default
|
195
|
+
pre-install-rb: Makefile
|
196
|
+
pre-install-rb-default: Makefile
|
197
|
+
do-install-rb:
|
198
|
+
do-install-rb-default:
|
199
|
+
pre-install-rb-default:
|
200
|
+
@$(NULLCMD)
|
201
|
+
$(TIMESTAMP_DIR)/.sitearchdir.-.event.time:
|
202
|
+
$(Q) $(MAKEDIRS) $(@D) $(RUBYARCHDIR)
|
203
|
+
$(Q) $(TOUCH) $@
|
204
|
+
|
205
|
+
site-install: site-install-so site-install-rb
|
206
|
+
site-install-so: install-so
|
207
|
+
site-install-rb: install-rb
|
208
|
+
|
209
|
+
.SUFFIXES: .c .m .cc .mm .cxx .cpp .o .S
|
210
|
+
|
211
|
+
.cc.o:
|
212
|
+
$(ECHO) compiling $(<)
|
213
|
+
$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
|
214
|
+
|
215
|
+
.cc.S:
|
216
|
+
$(ECHO) translating $(<)
|
217
|
+
$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
|
218
|
+
|
219
|
+
.mm.o:
|
220
|
+
$(ECHO) compiling $(<)
|
221
|
+
$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
|
222
|
+
|
223
|
+
.mm.S:
|
224
|
+
$(ECHO) translating $(<)
|
225
|
+
$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
|
226
|
+
|
227
|
+
.cxx.o:
|
228
|
+
$(ECHO) compiling $(<)
|
229
|
+
$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
|
230
|
+
|
231
|
+
.cxx.S:
|
232
|
+
$(ECHO) translating $(<)
|
233
|
+
$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
|
234
|
+
|
235
|
+
.cpp.o:
|
236
|
+
$(ECHO) compiling $(<)
|
237
|
+
$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
|
238
|
+
|
239
|
+
.cpp.S:
|
240
|
+
$(ECHO) translating $(<)
|
241
|
+
$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
|
242
|
+
|
243
|
+
.c.o:
|
244
|
+
$(ECHO) compiling $(<)
|
245
|
+
$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
|
246
|
+
|
247
|
+
.c.S:
|
248
|
+
$(ECHO) translating $(<)
|
249
|
+
$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
|
250
|
+
|
251
|
+
.m.o:
|
252
|
+
$(ECHO) compiling $(<)
|
253
|
+
$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
|
254
|
+
|
255
|
+
.m.S:
|
256
|
+
$(ECHO) translating $(<)
|
257
|
+
$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
|
258
|
+
|
259
|
+
$(TARGET_SO): $(OBJS) Makefile
|
260
|
+
$(ECHO) linking shared-object event/$(DLLIB)
|
261
|
+
-$(Q)$(RM) $(@)
|
262
|
+
$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
|
263
|
+
|
264
|
+
|
265
|
+
|
266
|
+
$(OBJS): $(HDRS) $(ruby_headers)
|
data/ext/event/backend/backend.h
CHANGED
data/ext/event/backend/epoll.c
CHANGED
@@ -28,7 +28,7 @@
|
|
28
28
|
static VALUE Event_Backend_EPoll = Qnil;
|
29
29
|
static ID id_fileno, id_transfer;
|
30
30
|
|
31
|
-
|
31
|
+
enum {EPOLL_MAX_EVENTS = 64};
|
32
32
|
|
33
33
|
struct Event_Backend_EPoll {
|
34
34
|
VALUE loop;
|
@@ -41,13 +41,19 @@ void Event_Backend_EPoll_Type_mark(void *_data)
|
|
41
41
|
rb_gc_mark(data->loop);
|
42
42
|
}
|
43
43
|
|
44
|
+
static
|
45
|
+
void close_internal(struct Event_Backend_EPoll *data) {
|
46
|
+
if (data->descriptor >= 0) {
|
47
|
+
close(data->descriptor);
|
48
|
+
data->descriptor = -1;
|
49
|
+
}
|
50
|
+
}
|
51
|
+
|
44
52
|
void Event_Backend_EPoll_Type_free(void *_data)
|
45
53
|
{
|
46
54
|
struct Event_Backend_EPoll *data = _data;
|
47
55
|
|
48
|
-
|
49
|
-
close(data->descriptor);
|
50
|
-
}
|
56
|
+
close_internal(data);
|
51
57
|
|
52
58
|
free(data);
|
53
59
|
}
|
@@ -96,6 +102,15 @@ VALUE Event_Backend_EPoll_initialize(VALUE self, VALUE loop) {
|
|
96
102
|
return self;
|
97
103
|
}
|
98
104
|
|
105
|
+
VALUE Event_Backend_EPoll_close(VALUE self) {
|
106
|
+
struct Event_Backend_EPoll *data = NULL;
|
107
|
+
TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
|
108
|
+
|
109
|
+
close_internal(data);
|
110
|
+
|
111
|
+
return Qnil;
|
112
|
+
}
|
113
|
+
|
99
114
|
static inline
|
100
115
|
uint32_t epoll_flags_from_events(int events) {
|
101
116
|
uint32_t flags = 0;
|
@@ -123,6 +138,7 @@ int events_from_epoll_flags(uint32_t flags) {
|
|
123
138
|
|
124
139
|
struct io_wait_arguments {
|
125
140
|
struct Event_Backend_EPoll *data;
|
141
|
+
int descriptor;
|
126
142
|
int duplicate;
|
127
143
|
};
|
128
144
|
|
@@ -131,7 +147,11 @@ VALUE io_wait_ensure(VALUE _arguments) {
|
|
131
147
|
struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
|
132
148
|
|
133
149
|
if (arguments->duplicate >= 0) {
|
150
|
+
epoll_ctl(arguments->data->descriptor, EPOLL_CTL_DEL, arguments->duplicate, NULL);
|
151
|
+
|
134
152
|
close(arguments->duplicate);
|
153
|
+
} else {
|
154
|
+
epoll_ctl(arguments->data->descriptor, EPOLL_CTL_DEL, arguments->descriptor, NULL);
|
135
155
|
}
|
136
156
|
|
137
157
|
return Qnil;
|
@@ -158,8 +178,10 @@ VALUE Event_Backend_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE event
|
|
158
178
|
event.events = epoll_flags_from_events(NUM2INT(events));
|
159
179
|
event.data.ptr = (void*)fiber;
|
160
180
|
|
181
|
+
// fprintf(stderr, "<- fiber=%p descriptor=%d\n", (void*)fiber, descriptor);
|
182
|
+
|
161
183
|
// A better approach is to batch all changes:
|
162
|
-
int result = epoll_ctl(data->descriptor, EPOLL_CTL_ADD, descriptor, &event)
|
184
|
+
int result = epoll_ctl(data->descriptor, EPOLL_CTL_ADD, descriptor, &event);
|
163
185
|
|
164
186
|
if (result == -1 && errno == EEXIST) {
|
165
187
|
// The file descriptor was already inserted into epoll.
|
@@ -170,7 +192,7 @@ VALUE Event_Backend_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE event
|
|
170
192
|
if (descriptor == -1)
|
171
193
|
rb_sys_fail("dup");
|
172
194
|
|
173
|
-
result = epoll_ctl(data->descriptor, EPOLL_CTL_ADD, descriptor, &event)
|
195
|
+
result = epoll_ctl(data->descriptor, EPOLL_CTL_ADD, descriptor, &event);
|
174
196
|
}
|
175
197
|
|
176
198
|
if (result == -1) {
|
@@ -179,6 +201,7 @@ VALUE Event_Backend_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE event
|
|
179
201
|
|
180
202
|
struct io_wait_arguments io_wait_arguments = {
|
181
203
|
.data = data,
|
204
|
+
.descriptor = descriptor,
|
182
205
|
.duplicate = duplicate
|
183
206
|
};
|
184
207
|
|
@@ -204,26 +227,71 @@ int make_timeout(VALUE duration) {
|
|
204
227
|
rb_raise(rb_eRuntimeError, "unable to convert timeout");
|
205
228
|
}
|
206
229
|
|
230
|
+
struct select_arguments {
|
231
|
+
struct Event_Backend_EPoll *data;
|
232
|
+
|
233
|
+
int count;
|
234
|
+
struct epoll_event events[EPOLL_MAX_EVENTS];
|
235
|
+
|
236
|
+
int timeout;
|
237
|
+
};
|
238
|
+
|
239
|
+
static
|
240
|
+
void * select_internal(void *_arguments) {
|
241
|
+
struct select_arguments * arguments = (struct select_arguments *)_arguments;
|
242
|
+
|
243
|
+
arguments->count = epoll_wait(arguments->data->descriptor, arguments->events, EPOLL_MAX_EVENTS, arguments->timeout);
|
244
|
+
|
245
|
+
return NULL;
|
246
|
+
}
|
247
|
+
|
248
|
+
static
|
249
|
+
void select_internal_without_gvl(struct select_arguments *arguments) {
|
250
|
+
rb_thread_call_without_gvl(select_internal, (void *)arguments, RUBY_UBF_IO, 0);
|
251
|
+
|
252
|
+
if (arguments->count == -1) {
|
253
|
+
rb_sys_fail("select_internal_without_gvl:epoll_wait");
|
254
|
+
}
|
255
|
+
}
|
256
|
+
|
257
|
+
static
|
258
|
+
void select_internal_with_gvl(struct select_arguments *arguments) {
|
259
|
+
select_internal((void *)arguments);
|
260
|
+
|
261
|
+
if (arguments->count == -1) {
|
262
|
+
rb_sys_fail("select_internal_with_gvl:epoll_wait");
|
263
|
+
}
|
264
|
+
}
|
265
|
+
|
207
266
|
VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
|
208
267
|
struct Event_Backend_EPoll *data = NULL;
|
209
268
|
TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
|
210
269
|
|
211
|
-
struct
|
270
|
+
struct select_arguments arguments = {
|
271
|
+
.data = data,
|
272
|
+
.timeout = 0
|
273
|
+
};
|
212
274
|
|
213
|
-
|
275
|
+
select_internal_without_gvl(&arguments);
|
214
276
|
|
215
|
-
if (count ==
|
216
|
-
|
277
|
+
if (arguments.count == 0) {
|
278
|
+
arguments.timeout = make_timeout(duration);
|
279
|
+
|
280
|
+
if (arguments.timeout != 0) {
|
281
|
+
select_internal_with_gvl(&arguments);
|
282
|
+
}
|
217
283
|
}
|
218
284
|
|
219
|
-
for (int i = 0; i < count; i += 1) {
|
220
|
-
VALUE fiber = (VALUE)events[i].data.ptr;
|
221
|
-
VALUE result = INT2NUM(events[i].events);
|
285
|
+
for (int i = 0; i < arguments.count; i += 1) {
|
286
|
+
VALUE fiber = (VALUE)arguments.events[i].data.ptr;
|
287
|
+
VALUE result = INT2NUM(arguments.events[i].events);
|
288
|
+
|
289
|
+
// fprintf(stderr, "-> fiber=%p descriptor=%d\n", (void*)fiber, events[i].data.fd);
|
222
290
|
|
223
291
|
rb_funcall(fiber, id_transfer, 1, result);
|
224
292
|
}
|
225
293
|
|
226
|
-
return INT2NUM(count);
|
294
|
+
return INT2NUM(arguments.count);
|
227
295
|
}
|
228
296
|
|
229
297
|
void Init_Event_Backend_EPoll(VALUE Event_Backend) {
|
@@ -234,6 +302,7 @@ void Init_Event_Backend_EPoll(VALUE Event_Backend) {
|
|
234
302
|
|
235
303
|
rb_define_alloc_func(Event_Backend_EPoll, Event_Backend_EPoll_allocate);
|
236
304
|
rb_define_method(Event_Backend_EPoll, "initialize", Event_Backend_EPoll_initialize, 1);
|
305
|
+
rb_define_method(Event_Backend_EPoll, "close", Event_Backend_EPoll_close, 0);
|
237
306
|
|
238
307
|
rb_define_method(Event_Backend_EPoll, "io_wait", Event_Backend_EPoll_io_wait, 3);
|
239
308
|
rb_define_method(Event_Backend_EPoll, "select", Event_Backend_EPoll_select, 1);
|