sleepy_penguin 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dff861d3873bfcd1a028f7cdc0ae46a1065d4092
-  data.tar.gz: 19244c89ef9f4a8719e31eaed7354ce88640ff5c
+SHA256:
+  metadata.gz: 6412db053027f4ab0d6c29a0053051608ae2a49d8e181198ffbf883a6bb31b19
+  data.tar.gz: 77e2b0dc6cc44e4f9f8f9fbd0b3c8739ccb0727882d27416404ad597f4029827
 SHA512:
-  metadata.gz: 7a82315acdb00dead8609707ed1fe9c5d649c58997170b0fbd0d600a0531bc100f6d57b09fc1fe9ebe4e3f1b1d0e0a967dd0627b26e87e1928f4439aa17b454c
-  data.tar.gz: 48ff2a95beb3a28150504ddcf7d5e3f475a92b4379aad96db219dd8556872cd0e4351392f72e91ab5fd608cc597e80374134f4340227d31a4f6a5f5a6840eaae
+  metadata.gz: 24fbb2975efd8e9ad6ab515775510ecd3337ad8652aabc744a9ea99564e27a78f11985d0d4458c6a945d8365dbb5e81679204918ca5e61db71acac387d1e4188
+  data.tar.gz: 8f136eadb671aa24916eed1fd8daa553a9ab077462fe0361f9a29413f713066453ad853b470da5c2b3b5b15d35b2468cec3de1413507e59592c35aac0a217c28

data/.olddoc.yml

@@ -1,6 +1,6 @@
 ---
 cgit_url: https://bogomips.org/sleepy_penguin.git
-git_url: git://bogomips.org/sleepy_penguin.git
+git_url: https://bogomips.org/sleepy_penguin.git
 rdoc_url: https://bogomips.org/sleepy_penguin/
 ml_url: https://bogomips.org/sleepy-penguin/
 public_email: sleepy-penguin@bogomips.org

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v3.5.0
+DEF_VER=v3.5.1
 GVH=ext/sleepy_penguin/git_version.h
 
 LF='

data/README

@@ -39,14 +39,14 @@ Unpack it, and run "ruby setup.rb"
 
 You can get the latest source via git from the following locations:
 
-  git://bogomips.org/sleepy_penguin.git
-  git://repo.or.cz/sleepy_penguin.git (mirror)
+  https://bogomips.org/sleepy_penguin.git
+  https://repo.or.cz/sleepy_penguin.git (mirror)
 
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
 * https://bogomips.org/sleepy_penguin.git
-* http://repo.or.cz/w/sleepy_penguin.git (gitweb)
+* https://repo.or.cz/w/sleepy_penguin.git (gitweb)
 
 Inline patches (from "git format-patch") to the mailing list are
 preferred because they allow code review and comments in the reply to

data/ext/sleepy_penguin/extconf.rb

@@ -34,4 +34,5 @@ have_func('rb_thread_fd_close')
 have_func('rb_update_max_fd')
 have_func('rb_fd_fix_cloexec')
 have_func('rb_io_get_io')
+have_func('rb_struct_size')
 create_makefile('sleepy_penguin_ext')

data/ext/sleepy_penguin/init.c

@@ -101,15 +101,13 @@ static struct rb_sp_tlsbuf *alloc_tlsbuf(size_t size)
 	size_t bytes = size + sizeof(struct rb_sp_tlsbuf);
 	struct rb_sp_tlsbuf *buf;
 	void *ptr;
-	int err = posix_memalign(&ptr, rb_sp_l1_cache_line_size, bytes);
 
-	if (err) {
-		errno = err;
+	if (size >= UINT32_MAX ||
+	    posix_memalign(&ptr, rb_sp_l1_cache_line_size, bytes))
 		rb_memerror(); /* fatal */
-	}
 
 	buf = ptr;
-	buf->capa = size;
+	buf->capa = (uint32_t)size;
 
 	return buf;
 }

data/ext/sleepy_penguin/kqueue.c

@@ -18,6 +18,9 @@
 #ifndef RARRAY_LENINT
 #  define RARRAY_LENINT(ary) (int)RARRAY_LEN(ary)
 #endif
+#ifndef RARRAY_CONST_PTR
+#  define RARRAY_CONST_PTR(ary) RARRAY_PTR(ary)
+#endif
 #ifndef NUM2SHORT
 #  define NUM2SHORT(n) (short)NUM2INT(n)
 #endif
@@ -110,6 +113,7 @@ static VALUE s_new(VALUE klass)
 {
 	VALUE rv;
 	int fd = kqueue();
+	int flags;
 
 	if (fd < 0) {
 		/*
@@ -122,9 +126,12 @@ static VALUE s_new(VALUE klass)
 			rb_sys_fail("kqueue");
 	}
 
+	flags = fcntl(fd, F_GETFD);
+	if (flags != -1)
+		fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
+
 	rv = INT2FIX(fd);
 
-	/* This will set FD_CLOEXEC on Ruby 2.0.0+: */
 	return rb_call_super(1, &rv);
 }
 
@@ -229,35 +236,82 @@ static VALUE do_kevent(struct kq_per_thread *kpt)
 	return kevent_result(kpt, (int)nevents);
 }
 
-static void event_set(struct kevent *event, VALUE *chg)
+#if defined(HAVE_RB_STRUCT_SIZE) && defined(RSTRUCT_GET)
+static void ev_set_struct(struct kevent *ev, VALUE event)
+{
+	if (rb_struct_size(event) == INT2NUM(6)) {
+		uintptr_t ident = (uintptr_t)NUM2ULONG(RSTRUCT_GET(event, 0));
+		short filter = NUM2SHORT(RSTRUCT_GET(event, 1));
+		unsigned short flags = NUM2USHORT(RSTRUCT_GET(event, 2));
+		unsigned fflags = (unsigned)NUM2UINT(RSTRUCT_GET(event, 3));
+		intptr_t data = (intptr_t)NUM2LONG(RSTRUCT_GET(event, 4));
+		void *udata = (void *)RSTRUCT_GET(event, 5);
+
+		EV_SET(ev, ident, filter, flags, fflags, data, udata);
+	} else {
+		rb_raise(rb_eTypeError, "unsupported struct in changelist");
+	}
+}
+#elif RBX_STRUCT == 0 && defined(RSTRUCT_LEN) && defined(RSTRUCT_PTR)
+/* legacy MRI */
+static void ev_set_struct(struct kevent *ev, VALUE event)
+{
+	long len = RSTRUCT_LEN(*event);
+	if (len == 6) {
+		const VALUE *ptr = RSTRUCT_PTR(*event);
+		uintptr_t ident = (uintptr_t)NUM2ULONG(ptr[0]);
+		short filter = NUM2SHORT(ptr[1]);
+		unsigned short flags = NUM2USHORT(ptr[2]);
+		unsigned fflags = (unsigned)NUM2UINT(ptr[3]);
+		intptr_t data = (intptr_t)NUM2LONG(ptr[4]);
+		void *udata = (void *)ptr[5];
+
+		EV_SET(event, ident, filter, flags, fflags, data, udata);
+	} else {
+		rb_raise(rb_eTypeError, "unsupported struct in changelist");
+	}
+}
+#else
+static void ev_set_struct(struct kevent *ev, VALUE event)
+{
+	rb_raise(rb_eTypeError, "unsupported struct in changelist");
+}
+#endif
+
+static void ev_set_ary(struct kevent *ev, VALUE event)
 {
-	uintptr_t ident = (uintptr_t)NUM2ULONG(chg[0]);
-	short filter = NUM2SHORT(chg[1]);
-	unsigned short flags = NUM2USHORT(chg[2]);
-	unsigned fflags = (unsigned)NUM2UINT(chg[3]);
-	intptr_t data = (intptr_t)NUM2LONG(chg[4]);
-	void *udata = (void *)chg[5];
-
-	EV_SET(event, ident, filter, flags, fflags, data, udata);
+	long len = RARRAY_LEN(event);
+	const VALUE *ptr = RARRAY_CONST_PTR(event);
+
+	if (len == 6) {
+		uintptr_t ident = (uintptr_t)NUM2ULONG(ptr[0]);
+		short filter = NUM2SHORT(ptr[1]);
+		unsigned short flags = NUM2USHORT(ptr[2]);
+		unsigned fflags = (unsigned)NUM2UINT(ptr[3]);
+		intptr_t data = (intptr_t)NUM2LONG(ptr[4]);
+		void *udata = (void *)ptr[5];
+
+		EV_SET(ev, ident, filter, flags, fflags, data, udata);
+		return;
+	}
+	rb_raise(rb_eTypeError,
+		"changelist must be an array of 6-element arrays or structs");
 }
 
 /* sets ptr and len */
-static void unpack_event(VALUE **ptr, VALUE *len, VALUE *event)
+static void unpack_event(struct kevent *ev, VALUE event)
 {
-	switch (TYPE(*event)) {
+	switch (TYPE(event)) {
 	case T_STRUCT:
 		if (RBX_STRUCT) {
-			*event = rb_funcall(*event, rb_intern("to_a"), 0, 0);
+			event = rb_funcall(event, rb_intern("to_a"), 0, 0);
 			/* fall-through to T_ARRAY */
 		} else {
-			*len = RSTRUCT_LEN(*event);
-			*ptr = RSTRUCT_PTR(*event);
+			ev_set_struct(ev, event);
 			return;
 		}
 	case T_ARRAY:
-		*len = RARRAY_LEN(*event);
-		*ptr = RARRAY_PTR(*event);
-		return;
+		ev_set_ary(ev, event);
 	default:
 		rb_raise(rb_eTypeError, "unsupported type in changelist");
 	}
@@ -265,24 +319,11 @@ static void unpack_event(VALUE **ptr, VALUE *len, VALUE *event)
 
 static void ary2eventlist(struct kevent *events, VALUE changelist)
 {
-	VALUE *chg = RARRAY_PTR(changelist);
+	const VALUE *chg = RARRAY_CONST_PTR(changelist);
 	long i = RARRAY_LEN(changelist);
-	VALUE event;
 
-	for (; --i >= 0; chg++) {
-		VALUE clen;
-		VALUE *cptr;
-
-		event = *chg;
-		unpack_event(&cptr, &clen, &event);
-		if (clen != 6)
-			goto out_list;
-		event_set(events++, cptr);
-	}
-	return;
-out_list:
-	rb_raise(rb_eTypeError,
-		"changelist must be an array of 6-element arrays or structs");
+	for (; --i >= 0; chg++)
+		unpack_event(events++, *chg);
 }
 
 /*
@@ -290,20 +331,12 @@ out_list:
  */
 static void changelist_prepare(struct kevent *events, VALUE changelist)
 {
-	VALUE *cptr;
-	VALUE clen;
-	VALUE event;
-
 	switch (TYPE(changelist)) {
 	case T_ARRAY:
 		ary2eventlist(events, changelist);
 		return;
-	case T_STRUCT:
-		event = changelist;
-		unpack_event(&cptr, &clen, &event);
-		if (clen != 6)
-			rb_raise(rb_eTypeError, "event is not a Kevent struct");
-		event_set(events, cptr);
+	case T_STRUCT: /* single event */
+		unpack_event(events, changelist);
 		return;
 	default:
 		rb_bug("changelist_prepare not type filtered by sp_kevent");

data/lib/sleepy_penguin/epoll.rb

@@ -27,8 +27,7 @@ class SleepyPenguin::Epoll
     return if @pid == $$
     return if @io.closed?
     objects = @copies.values
-    @copies.each_key { |epio| epio.close }
-    @copies.clear
+    @copies.each_key(&:close).clear
     __ep_reinit
     objects.each do |obj|
       io_dup = @io.dup

data/lib/sleepy_penguin/kqueue.rb

@@ -73,7 +73,7 @@ class SleepyPenguin::Kqueue
     end
 
     if block_given?
-      n = @io.kevent(changelist, *args) do |ident,filter,flags,
+      @io.kevent(changelist, *args) do |ident,filter,flags,
                                                fflags,data,udata|
         # This may raise and cause events to be lost,
         # that's the users' fault/problem
@@ -82,7 +82,7 @@ class SleepyPenguin::Kqueue
                                         fflags, data, udata)
       end
     else
-      n = @io.kevent(changelist, *args)
+      @io.kevent(changelist, *args)
     end
   end
 

data/sleepy_penguin.gemspec

@@ -3,7 +3,7 @@ manifest = File.exist?('.manifest') ?
 
 Gem::Specification.new do |s|
   s.name = %q{sleepy_penguin}
-  s.version = (ENV['VERSION'] || '3.5.0').dup
+  s.version = (ENV['VERSION'] || '3.5.1').dup
   s.homepage = 'https://bogomips.org/sleepy_penguin/'
   s.authors = ['sleepy_penguin hackers']
   s.description = File.read('README').split("\n\n")[1]

data/test/test_kqueue.rb

@@ -6,6 +6,7 @@ class TestKqueue < Test::Unit::TestCase
   def test_kqueue
     kq = Kqueue.new
     assert_kind_of IO, kq.to_io
+    assert_predicate kq.to_io, :close_on_exec?
     rd, wr = IO.pipe
     ev = Kevent[rd.fileno, EvFilt::READ, Ev::ADD|Ev::ONESHOT, 0, 0, rd]
     thr = Thread.new do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sleepy_penguin
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - sleepy_penguin hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Linux I/O events for Ruby