event 0.6.0 → 0.7.0

data/ext/event/extconf.rb

@@ -47,6 +47,11 @@ if have_header('sys/event.h')
 	$srcs << "backend/kqueue.c"
 end
 
+have_func("rb_io_descriptor")
+have_func("&rb_process_status_wait")
+
+have_header('ruby/io/buffer.h')
+
 create_header
 
 # Generate the makefile to compile the native binary into `lib`:

data/ext/event/mkmf.log

@@ -90,6 +90,101 @@ checked program was:
 
 --------------------
 
+have_func: checking for rb_io_descriptor()... -------------------- no
+
+"clang -fdeclspec -o conftest -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0 -I.  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wdivision-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wmissing-noreturn -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wextra-tokens  -pipe -Wall conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.0.1/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib     -lruby.3.0-static -framework Security -framework Foundation -lpthread -lgmp -ldl -lobjc   "
+conftest.c:14:57: error: use of undeclared identifier 'rb_io_descriptor'
+int t(void) { void ((*volatile p)()); p = (void ((*)()))rb_io_descriptor; return !p; }
+                                                        ^
+1 error generated.
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: /*top*/
+ 4: extern int t(void);
+ 5: int main(int argc, char **argv)
+ 6: {
+ 7:   if (argc > 1000000) {
+ 8:     int (* volatile tp)(void)=(int (*)(void))&t;
+ 9:     printf("%d", (*tp)());
+10:   }
+11: 
+12:   return !!argv[argc];
+13: }
+14: int t(void) { void ((*volatile p)()); p = (void ((*)()))rb_io_descriptor; return !p; }
+/* end */
+
+"clang -fdeclspec -o conftest -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0 -I.  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wdivision-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wmissing-noreturn -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wextra-tokens  -pipe -Wall conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.0.1/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib     -lruby.3.0-static -framework Security -framework Foundation -lpthread -lgmp -ldl -lobjc   "
+Undefined symbols for architecture x86_64:
+  "_rb_io_descriptor", referenced from:
+      _t in conftest-9dccb6.o
+ld: symbol(s) not found for architecture x86_64
+clang: error: linker command failed with exit code 1 (use -v to see invocation)
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: /*top*/
+ 4: extern int t(void);
+ 5: int main(int argc, char **argv)
+ 6: {
+ 7:   if (argc > 1000000) {
+ 8:     int (* volatile tp)(void)=(int (*)(void))&t;
+ 9:     printf("%d", (*tp)());
+10:   }
+11: 
+12:   return !!argv[argc];
+13: }
+14: extern void rb_io_descriptor();
+15: int t(void) { rb_io_descriptor(); return 0; }
+/* end */
+
+--------------------
+
+have_func: checking for &rb_process_status_wait()... -------------------- no
+
+"clang -fdeclspec -o conftest -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0 -I.  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wdivision-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wmissing-noreturn -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wextra-tokens  -pipe -Wall conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.0.1/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib     -lruby.3.0-static -framework Security -framework Foundation -lpthread -lgmp -ldl -lobjc   "
+conftest.c:14:76: error: use of undeclared identifier 'rb_process_status_wait'
+int t(void) { const volatile void *volatile p; p = (const volatile void *)&rb_process_status_wait; return !p; }
+                                                                           ^
+1 error generated.
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: /*top*/
+ 4: extern int t(void);
+ 5: int main(int argc, char **argv)
+ 6: {
+ 7:   if (argc > 1000000) {
+ 8:     int (* volatile tp)(void)=(int (*)(void))&t;
+ 9:     printf("%d", (*tp)());
+10:   }
+11: 
+12:   return !!argv[argc];
+13: }
+14: int t(void) { const volatile void *volatile p; p = (const volatile void *)&rb_process_status_wait; return !p; }
+/* end */
+
+--------------------
+
+have_header: checking for ruby/io/buffer.h... -------------------- no
+
+"clang -E -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0 -I.  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wdivision-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wmissing-noreturn -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wextra-tokens  -pipe -Wall  conftest.c -o conftest.i"
+conftest.c:3:10: fatal error: 'ruby/io/buffer.h' file not found
+#include <ruby/io/buffer.h>
+         ^~~~~~~~~~~~~~~~~~
+1 error generated.
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <ruby/io/buffer.h>
+/* end */
+
+--------------------
+
 extconf.h is:
 /* begin */
 1: #ifndef EXTCONF_H

data/lib/event/backend/select.rb

@@ -26,6 +26,8 @@ module Event
 				
 				@readable = {}
 				@writable = {}
+				
+				@ready = []
 			end
 			
 			def close
@@ -34,6 +36,24 @@ module Event
 				@writable = nil
 			end
 			
+			def defer
+				fiber = Fiber.current
+				@ready.push(fiber)
+				@loop.transfer
+			ensure
+				# Linear scan :(
+				@ready.delete(fiber)
+			end
+			
+			def transfer(fiber)
+				@ready.push(Fiber.current)
+				fiber.transfer
+			end
+			
+			def ready?
+				@ready.any?
+			end
+			
 			def io_wait(fiber, io, events)
 				remove_readable = remove_writable = false
 				
@@ -53,47 +73,51 @@ module Event
 				@writable.delete(io) if remove_writable
 			end
 			
-			def io_read(fiber, io, buffer, offset, length)
-				buffer.force_encoding(Encoding::BINARY)
-				
-				while length > 0
-					case result = io.read_nonblock(length, exception: false)
-					when :wait_readable
-						self.io_wait(fiber, io, READABLE)
-					when :wait_writable
-						self.io_wait(fiber, io, WRITABLE)
-					else
-						result.force_encoding(Encoding::BINARY)
-						buffer[offset, result.bytesize] = result
+			if IO.const_defined?(:Buffer)
+				def io_read(fiber, io, buffer, length)
+					offset = 0
+					
+					while length > 0
+						# The maximum size we can read:
+						maximum_size = buffer.size - offset
 						
-						offset += result.bytesize
-						length -= result.bytesize
+						case result = io.read_nonblock(maximum_size, exception: false)
+						when :wait_readable
+							self.io_wait(fiber, io, READABLE)
+						when :wait_writable
+							self.io_wait(fiber, io, WRITABLE)
+						else
+							break if result.empty?
+							
+							buffer.copy(result, offset)
+							
+							offset += result.bytesize
+							length -= result.bytesize
+						end
 					end
+					
+					return offset
 				end
-			rescue EOFError
-				return nil
-			end
-			
-			def io_write(fiber, io, buffer, offset, length)
-				buffer.force_encoding(Encoding::BINARY)
 				
-				total = 0
-				
-				while length > 0
-					chunk = buffer[offset, length]
-					case result = io.write_nonblock(chunk, exception: false)
-					when :wait_readable
-						self.io_wait(fiber, io, READABLE)
-					when :wait_writable
-						self.io_wait(fiber, io, WRITABLE)
-					else
-						offset += result
-						length -= result
-						total += result
+				def io_write(fiber, io, buffer, length)
+					offset = 0
+					
+					while length > 0
+						# From offset until the end:
+						chunk = buffer.to_str(offset, length)
+						case result = io.write_nonblock(chunk, exception: false)
+						when :wait_readable
+							self.io_wait(fiber, io, READABLE)
+						when :wait_writable
+							self.io_wait(fiber, io, WRITABLE)
+						else
+							offset += result
+							length -= result
+						end
 					end
+					
+					return offset
 				end
-				
-				return total
 			end
 			
 			def process_wait(fiber, pid, flags)
@@ -115,6 +139,10 @@ module Event
 			end
 			
 			def select(duration = nil)
+				while @ready.any?
+					@ready.pop.transfer
+				end
+				
 				readable, writable, _ = ::IO.select(@readable.keys, @writable.keys, nil, duration)
 				
 				ready = Hash.new(0)

data/lib/event/version.rb

@@ -1,3 +1,3 @@
 module Event
-	VERSION = "0.6.0"
+	VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake