polyphony 0.42 → 0.43.4

data/test/test_fiber.rb

@@ -482,9 +482,9 @@ class FiberTest < MiniTest::Test
   def test_select_from_multiple_fibers
     sleep 0
     buffer = []
-    f1 = spin { sleep 0.01; buffer << :foo; :foo }
-    f2 = spin { sleep 0.03; buffer << :bar; :bar }
-    f3 = spin { sleep 0.05; buffer << :baz; :baz }
+    f1 = spin { sleep 0.1; buffer << :foo; :foo }
+    f2 = spin { sleep 0.3; buffer << :bar; :bar }
+    f3 = spin { sleep 0.5; buffer << :baz; :baz }
 
     selected, result = Fiber.select(f1, f2, f3)
     assert_equal :foo, result

data/test/test_global_api.rb

@@ -106,7 +106,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert t1 - t0 < 0.03
+    assert t1 - t0 < 0.1
     assert_nil v
   end
 
@@ -118,7 +118,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
     assert_equal :bar, v
   end
 
@@ -129,7 +129,7 @@ class MoveOnAfterTest < MiniTest::Test
     assert_equal Fiber.current, f.parent
     v = sleep 1
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
     assert_equal 'foo', v
   end
 end
@@ -145,7 +145,7 @@ class CancelAfterTest < MiniTest::Test
       end
     end
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
   end
 
   def test_cancel_after_without_block
@@ -157,7 +157,31 @@ class CancelAfterTest < MiniTest::Test
       sleep 1
     end
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
+  end
+
+  class CustomException < Exception
+  end
+
+  def test_cancel_after_with_custom_exception
+    assert_raises CustomException do
+      cancel_after(0.01, with_exception: CustomException) do
+        sleep 1
+        :foo
+      end
+    end
+
+    begin
+      e = nil
+      cancel_after(0.01, with_exception: 'foo') do
+        sleep 1
+        :foo
+      end
+    rescue => e
+    ensure
+      assert_kind_of RuntimeError, e
+      assert_equal 'foo', e.message
+    end
   end
 end
 
@@ -201,10 +225,13 @@ class SpinLoopTest < MiniTest::Test
   def test_spin_loop_with_rate
     buffer = []
     counter = 0
-    f = spin_loop(rate: 50) { buffer << (counter += 1) }
+    t0 = Time.now
+    f = spin_loop(rate: 10) { buffer << (counter += 1) }
     sleep 0.2
     f.stop
-    assert counter >= 9 && counter <= 11
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert counter >= expected - 1 && counter <= expected + 1
   end
 end
 
@@ -212,12 +239,15 @@ class ThrottledLoopTest < MiniTest::Test
   def test_throttled_loop
     buffer = []
     counter = 0
+    t0 = Time.now
     f = spin do
-      throttled_loop(50) { buffer << (counter += 1) }
+      throttled_loop(10) { buffer << (counter += 1) }
     end
-    sleep 0.2
+    sleep 0.3
     f.stop
-    assert counter >= 9 && counter <= 11
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert counter >= expected - 1 && counter <= expected + 1
   end
 
   def test_throttled_loop_with_count
@@ -243,19 +273,22 @@ class GlobalAPIEtcTest < MiniTest::Test
 
   def test_every
     buffer = []
+    t0 = Time.now
     f = spin do
-      every(0.01) { buffer << 1 }
+      every(0.1) { buffer << 1 }
     end
-    sleep 0.05
+    sleep 0.5
     f.stop
-    assert (4..5).include?(buffer.size)
+    elapsed = Time.now - t0
+    expected = (elapsed / 0.1).to_i
+    assert buffer.size >= expected - 2 && buffer.size <= expected + 2
   end
 
   def test_sleep
     t0 = Time.now
-    sleep 0.05
+    sleep 0.1
     elapsed = Time.now - t0
-    assert (0.045..0.08).include? elapsed
+    assert (0.05..0.15).include? elapsed
 
     f = spin { sleep }
     snooze

data/test/test_resource_pool.rb

@@ -123,4 +123,16 @@ class ResourcePoolTest < MiniTest::Test
     pool.preheat!
     assert_equal 2, pool.size
   end
+
+  def test_reentrant_resource_pool
+    resources = [+'a', +'b']
+    pool = Polyphony::ResourcePool.new(limit: 1) { resources.shift }
+
+    pool.acquire do |r|
+      assert_equal 'a', r
+      pool.acquire do |r|
+        assert_equal 'a', r
+      end
+    end
+  end
 end

data/test/test_socket.rb

@@ -8,7 +8,8 @@ class SocketTest < MiniTest::Test
   end
 
   def test_tcp
-    server = TCPServer.new('127.0.0.1', 1234)
+    port = rand(1234..5678)
+    server = TCPServer.new('127.0.0.1', port)
 
     server_fiber = spin do
       while (socket = server.accept)
@@ -21,13 +22,13 @@ class SocketTest < MiniTest::Test
     end
 
     snooze
-    client = TCPSocket.new('127.0.0.1', 1234)
+    client = TCPSocket.new('127.0.0.1', port)
     client.write("1234\n")
     assert_equal "1234\n", client.readpartial(8192)
     client.close
   ensure
-    server_fiber.stop
-    snooze
+    server_fiber&.stop
+    server_fiber&.await
     server&.close
   end
 end

data/test/test_throttler.rb

@@ -4,14 +4,15 @@ require_relative 'helper'
 
 class ThrottlerTest < MiniTest::Test
   def test_throttler_with_rate
-    t = Polyphony::Throttler.new(100)
+    t = Polyphony::Throttler.new(10)
     buffer = []
+    t0 = Time.now
     f = spin { loop { t.process { buffer << 1 } } }
-    sleep 0.02
+    sleep 0.2
     f.stop
-    snooze
-    assert buffer.size >= 2
-    assert buffer.size <= 3
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert buffer.size >= expected - 1 && buffer.size <= expected + 1
   ensure
     t.stop
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.42'
+  version: 0.43.4
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -267,6 +267,7 @@ files:
 - docs/assets/img/echo-fibers.svg
 - docs/assets/img/sleeping-fiber.svg
 - docs/faq.md
+- docs/favicon.ico
 - docs/getting-started/index.md
 - docs/getting-started/installing.md
 - docs/getting-started/overview.md
@@ -278,10 +279,13 @@ files:
 - docs/main-concepts/extending.md
 - docs/main-concepts/fiber-scheduling.md
 - docs/main-concepts/index.md
+- docs/polyphony-logo.png
+- examples/adapters/concurrent-ruby.rb
 - examples/adapters/pg_client.rb
 - examples/adapters/pg_notify.rb
 - examples/adapters/pg_pool.rb
 - examples/adapters/pg_transaction.rb
+- examples/adapters/redis_blpop.rb
 - examples/adapters/redis_channels.rb
 - examples/adapters/redis_client.rb
 - examples/adapters/redis_pubsub.rb
@@ -294,6 +298,7 @@ files:
 - examples/core/xx-at_exit.rb
 - examples/core/xx-caller.rb
 - examples/core/xx-channels.rb
+- examples/core/xx-daemon.rb
 - examples/core/xx-deadlock.rb
 - examples/core/xx-deferring-an-operation.rb
 - examples/core/xx-erlang-style-genserver.rb
@@ -386,7 +391,6 @@ files:
 - ext/polyphony/polyphony.c
 - ext/polyphony/polyphony.h
 - ext/polyphony/polyphony_ext.c
-- ext/polyphony/socket.c
 - ext/polyphony/thread.c
 - ext/polyphony/tracing.c
 - lib/polyphony.rb

data/ext/polyphony/socket.c

@@ -1,213 +0,0 @@
-#include "polyphony.h"
-#include <sys/socket.h>
-
-static VALUE cTCPSocket;
-
-///////////////////////////////////////////////////////////////////////////
-
-struct rsock_send_arg {
-    int fd, flags;
-    VALUE mesg;
-    struct sockaddr *to;
-    socklen_t tolen;
-};
-
-#define StringValue(v) rb_string_value(&(v))
-#define IS_ADDRINFO(obj) rb_typeddata_is_kind_of((obj), &addrinfo_type)
-
-VALUE
-rsock_sockaddr_string_value(volatile VALUE *v)
-{
-    // VALUE val = *v;
-    // if (IS_ADDRINFO(val)) {
-    //     *v = addrinfo_to_sockaddr(val);
-    // }
-    StringValue(*v);
-    return *v;
-}
-
-#define SockAddrStringValue(v) rsock_sockaddr_string_value(&(v))
-#define RSTRING_LENINT(str) rb_long2int(RSTRING_LEN(str))
-#ifndef RSTRING_SOCKLEN
-#  define RSTRING_SOCKLEN (socklen_t)RSTRING_LENINT
-#endif
-
-#if defined __APPLE__
-# define do_write_retry(code) do {ret = code;} while (ret == -1 && errno == EPROTOTYPE)
-#else
-# define do_write_retry(code) ret = code
-#endif
-
-VALUE
-rsock_sendto_blocking(void *data)
-{
-    struct rsock_send_arg *arg = data;
-    VALUE mesg = arg->mesg;
-    ssize_t ret;
-    do_write_retry(sendto(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
-			  arg->flags, arg->to, arg->tolen));
-    return (VALUE)ret;
-}
-
-VALUE
-rsock_send_blocking(void *data)
-{
-    struct rsock_send_arg *arg = data;
-    VALUE mesg = arg->mesg;
-    ssize_t ret;
-    do_write_retry(send(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
-			arg->flags));
-    return (VALUE)ret;
-}
-
-///////////////////////////////////////////////////////////////////////////
-
-static VALUE BasicSocket_send(int argc, VALUE *argv, VALUE sock) {
-  VALUE underlying_socket = rb_iv_get(sock, "@io");
-  if (!NIL_P(underlying_socket)) sock = underlying_socket;
-  struct rsock_send_arg arg;
-  VALUE flags, to;
-  rb_io_t *fptr;
-  ssize_t n;
-  rb_blocking_function_t *func;
-  const char *funcname;
-  VALUE agent = Qnil;
-
-  rb_scan_args(argc, argv, "21", &arg.mesg, &flags, &to);
-
-  StringValue(arg.mesg);
-
-  if (!NIL_P(to)) {
-    SockAddrStringValue(to);
-    to = rb_str_new4(to);
-    arg.to = (struct sockaddr *)RSTRING_PTR(to);
-    arg.tolen = RSTRING_SOCKLEN(to);
-    func = rsock_sendto_blocking;
-    funcname = "sendto(2)";
-  }
-  else {
-    func = rsock_send_blocking;
-    funcname = "send(2)";
-  }
-  GetOpenFile(sock, fptr);
-  rb_io_set_nonblock(fptr);
-  arg.fd = fptr->fd;
-  arg.flags = NUM2INT(flags);
-  while ((n = (ssize_t)func(&arg)) < 0) {
-    if (NIL_P(agent))
-      agent = rb_ivar_get(rb_thread_current(), ID_ivar_agent);
-    LibevAgent_wait_io(agent, sock, Qtrue);
-  }
-  return SSIZET2NUM(n);
-}
-
-static VALUE BasicSocket_recv(int argc, VALUE *argv, VALUE sock) {
-  VALUE underlying_socket = rb_iv_get(sock, "@io");
-  if (!NIL_P(underlying_socket)) sock = underlying_socket;
-  long len = argc >= 1 ? NUM2LONG(argv[0]) : 8192;
-  if (len < 0) {
-    rb_raise(rb_eArgError, "negative length %ld given", len);
-  }
-
-  rb_io_t *fptr;
-  long n;
-  int shrinkable;
-  VALUE agent = Qnil;
-
-
-  VALUE str = argc >= 3 ? argv[2] : Qnil;
-
-  shrinkable = io_setstrbuf(&str, len);
-  OBJ_TAINT(str);
-  GetOpenFile(sock, fptr);
-  // rb_io_set_nonblock(fptr);
-  rb_io_check_byte_readable(fptr);
-
-  if (len == 0)
-  	return str;
-
-  while (1) {
-    n = recv(fptr->fd, RSTRING_PTR(str), len, MSG_DONTWAIT);
-    if (n < 0) {
-      int e = errno;
-      if (e == EWOULDBLOCK || e == EAGAIN) {
-        if (NIL_P(agent))
-          agent = rb_ivar_get(rb_thread_current(), ID_ivar_agent);
-        LibevAgent_wait_io(agent, sock, Qnil);
-      }
-      else
-        rb_syserr_fail(e, strerror(e));
-        // rb_syserr_fail_path(e, fptr->pathv);
-    }
-    else
-      break;
-  }
-
-  io_set_read_length(str, n, shrinkable);
-  io_enc_str(str, fptr);
-
-  if (n == 0)
-    return Qnil;
-
-  return str;
-}
-
-static VALUE Socket_accept(VALUE sock) {
-  rb_io_t *fptr;
-  int fd;
-  struct sockaddr addr;
-  socklen_t len = (socklen_t)sizeof addr;
-  VALUE agent = Qnil;
-
-  GetOpenFile(sock, fptr);
-  rb_io_set_nonblock(fptr);
-
-  while (1) {
-    fd = accept(fptr->fd, &addr, &len);
-
-    if (fd < 0) {
-      int e = errno;
-      if (e == EWOULDBLOCK || e == EAGAIN) {
-        if (NIL_P(agent))
-          agent = rb_ivar_get(rb_thread_current(), ID_ivar_agent);
-        LibevAgent_wait_io(agent, sock, Qnil);
-      }
-      else
-        rb_syserr_fail(e, strerror(e));
-        // rb_syserr_fail_path(e, fptr->pathv);
-    }
-    else {
-      VALUE connection = rb_obj_alloc(cTCPSocket);
-      rb_io_t *fp;
-      MakeOpenFile(connection, fp);
-      rb_update_max_fd(fd);
-      fp->fd = fd;
-      fp->mode = FMODE_READWRITE | FMODE_DUPLEX;
-      rb_io_ascii8bit_binmode(connection);
-      rb_io_set_nonblock(fp);
-      rb_io_synchronized(fp);
-      // if (rsock_do_not_reverse_lookup) {
-	    //   fp->mode |= FMODE_NOREVLOOKUP;
-      // }
-
-      return connection;
-    }
-  }
-}
-
-void Init_Socket() {
-  VALUE cBasicSocket;
-  VALUE cSocket;
-  
-  rb_require("socket");
-  cBasicSocket = rb_const_get(rb_cObject, rb_intern("BasicSocket"));
-
-  rb_define_method(cBasicSocket, "send", BasicSocket_send, -1);
-  rb_define_method(cBasicSocket, "recv", BasicSocket_recv, -1);
-
-  cSocket = rb_const_get(rb_cObject, rb_intern("Socket"));
-
-  // rb_define_method(cSocket, "accept", Socket_accept, 0);
-
-  cTCPSocket = rb_const_get(rb_cObject, rb_intern("TCPSocket"));
-}