surro-gate 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 542c462ea407735d332f61fd2a665ec27c151069c9b670da220592b30c4895bc
-  data.tar.gz: 17cf01b8d553093d77afb8409b995d06ff0351893431d35cf92afa079ae87247
+SHA1:
+  metadata.gz: 90e1123d3d92d4d2aa63a242e70b1cb892841f55
+  data.tar.gz: f49f4c35d280a89d1baf88b1bcca0ad4289d3320
 SHA512:
-  metadata.gz: 06d2cbf0cfab641f3006ab85c7baf48977b2b2bb05514b92cce2e990b35e31b34054b0b985cb9cc746f235bc764946e1c2d958c713a41e68a5c967508ece795b
-  data.tar.gz: a613ef079f5d878d5785139f2b215561252160f5f2bc1097ce13dce0eca47f063ac06a52d1e335df62bb1e08ec1eb117f56ef74ec93b858d5cb4ae6e6a4143ba
+  metadata.gz: 69ab774b8c3c9de0839cfaf00d63b0ba73e614ba058cee91f0bb6460726f32f2fc92261b3e3591b8662f3ae3735221eeca2adffca246a37e937c9850afd6003a
+  data.tar.gz: 6d4009bcaa479bd414a0dcf039e3a32d11f2a913041f560b8fc33c2486ef6f4ef76ffc4c8e25e17ab5b0d576be71e1a12998000273756682b30040886e675098

data/ext/surro-gate/selector_ext.c

@@ -22,6 +22,13 @@ void epoll_rearm(int *epoll, int socket, int ltr, int rtl, int events) {
   epoll_ctl(*epoll, EPOLL_CTL_MOD, socket, &ev);
 }
 
+void* wait_func(void *ptr) {
+  struct epoll_wait_args *args;
+  args = (struct epoll_wait_args*) ptr;
+  args->result = epoll_wait(args->epfd, args->events, args->maxevents, args->timeout);
+  return NULL;
+}
+
 static VALUE pairing_compare(VALUE pair, VALUE sockets) {
   int i;
   VALUE left = rb_iv_get(pair, "@left");
@@ -139,16 +146,24 @@ static VALUE SurroGate_Selector_pop(VALUE self, VALUE sockets) {
 }
 
 static VALUE SurroGate_Selector_select(VALUE self, VALUE timeout) {
-  int i, count, *selector, source, target;
+  int i, *selector, source, target;
   struct epoll_event events[256];
+  struct epoll_wait_args wait_args;
   VALUE read, write, socket;
 
   VALUE pairing = rb_iv_get(self, "@pairing");
   Data_Get_Struct(self, int, selector);
 
-  count = epoll_wait(*selector, events, 256, NUM2INT(timeout));
+  // The code after the comments has the same result as the code below, but with GVL
+  // args.result = epoll_wait(*selector, events, 256, NUM2INT(timeout));
+  wait_args.epfd = *selector;
+  wait_args.events = events;
+  wait_args.maxevents = 256;
+  wait_args.timeout = NUM2INT(timeout);
+  wait_args.result = 0;
+  rb_thread_call_without_gvl(wait_func, &wait_args, NULL, NULL);
 
-  for (i=0; i<count; i++) {
+  for (i=0; i<wait_args.result; i++) {
     source = (int)((events[i].data.u64 & 0xFFFFFFFF00000000LL) >> 32);
     target = (int)(events[i].data.u64 & 0xFFFFFFFFLL);
 
@@ -176,7 +191,7 @@ static VALUE SurroGate_Selector_select(VALUE self, VALUE timeout) {
     }
   }
 
-  return INT2NUM(count);
+  return INT2NUM(wait_args.result);
 }
 
 static VALUE SurroGate_Selector_each_ready(VALUE self) {

data/ext/surro-gate/selector_ext.h

@@ -3,12 +3,22 @@
 
 #include "ruby.h"
 #include "ruby/io.h"
+#include "ruby/thread.h"
 #include "stdlib.h"
 #include "sys/epoll.h"
 
 #define SOCK_PTR(X) RFILE(X)->fptr->fd
 #define IVAR_TRUE(X, Y) rb_iv_get(X, Y) == Qtrue
 
+struct epoll_wait_args {
+  unsigned int epfd;
+  struct epoll_event *events;
+  int maxevents;
+  int timeout;
+
+  int result;
+};
+
 static VALUE SurroGate_Selector_allocate(VALUE self);
 static VALUE SurroGate_Selector_initialize(VALUE self, VALUE logger);
 static VALUE SurroGate_Selector_push(VALUE self, VALUE left, VALUE right);

data/lib/surro-gate/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module SurroGate
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
   HAVE_EXT = RUBY_PLATFORM =~ /linux/ && !defined?(JRUBY_VERSION) && !ENV['SURRO_GATE_NOEXT']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surro-gate
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Dávid Halász
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: A generic purrpose TCP-to-TCP proxy in Ruby