surro-gate 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fbbe2cc9fc406489f83bd1a5313f4d3228561a3a0995f70c4adafba46ef485f
-  data.tar.gz: cbe94944cf56bac71822c2049932e030538a130563ac7e5490599b9403df6a05
+  metadata.gz: 424ad5ad77841b6c66059f77feee8fe7ba7edf67b4c896af81932187e67793cc
+  data.tar.gz: b420bd8ff5148a1b65c326090e944e3b510f1e25bc247e6814a10a4bdcf07f44
 SHA512:
-  metadata.gz: 4e832268db84ec8ae285517fa63cf3bf634ecfafdcb01d533e370a6290528dfbc87215e2dbdd5dc993d21ea21f2ede39f6ca6469b22732ff53a1675c1f4abddf
-  data.tar.gz: 4de9ab81b9ba2fb2170badf9f8fedaa719cf224e6a63f421d1cb96e99520c3b717100ae6eeae4b38329d3c7c5f8a5f2b895ff13d3a1cf6aa635d70610ca91517
+  metadata.gz: c6dcea2dcf0637437a8ea177aa24a4d80f34175b0f06d77253b5c4cb0d0df28e7bba676644c843d62d47f83f00d639e71b63273ccb5ba7c81136b848b3f30ab4
+  data.tar.gz: 93c7c0af5dd2558523e92987f2cf969cedde14ba11ba9ea4554f8200409fcdf5006eb4a1c18778f550ff6bb180306df7ddadee0edbf2a6ce0875b2a2f6dc0d42

data/.travis.yml

@@ -8,7 +8,6 @@ compiler:
   - gcc
   - clang
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/surro-gate.svg)](https://badge.fury.io/rb/surro-gate)
 [![Build Status](https://travis-ci.org/skateman/surro-gate.svg?branch=master)](https://travis-ci.org/skateman/surro-gate)
-[![Dependency Status](https://gemnasium.com/skateman/surro-gate.svg)](https://gemnasium.com/skateman/surro-gate)
 [![Inline docs](http://inch-ci.org/github/skateman/surro-gate.svg?branch=master)](http://inch-ci.org/github/skateman/surro-gate)
 [![Code Climate](https://codeclimate.com/github/skateman/surro-gate/badges/gpa.svg)](https://codeclimate.com/github/skateman/surro-gate)
 
@@ -69,4 +68,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/skatem
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/ext/surro-gate/selector_ext.c

@@ -3,23 +3,24 @@
 static VALUE mSurroGate = Qnil;
 static VALUE cSurroGate_Selector = Qnil;
 static VALUE cSurroGate_Pair = Qnil;
+static VALUE cSurroGate_Scoreboard = Qnil;
 
-void epoll_register(int *epoll, int socket, int ltr, int rtl) {
+void epoll_register(int *epoll, VALUE socket) {
   struct epoll_event ev;
-  ev.data.u64 = ((uint64_t)ltr) << 32 | rtl;
+  ev.data.u64 = (uint64_t) socket;
   ev.events = EPOLLONESHOT | EPOLLIN | EPOLLOUT;
-  epoll_ctl(*epoll, EPOLL_CTL_ADD, socket, &ev);
+  epoll_ctl(*epoll, EPOLL_CTL_ADD, SOCK_PTR(socket), &ev);
 }
 
-void epoll_deregister(int *epoll, int socket) {
-  epoll_ctl(*epoll, EPOLL_CTL_DEL, socket, NULL);
+void epoll_deregister(int *epoll, VALUE socket) {
+  epoll_ctl(*epoll, EPOLL_CTL_DEL, SOCK_PTR(socket), NULL);
 }
 
-void epoll_rearm(int *epoll, int socket, int ltr, int rtl, int events) {
+void epoll_rearm(int *epoll, VALUE socket, int events) {
   struct epoll_event ev;
-  ev.data.u64 = ((uint64_t)ltr) << 32 | rtl;
+  ev.data.u64 = (uint64_t) socket;
   ev.events = EPOLLONESHOT | events;
-  epoll_ctl(*epoll, EPOLL_CTL_MOD, socket, &ev);
+  epoll_ctl(*epoll, EPOLL_CTL_MOD, SOCK_PTR(socket), &ev);
 }
 
 void* wait_func(void *ptr) {
@@ -29,40 +30,25 @@ void* wait_func(void *ptr) {
   return NULL;
 }
 
-static VALUE pairing_compare(VALUE pair, VALUE sockets) {
-  int i;
-  VALUE left = rb_iv_get(pair, "@left");
-  VALUE right = rb_iv_get(pair, "@right");
-
-  for (i=0; i<RARRAY_LEN(sockets); i++) { // sockets.each
-    VALUE item = rb_ary_entry(sockets, i);
-    if (left == item || right == item) {
-      return Qtrue;
-    }
-  }
-
-  return Qnil;
-};
-
-static VALUE pairing_iterate(VALUE pair, VALUE self, int argc, VALUE *argv) {
+static VALUE scoreboard_iterate(VALUE pair, VALUE self, int argc, VALUE *argv) {
   int *selector;
-  VALUE inverse, inv_idx;
+  VALUE inverse;
+
+  VALUE scoreboard = rb_iv_get(self, "@scoreboard");
+  Data_Get_Struct(self, int, selector);
 
   // Yield only for the pairs that are ready
   if (rb_funcall(pair, rb_intern("ready?"), 0) == Qtrue) {
     rb_yield_values(2, rb_iv_get(pair, "@left"), rb_iv_get(pair, "@right")); // yield(pair.left, pair.right)
 
-    inv_idx = rb_iv_get(pair, "@inverse");
-    inverse = rb_funcall(rb_iv_get(self, "@pairing"), rb_intern("[]"), 1, inv_idx); // @pairing[inv_idx]
-
-    rb_iv_set(pair, "@rd_rdy", Qfalse);
-    rb_iv_set(pair, "@wr_rdy", Qfalse);
-
-    Data_Get_Struct(self, int, selector);
+    // Unmark the readiness of the socket pair
+    rb_funcall(pair, rb_intern("unmark"), 0);
+    // Get the inverse socket pairing of the current one
+    inverse = rb_funcall(scoreboard, rb_intern("inverse"), 1, pair);
     // Rearm left socket for reading and also writing if not ready for writing
-    epoll_rearm(selector, SOCK_PTR(rb_iv_get(pair, "@left")), NUM2INT(inv_idx), NUM2INT(argv[1]), EPOLLIN | (IVAR_TRUE(inverse, "@wr_rdy") ? 0 : EPOLLOUT));
+    epoll_rearm(selector, rb_iv_get(pair, "@left"), EPOLLIN | (IVAR_TRUE(inverse, "@wr_rdy") ? 0 : EPOLLOUT));
     // Rearm right socket for writing and also reading if not ready for reading
-    epoll_rearm(selector, SOCK_PTR(rb_iv_get(pair, "@right")), NUM2INT(argv[1]), NUM2INT(inv_idx), EPOLLOUT | (IVAR_TRUE(inverse, "@rd_rdy") ? 0 : EPOLLIN));
+    epoll_rearm(selector, rb_iv_get(pair, "@right"), EPOLLOUT | (IVAR_TRUE(inverse, "@rd_rdy") ? 0 : EPOLLIN));
   }
   return Qnil;
 }
@@ -89,69 +75,54 @@ static void SurroGate_Selector_free(int *selector) {
 }
 
 static VALUE SurroGate_Selector_initialize(VALUE self, VALUE logger) {
-  VALUE mConcurrent = rb_const_get(rb_cObject, rb_intern("Concurrent"));
-  VALUE cArray = rb_const_get(mConcurrent, rb_intern("Array"));
-
-  rb_iv_set(self, "@pairing", rb_class_new_instance(0, NULL, cArray)); // @pairing = Concurrent::Array.new
+  rb_iv_set(self, "@scoreboard", rb_class_new_instance(0, NULL, cSurroGate_Scoreboard)); // @scoreboard = Scoreboard.new
   rb_iv_set(self, "@logger", logger);
 
   return Qnil;
 }
 
 static VALUE SurroGate_Selector_push(VALUE self, VALUE left, VALUE right) {
-  int index_ltr, index_rtl, *selector;
-
-  VALUE pair_LTR[2] = {left, right};
-  VALUE pair_RTL[2] = {right, left};
-  VALUE left_to_right = rb_class_new_instance(2, pair_RTL, cSurroGate_Pair); // SurroGate::Pair.new(left, right)
-  VALUE right_to_left = rb_class_new_instance(2, pair_LTR, cSurroGate_Pair); // SurroGate::Pair.new(right, left)
-
-  VALUE pairing = rb_iv_get(self, "@pairing");
+  int *selector;
+  VALUE scoreboard = rb_iv_get(self, "@scoreboard");
 
+  // Check the arguments for the correct type
   Check_Type(left, T_FILE);
   Check_Type(right, T_FILE);
 
-  // raise ArgumentError if @pairing.detect(&pairing_compare)
-  if (rb_block_call(pairing, rb_intern("detect"), 0, NULL, pairing_compare, rb_ary_new_from_values(2, pair_LTR)) != Qnil) {
+  // raise ArgumentError if a socket is already registered
+  if (rb_funcall(scoreboard, rb_intern("include?"), 1, left) == Qtrue || rb_funcall(scoreboard, rb_intern("include?"), 1, right) == Qtrue) {
     rb_raise(rb_eArgError, "Socket already registered!");
   }
 
   Data_Get_Struct(self, int, selector);
+  rb_funcall(scoreboard, rb_intern("push"), 2, left, right);
 
-  rb_funcall(pairing, rb_intern("push"), 2, left_to_right, right_to_left); // @pairing.push(left_to_right, right_to_left)
-  index_ltr = NUM2INT(rb_funcall(pairing, rb_intern("index"), 1, left_to_right)); // @pairing.index(left_to_right)
-  index_rtl = NUM2INT(rb_funcall(pairing, rb_intern("index"), 1, right_to_left)); // @pairing.index(right_to_left)
-
-  rb_iv_set(left_to_right, "@inverse", INT2NUM(index_rtl));
-  rb_iv_set(right_to_left, "@inverse", INT2NUM(index_ltr));
-
-  epoll_register(selector, SOCK_PTR(left), index_ltr, index_rtl);
-  epoll_register(selector, SOCK_PTR(right), index_rtl, index_ltr);
+  epoll_register(selector, left);
+  epoll_register(selector, right);
 
   return Qtrue;
 }
 
-static VALUE SurroGate_Selector_pop(VALUE self, VALUE sockets) {
-  int i, *selector;
+static VALUE SurroGate_Selector_pop(VALUE self, VALUE left, VALUE right) {
+  int *selector;
 
-  VALUE pairing = rb_iv_get(self, "@pairing");
-  rb_block_call(pairing, rb_intern("delete_if"), 0, NULL, pairing_compare, sockets); // @pairing.delete_if(&pairing_compare)
+  VALUE scoreboard = rb_iv_get(self, "@scoreboard");
+  rb_funcall(scoreboard, rb_intern("pop"), 2, left, right);
 
   Data_Get_Struct(self, int, selector);
-  for (i=0; i<RARRAY_LEN(sockets); i++) {
-    epoll_deregister(selector, SOCK_PTR(rb_ary_entry(sockets, i)));
-  }
+  epoll_deregister(selector, left);
+  epoll_deregister(selector, right);
 
   return Qnil;
 }
 
 static VALUE SurroGate_Selector_select(VALUE self, VALUE timeout) {
-  int i, *selector, source, target;
+  int i, *selector;
   struct epoll_event events[256];
   struct epoll_wait_args wait_args;
-  VALUE read, write, socket;
+  VALUE socket;
 
-  VALUE pairing = rb_iv_get(self, "@pairing");
+  VALUE scoreboard = rb_iv_get(self, "@scoreboard");
   Data_Get_Struct(self, int, selector);
 
   // The code after the comments has the same result as the code below, but with GVL
@@ -164,29 +135,23 @@ static VALUE SurroGate_Selector_select(VALUE self, VALUE timeout) {
   rb_thread_call_without_gvl(wait_func, &wait_args, NULL, NULL);
 
   for (i=0; i<wait_args.result; i++) {
-    source = (int)((events[i].data.u64 & 0xFFFFFFFF00000000LL) >> 32);
-    target = (int)(events[i].data.u64 & 0xFFFFFFFFLL);
-
-    read = rb_funcall(pairing, rb_intern("[]"), 1, INT2NUM(target)); // @pairing[target]
-    write = rb_funcall(pairing, rb_intern("[]"), 1, INT2NUM(source)); // @pairing[source]
+    socket = (VALUE) events[i].data.u64;
 
     if (events[i].events & EPOLLIN && events[i].events & EPOLLOUT) {
       // Socket is both available for read and write
-      rb_iv_set(read, "@rd_rdy", Qtrue); // read.rd_rdy = true
-      rb_iv_set(write, "@wr_rdy", Qtrue); // write.wr_rdy = true
+      rb_funcall(scoreboard, rb_intern("mark_rd"), 1, socket);
+      rb_funcall(scoreboard, rb_intern("mark_wr"), 1, socket);
     } else if (events[i].events & EPOLLIN) {
       // Socket is available for read, reregister it for write if not writable
-      rb_iv_set(read, "@rd_rdy", Qtrue); // read.rd_rdy = true
-      if (rb_iv_get(write, "@wr_rdy") == Qfalse) { // if !write.wr_rdy
-        socket = rb_iv_get(read, "@left"); // read.left
-        epoll_rearm(selector, SOCK_PTR(socket), target, source, EPOLLOUT);
+      rb_funcall(scoreboard, rb_intern("mark_rd"), 1, socket);
+      if (rb_funcall(scoreboard, rb_intern("marked_wr?"), 1, socket) == Qfalse) {
+        epoll_rearm(selector, socket, EPOLLOUT);
       }
     } else if (events[i].events & EPOLLOUT) {
       // Socket is available for write, reregister it for read if not readable
-      rb_iv_set(write, "@wr_rdy", Qtrue); // write.wr_rdy = true
-      if (rb_iv_get(write, "@rd_rdy") == Qfalse) { // if !source.rd_rdy
-        socket = rb_iv_get(write, "@right"); // write.right
-        epoll_rearm(selector, SOCK_PTR(socket), source, target, EPOLLIN);
+      rb_funcall(scoreboard, rb_intern("mark_wr"), 1, socket);
+      if (rb_funcall(scoreboard, rb_intern("marked_rd?"), 1, socket) == Qfalse) {
+        epoll_rearm(selector, socket, EPOLLIN);
       }
     }
   }
@@ -195,24 +160,25 @@ static VALUE SurroGate_Selector_select(VALUE self, VALUE timeout) {
 }
 
 static VALUE SurroGate_Selector_each_ready(VALUE self) {
-  VALUE pairing = rb_iv_get(self, "@pairing");
+  VALUE scoreboard = rb_iv_get(self, "@scoreboard");
   rb_need_block();
-  return rb_block_call(pairing, rb_intern("each_with_index"), 0, NULL, pairing_iterate, self);
+  return rb_block_call(scoreboard, rb_intern("each"), 0, NULL, scoreboard_iterate, self);
 }
 
 void Init_selector_ext() {
-  rb_require("concurrent");
   rb_require("surro-gate/pair");
+  rb_require("surro-gate/scoreboard");
 
   mSurroGate = rb_define_module("SurroGate");
   cSurroGate_Selector = rb_define_class_under(mSurroGate, "Selector", rb_cObject);
   cSurroGate_Pair = rb_const_get(mSurroGate, rb_intern("Pair"));
+  cSurroGate_Scoreboard = rb_const_get(mSurroGate, rb_intern("Scoreboard"));
 
   rb_define_alloc_func(cSurroGate_Selector, SurroGate_Selector_allocate);
 
   rb_define_method(cSurroGate_Selector, "initialize", SurroGate_Selector_initialize, 1);
   rb_define_method(cSurroGate_Selector, "push", SurroGate_Selector_push, 2);
-  rb_define_method(cSurroGate_Selector, "pop", SurroGate_Selector_pop, -2);
+  rb_define_method(cSurroGate_Selector, "pop", SurroGate_Selector_pop, 2);
   rb_define_method(cSurroGate_Selector, "select", SurroGate_Selector_select, 1);
   rb_define_method(cSurroGate_Selector, "each_ready", SurroGate_Selector_each_ready, 0);
 }

data/ext/surro-gate/selector_ext.h

@@ -26,7 +26,6 @@ static VALUE SurroGate_Selector_select(VALUE self, VALUE timeout);
 static VALUE SurroGate_Selector_each_ready(VALUE self);
 
 static void SurroGate_Selector_free(int *epoll);
-static VALUE pairing_compare(VALUE pair, VALUE sockets);
-static VALUE pairing_iterate(VALUE pair, VALUE self, int argc, VALUE *argv);
+static VALUE scoreboard_iterate(VALUE pair, VALUE self, int argc, VALUE *argv);
 
 #endif

data/lib/surro-gate/pair.rb

@@ -7,11 +7,31 @@ module SurroGate
     def initialize(left, right)
       @left = left
       @right = right
-      @rd_rdy = @wr_rdy = false
+      unmark
     end
 
     def ready?
       @rd_rdy && @wr_rdy || @left.closed? || @right.closed?
     end
+
+    def marked_rd?
+      @rd_rdy
+    end
+
+    def marked_wr?
+      @wr_rdy
+    end
+
+    def mark_rd
+      @rd_rdy = true
+    end
+
+    def mark_wr
+      @wr_rdy = true
+    end
+
+    def unmark
+      @rd_rdy = @wr_rdy = false
+    end
   end
 end

data/lib/surro-gate/scoreboard.rb

@@ -0,0 +1,70 @@
+require 'thread'
+
+module SurroGate
+  class Scoreboard
+    def initialize
+      @rd = {}
+      @wr = {}
+
+      @lock = Mutex.new
+    end
+
+    def push(left, right)
+      left_to_right = Pair.new(left, right)
+      right_to_left = Pair.new(right, left)
+
+      @lock.synchronize do
+        @rd[left] = left_to_right
+        @wr[right] = left_to_right
+
+        @rd[right] = right_to_left
+        @wr[left] = right_to_left
+      end
+
+      [left, right]
+    end
+
+    def pop(left, right)
+      @lock.synchronize do
+        @rd.delete(left)
+        @rd.delete(right)
+        @wr.delete(left)
+        @wr.delete(right)
+      end
+
+      [left, right]
+    end
+
+    def mark_rd(sock)
+      @rd[sock].mark_rd
+    end
+
+    def mark_wr(sock)
+      @wr[sock].mark_wr
+    end
+
+    def marked_rd?(sock)
+      @rd[sock].marked_rd?
+    end
+
+    def marked_wr?(sock)
+      @wr[sock].marked_wr?
+    end
+
+    def unmark(sock)
+      @rd[sock].unmark
+    end
+
+    def include?(sock)
+      @rd.key?(sock) || @wr.key?(sock)
+    end
+
+    def each(&block)
+      @rd.values.each(&block)
+    end
+
+    def inverse(pair)
+      @wr[pair.left]
+    end
+  end
+end

data/lib/surro-gate/selector.rb

@@ -97,8 +97,8 @@ module SurroGate
     end
 
     def pairing_compare(pair, sockets)
-      sockets.each do |sock|
-        return true if [pair.left, pair.right].include?(sock)
+      sockets.any? do |sock|
+        pair.left == sock || pair.right == sock
       end
     end
   end

data/lib/surro-gate/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module SurroGate
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.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.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Dávid Halász
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -106,6 +106,7 @@ files:
 - ext/surro-gate/selector_ext.h
 - lib/surro-gate.rb
 - lib/surro-gate/pair.rb
+- lib/surro-gate/scoreboard.rb
 - lib/surro-gate/selector.rb
 - lib/surro-gate/version.rb
 - surro-gate.gemspec
@@ -128,8 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A generic purrpose TCP-to-TCP proxy in Ruby