polyphony 0.59 → 0.62

data/ext/polyphony/backend_io_uring_context.c

@@ -25,6 +25,8 @@ void context_store_initialize(op_context_store_t *store) {
   store->last_id = 0;
   store->available = NULL;
   store->taken = NULL;
+  store->available_count = 0;
+  store->taken_count = 0;
 }
 
 inline op_context_t *context_store_acquire(op_context_store_t *store, enum op_type type) {
@@ -32,12 +34,12 @@ inline op_context_t *context_store_acquire(op_context_store_t *store, enum op_ty
   if (ctx) {
     if (ctx->next) ctx->next->prev = NULL;
     store->available = ctx->next;
+    store->available_count--;
   }
   else {
     ctx = malloc(sizeof(op_context_t));
   }
   ctx->id = (++store->last_id);
-  // printf("acquire %p %d (%s)\n", ctx, ctx->id, op_type_to_str(type));
   ctx->prev = NULL;
   ctx->next = store->taken;
   if (store->taken) store->taken->prev = ctx;
@@ -49,6 +51,10 @@ inline op_context_t *context_store_acquire(op_context_store_t *store, enum op_ty
   ctx->ref_count = 2;
   ctx->result = 0;
 
+  store->taken_count++;
+
+  // printf("acquire %p %d (%s, ref_count: %d) taken: %d\n", ctx, ctx->id, op_type_to_str(type), ctx->ref_count, store->taken_count);
+
   return ctx;
 }
 
@@ -61,6 +67,9 @@ inline int context_store_release(op_context_store_t *store, op_context_t *ctx) {
   ctx->ref_count--;
   if (ctx->ref_count) return 0;
 
+  store->taken_count--;
+  store->available_count++;
+
   if (ctx->next) ctx->next->prev = ctx->prev;
   if (ctx->prev) ctx->prev->next = ctx->next;
   if (store->taken == ctx) store->taken = ctx->next;

data/ext/polyphony/backend_io_uring_context.h

@@ -22,7 +22,7 @@ typedef struct op_context {
   struct op_context *prev;
   struct op_context *next;
   enum op_type      type: 16;
-  unsigned int      ref_count : 16;         
+  unsigned int      ref_count : 16;       
   int               id;
   int               result;
   VALUE             fiber;
@@ -31,8 +31,10 @@ typedef struct op_context {
 
 typedef struct op_context_store {
   int           last_id;
-  op_context_t *available;
-  op_context_t *taken;
+  op_context_t  *available;
+  op_context_t  *taken;
+  int           available_count;
+  int           taken_count;
 } op_context_store_t;
 
 const char *op_type_to_str(enum op_type type);

data/ext/polyphony/backend_libev.c

@@ -164,6 +164,8 @@ inline VALUE Backend_poll(VALUE self, VALUE blocking) {
   Backend_t *backend;
   GetBackend(self, backend);
 
+  backend->base.poll_count++;
+
   COND_TRACE(&backend->base, 2, SYM_fiber_event_poll_enter, rb_fiber_current());
   backend->base.currently_polling = 1;
   ev_run(backend->ev_loop, blocking == Qtrue ? EVRUN_ONCE : EVRUN_NOWAIT);
@@ -211,15 +213,11 @@ VALUE Backend_wakeup(VALUE self) {
   return Qnil;
 }
 
-inline struct backend_stats Backend_stats(VALUE self) {
+inline struct backend_stats backend_get_stats(VALUE self) {
   Backend_t *backend;
   GetBackend(self, backend);
 
-  return (struct backend_stats){
-    .scheduled_fibers = runqueue_len(&backend->base.runqueue),
-    .waiting_fibers = 0,
-    .pending_ops = backend->base.pending_count
-  };
+  return backend_base_stats(&backend->base);
 }
 
 struct libev_io {
@@ -261,14 +259,20 @@ VALUE libev_wait_fd(Backend_t *backend, int fd, int events, int raise_exception)
   return switchpoint_result;
 }
 
-VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof) {
+VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof, VALUE pos) {
   Backend_t *backend;
   struct libev_io watcher;
   rb_io_t *fptr;
   long dynamic_len = length == Qnil;
   long len = dynamic_len ? 4096 : NUM2INT(length);
-  int shrinkable = io_setstrbuf(&str, len);
-  char *buf = RSTRING_PTR(str);
+  long buf_pos = NUM2INT(pos);
+  if (str != Qnil) {
+    int current_len = RSTRING_LEN(str);
+    if (buf_pos < 0 || buf_pos > current_len) buf_pos = current_len;
+  }
+  else buf_pos = 0;
+  int shrinkable = io_setstrbuf(&str, buf_pos + len);
+  char *buf = RSTRING_PTR(str) + buf_pos;
   long total = 0;
   VALUE switchpoint_result = Qnil;
   int read_to_eof = RTEST(to_eof);
@@ -284,6 +288,7 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof)
   OBJ_TAINT(str);
 
   while (1) {
+    backend->base.op_count++;
     ssize_t n = read(fptr->fd, buf, len - total);
     if (n < 0) {
       int e = errno;
@@ -304,9 +309,9 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof)
       if (total == len) {
         if (!dynamic_len) break;
 
-        rb_str_resize(str, total);
+        rb_str_resize(str, buf_pos + total);
         rb_str_modify_expand(str, len);
-        buf = RSTRING_PTR(str) + total;
+        buf = RSTRING_PTR(str) + buf_pos + total;
         shrinkable = 0;
         len += len;
       }
@@ -314,7 +319,7 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof)
     }
   }
 
-  io_set_read_length(str, total, shrinkable);
+  io_set_read_length(str, buf_pos + total, shrinkable);
   io_enc_str(str, fptr);
 
   if (total == 0) return Qnil;
@@ -327,17 +332,17 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE Backend_recv(VALUE self, VALUE io, VALUE str, VALUE length) {
-  return Backend_read(self, io, str, length, Qnil);
+VALUE Backend_recv(VALUE self, VALUE io, VALUE str, VALUE length, VALUE pos) {
+  return Backend_read(self, io, str, length, Qnil, pos);
 }
 
-VALUE Backend_read_loop(VALUE self, VALUE io) {
+VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
   Backend_t *backend;
   struct libev_io watcher;
   rb_io_t *fptr;
   VALUE str;
   long total;
-  long len = 8192;
+  long len = NUM2INT(maxlen);
   int shrinkable;
   char *buf;
   VALUE switchpoint_result = Qnil;
@@ -354,6 +359,7 @@ VALUE Backend_read_loop(VALUE self, VALUE io) {
   watcher.fiber = Qnil;
 
   while (1) {
+    backend->base.op_count++;
     ssize_t n = read(fptr->fd, buf, len);
     if (n < 0) {
       int e = errno;
@@ -406,6 +412,7 @@ VALUE Backend_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method) {
   watcher.fiber = Qnil;
 
   while (1) {
+    backend->base.op_count++;
     ssize_t n = read(fptr->fd, buf, len);
     if (n < 0) {
       int e = errno;
@@ -453,6 +460,7 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
   watcher.fiber = Qnil;
 
   while (left > 0) {
+    backend->base.op_count++;
     ssize_t n = write(fptr->fd, buf, left);
     if (n < 0) {
       int e = errno;
@@ -512,6 +520,7 @@ VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
   iov_ptr = iov;
 
   while (1) {
+    backend->base.op_count++;
     ssize_t n = writev(fptr->fd, iov_ptr, iov_count);
     if (n < 0) {
       int e = errno;
@@ -583,6 +592,7 @@ VALUE Backend_accept(VALUE self, VALUE server_socket, VALUE socket_class) {
   io_verify_blocking_mode(fptr, server_socket, Qfalse);
   watcher.fiber = Qnil;
   while (1) {
+    backend->base.op_count++;
     fd = accept(fptr->fd, &addr, &len);
     if (fd < 0) {
       int e = errno;
@@ -641,6 +651,7 @@ VALUE Backend_accept_loop(VALUE self, VALUE server_socket, VALUE socket_class) {
   watcher.fiber = Qnil;
 
   while (1) {
+    backend->base.op_count++;
     fd = accept(fptr->fd, &addr, &len);
     if (fd < 0) {
       int e = errno;
@@ -700,6 +711,7 @@ VALUE Backend_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
   addr.sin_addr.s_addr = inet_addr(host_buf);
   addr.sin_port = htons(NUM2INT(port));
 
+  backend->base.op_count++;
   int result = connect(fptr->fd, (struct sockaddr *)&addr, sizeof(addr));
   if (result < 0) {
     int e = errno;
@@ -740,6 +752,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
   watcher.fiber = Qnil;
 
   while (left > 0) {
+    backend->base.op_count++;
     ssize_t n = send(fptr->fd, buf, left, flags_int);
     if (n < 0) {
       int e = errno;
@@ -847,6 +860,7 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
 
   watcher.ctx.fiber = Qnil;
   while (1) {
+    backend->base.op_count++;
     len = splice(src_fptr->fd, 0, dest_fptr->fd, 0, NUM2INT(maxlen), 0);
     if (len < 0) {
       int e = errno;
@@ -898,6 +912,7 @@ VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
 
   watcher.ctx.fiber = Qnil;
   while (1) {
+    backend->base.op_count++;
     len = splice(src_fptr->fd, 0, dest_fptr->fd, 0, NUM2INT(maxlen), 0);
     if (len < 0) {
       int e = errno;
@@ -957,6 +972,7 @@ VALUE Backend_fake_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   watcher.fiber = Qnil;
   
   while (1) {
+    backend->base.op_count++;
     ssize_t n = read(src_fptr->fd, buf, len);
     if (n < 0) {
       int e = errno;
@@ -972,6 +988,7 @@ VALUE Backend_fake_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   }
 
   while (left > 0) {
+    backend->base.op_count++;
     ssize_t n = write(dest_fptr->fd, buf, left);
     if (n < 0) {
       int e = errno;
@@ -1032,6 +1049,7 @@ VALUE Backend_fake_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen
   while (1) { 
     char *ptr = buf;
     while (1) {
+      backend->base.op_count++;
       ssize_t n = read(src_fptr->fd, ptr, len);
       if (n < 0) {
         int e = errno;
@@ -1049,6 +1067,7 @@ VALUE Backend_fake_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen
     }
 
     while (left > 0) {
+      backend->base.op_count++;
       ssize_t n = write(dest_fptr->fd, ptr, left);
       if (n < 0) {
         int e = errno;
@@ -1088,6 +1107,7 @@ VALUE Backend_wait_io(VALUE self, VALUE io, VALUE write) {
   GetBackend(self, backend);
   GetOpenFile(io, fptr);
 
+  backend->base.op_count++;
   return libev_wait_fd(backend, fptr->fd, events, 1);
 }
 
@@ -1111,6 +1131,7 @@ VALUE Backend_sleep(VALUE self, VALUE duration) {
   watcher.fiber = rb_fiber_current();
   ev_timer_init(&watcher.timer, Backend_timer_callback, NUM2DBL(duration), 0.);
   ev_timer_start(backend->ev_loop, &watcher.timer);
+  backend->base.op_count++;
 
   switchpoint_result = backend_await((struct Backend_base *)backend);
 
@@ -1140,6 +1161,7 @@ noreturn VALUE Backend_timer_loop(VALUE self, VALUE interval) {
     VALUE switchpoint_result = Qnil;    
     ev_timer_init(&watcher.timer, Backend_timer_callback, sleep_duration, 0.);
     ev_timer_start(backend->ev_loop, &watcher.timer);
+    backend->base.op_count++;
     switchpoint_result = backend_await((struct Backend_base *)backend);
     ev_timer_stop(backend->ev_loop, &watcher.timer);
     RAISE_IF_EXCEPTION(switchpoint_result);
@@ -1191,6 +1213,7 @@ VALUE Backend_timeout(int argc,VALUE *argv, VALUE self) {
   watcher.resume_value = timeout;
   ev_timer_init(&watcher.timer, Backend_timeout_callback, NUM2DBL(duration), 0.);
   ev_timer_start(backend->ev_loop, &watcher.timer);
+  backend->base.op_count++;
 
   struct Backend_timeout_ctx timeout_ctx = {backend, &watcher};
   result = rb_ensure(Backend_timeout_ensure_safe, Qnil, Backend_timeout_ensure, (VALUE)&timeout_ctx);
@@ -1213,6 +1236,7 @@ VALUE Backend_waitpid(VALUE self, VALUE pid) {
   if (fd >= 0) {
     Backend_t *backend;
     GetBackend(self, backend);
+    backend->base.op_count++;
 
     VALUE resume_value = libev_wait_fd(backend, fd, EV_READ, 0);
     close(fd);
@@ -1256,6 +1280,7 @@ VALUE Backend_waitpid(VALUE self, VALUE pid) {
   watcher.fiber = rb_fiber_current();
   ev_child_init(&watcher.child, Backend_child_callback, NUM2INT(pid), 0);
   ev_child_start(backend->ev_loop, &watcher.child);
+  backend->base.op_count++;
 
   switchpoint_result = backend_await((struct Backend_base *)backend);
 
@@ -1278,6 +1303,7 @@ VALUE Backend_wait_event(VALUE self, VALUE raise) {
 
   ev_async_init(&async, Backend_async_callback);
   ev_async_start(backend->ev_loop, &async);
+  backend->base.op_count++;
 
   switchpoint_result = backend_await((struct Backend_base *)backend);
 
@@ -1341,6 +1367,7 @@ inline int splice_chunks_write(Backend_t *backend, int fd, VALUE str, struct lib
   int len = RSTRING_LEN(str);
   int left = len;
   while (left > 0) {
+    backend->base.op_count++;
     ssize_t n = write(fd, buf, left);
     if (n < 0) {
       int err = errno;
@@ -1401,6 +1428,7 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
     int chunk_len;
     // splice to pipe
     while (1) {
+      backend->base.op_count++;
       chunk_len = splice(src_fptr->fd, 0, pipefd[1], 0, maxlen, 0);
       if (chunk_len < 0) {
         err = errno;
@@ -1426,6 +1454,7 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
 
     int left = chunk_len;
     while (1) {
+      backend->base.op_count++;
       int n = splice(pipefd[0], 0, dest_fptr->fd, 0, left, 0);
       if (n < 0) {
         err = errno;
@@ -1498,6 +1527,7 @@ void Init_Backend() {
   rb_define_method(cBackend, "post_fork", Backend_post_fork, 0);
   rb_define_method(cBackend, "trace", Backend_trace, -1);
   rb_define_method(cBackend, "trace_proc=", Backend_trace_proc_set, 1);
+  rb_define_method(cBackend, "stats", Backend_stats, 0);
 
   rb_define_method(cBackend, "poll", Backend_poll, 1);
   rb_define_method(cBackend, "break", Backend_wakeup, 0);
@@ -1511,10 +1541,10 @@ void Init_Backend() {
   rb_define_method(cBackend, "accept_loop", Backend_accept_loop, 2);
   rb_define_method(cBackend, "connect", Backend_connect, 3);
   rb_define_method(cBackend, "feed_loop", Backend_feed_loop, 3);
-  rb_define_method(cBackend, "read", Backend_read, 4);
-  rb_define_method(cBackend, "read_loop", Backend_read_loop, 1);
-  rb_define_method(cBackend, "recv", Backend_recv, 3);
-  rb_define_method(cBackend, "recv_loop", Backend_read_loop, 1);
+  rb_define_method(cBackend, "read", Backend_read, 5);
+  rb_define_method(cBackend, "read_loop", Backend_read_loop, 2);
+  rb_define_method(cBackend, "recv", Backend_recv, 4);
+  rb_define_method(cBackend, "recv_loop", Backend_read_loop, 2);
   rb_define_method(cBackend, "recv_feed_loop", Backend_feed_loop, 3);
   rb_define_method(cBackend, "send", Backend_send, 3);
   rb_define_method(cBackend, "sendv", Backend_sendv, 3);
@@ -1540,6 +1570,8 @@ void Init_Backend() {
   SYM_send = ID2SYM(rb_intern("send"));
   SYM_splice = ID2SYM(rb_intern("splice"));
   SYM_write = ID2SYM(rb_intern("write"));
+
+  backend_setup_stats_symbols();
 }
 
 #endif // POLYPHONY_BACKEND_LIBEV

data/ext/polyphony/extconf.rb

@@ -8,8 +8,8 @@ use_pidfd_open = false
 force_use_libev = ENV['POLYPHONY_USE_LIBEV'] != nil
 linux = RUBY_PLATFORM =~ /linux/
 
-if linux && `uname -sr` =~ /Linux 5\.([\d+])/
-  kernel_minor_version = $1.gsub('.', '').to_i
+if linux && `uname -sr` =~ /Linux 5\.(\d+)/
+  kernel_minor_version = $1.to_i
   use_liburing = !force_use_libev && kernel_minor_version >= 6
   use_pidfd_open = kernel_minor_version >= 3
 end

data/ext/polyphony/fiber.c

@@ -81,34 +81,6 @@ static VALUE Fiber_state(VALUE self) {
   return SYM_waiting;
 }
 
-VALUE Fiber_await(VALUE self) {
-  VALUE result;
-
-  // we compare with false, since a fiber that has not yet started will have
-  // @running set to nil
-  if (rb_ivar_get(self, ID_ivar_running) == Qfalse) {
-    result = rb_ivar_get(self, ID_ivar_result);
-    RAISE_IF_EXCEPTION(result);
-    return result;
-  }
-
-  VALUE fiber = rb_fiber_current();
-  VALUE waiting_fibers = rb_ivar_get(self, ID_ivar_waiting_fibers);
-  if (waiting_fibers == Qnil) {
-    waiting_fibers = rb_hash_new();
-    rb_ivar_set(self, ID_ivar_waiting_fibers, waiting_fibers);
-  }
-  rb_hash_aset(waiting_fibers, fiber, Qtrue);
-
-  VALUE backend = rb_ivar_get(rb_thread_current(), ID_ivar_backend);
-  result = Backend_wait_event(backend, Qnil);
-
-  rb_hash_delete(waiting_fibers, fiber);
-  RAISE_IF_EXCEPTION(result);
-  RB_GC_GUARD(result);
-  return result;
-}
-
 VALUE Fiber_send(VALUE self, VALUE value) {
   VALUE mailbox = rb_ivar_get(self, ID_ivar_mailbox);
   if (mailbox == Qnil) {
@@ -125,7 +97,7 @@ VALUE Fiber_receive(VALUE self) {
     mailbox = rb_funcall(cQueue, ID_new, 0);
     rb_ivar_set(self, ID_ivar_mailbox, mailbox);
   }
-  return Queue_shift(mailbox);  
+  return Queue_shift(mailbox);
 }
 
 VALUE Fiber_mailbox(VALUE self) {
@@ -150,9 +122,6 @@ void Init_Fiber() {
   rb_define_method(cFiber, "state", Fiber_state, 0);
   rb_define_method(cFiber, "auto_watcher", Fiber_auto_watcher, 0);
 
-  rb_define_method(cFiber, "await", Fiber_await, 0);
-  rb_define_method(cFiber, "join", Fiber_await, 0);
-
   rb_define_method(cFiber, "<<", Fiber_send, 1);
   rb_define_method(cFiber, "send", Fiber_send, 1);
   rb_define_method(cFiber, "receive", Fiber_receive, 0);

data/ext/polyphony/polyphony.c

@@ -58,20 +58,20 @@ VALUE Polyphony_backend_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE me
   return Backend_feed_loop(BACKEND(), io, receiver, method);
 }
 
-VALUE Polyphony_backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof) {
-  return Backend_read(BACKEND(), io, str, length, to_eof);
+VALUE Polyphony_backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof, VALUE pos) {
+  return Backend_read(BACKEND(), io, str, length, to_eof, pos);
 }
 
-VALUE Polyphony_backend_read_loop(VALUE self, VALUE io) {
-  return Backend_read_loop(BACKEND(), io);
+VALUE Polyphony_backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
+  return Backend_read_loop(BACKEND(), io, maxlen);
 }
 
-VALUE Polyphony_backend_recv(VALUE self, VALUE io, VALUE str, VALUE length) {
-  return Backend_recv(BACKEND(), io, str, length);
+VALUE Polyphony_backend_recv(VALUE self, VALUE io, VALUE str, VALUE length, VALUE pos) {
+  return Backend_recv(BACKEND(), io, str, length, pos);
 }
 
-VALUE Polyphony_backend_recv_loop(VALUE self, VALUE io) {
-  return Backend_recv_loop(BACKEND(), io);
+VALUE Polyphony_backend_recv_loop(VALUE self, VALUE io, VALUE maxlen) {
+  return Backend_recv_loop(BACKEND(), io, maxlen);
 }
 
 VALUE Polyphony_backend_recv_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method) {
@@ -130,10 +130,10 @@ void Init_Polyphony() {
   rb_define_singleton_method(mPolyphony, "backend_accept_loop", Polyphony_backend_accept_loop, 2);
   rb_define_singleton_method(mPolyphony, "backend_connect", Polyphony_backend_connect, 3);
   rb_define_singleton_method(mPolyphony, "backend_feed_loop", Polyphony_backend_feed_loop, 3);
-  rb_define_singleton_method(mPolyphony, "backend_read", Polyphony_backend_read, 4);
-  rb_define_singleton_method(mPolyphony, "backend_read_loop", Polyphony_backend_read_loop, 1);
-  rb_define_singleton_method(mPolyphony, "backend_recv", Polyphony_backend_recv, 3);
-  rb_define_singleton_method(mPolyphony, "backend_recv_loop", Polyphony_backend_recv_loop, 1);
+  rb_define_singleton_method(mPolyphony, "backend_read", Polyphony_backend_read, 5);
+  rb_define_singleton_method(mPolyphony, "backend_read_loop", Polyphony_backend_read_loop, 2);
+  rb_define_singleton_method(mPolyphony, "backend_recv", Polyphony_backend_recv, 4);
+  rb_define_singleton_method(mPolyphony, "backend_recv_loop", Polyphony_backend_recv_loop, 2);
   rb_define_singleton_method(mPolyphony, "backend_recv_feed_loop", Polyphony_backend_recv_feed_loop, 3);
   rb_define_singleton_method(mPolyphony, "backend_send", Polyphony_backend_send, 3);
   rb_define_singleton_method(mPolyphony, "backend_sendv", Polyphony_backend_sendv, 3);