polyphony 0.93 → 0.94

data/ext/polyphony/backend_libev.c

@@ -284,51 +284,25 @@ static inline int fd_from_io(VALUE io, rb_io_t **fptr, int write_mode, int recti
   }
 }
 
-VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof, VALUE pos) {
+VALUE Backend_read(VALUE self, VALUE io, VALUE buffer, VALUE length, VALUE to_eof, VALUE pos) {
   Backend_t *backend;
   struct libev_io watcher;
   int fd;
   rb_io_t *fptr;
 
-  struct io_buffer buffer = get_io_buffer(str, 0);
-  long buf_pos = FIX2INT(pos);
-  int shrinkable_string = 0;
-  int expandable_buffer = 0;
+  struct backend_buffer_spec buffer_spec = backend_get_buffer_spec(buffer, 0);
   long total = 0;
   VALUE switchpoint_result = Qnil;
   int read_to_eof = RTEST(to_eof);
 
-  if (buffer.raw) {
-    if (buf_pos < 0 || buf_pos > buffer.len) buf_pos = buffer.len;
-    buffer.ptr += buf_pos;
-    buffer.len -= buf_pos;
-  }
-  else {
-    expandable_buffer = length == Qnil;
-    long expected_read_length = expandable_buffer ? 4096 : FIX2INT(length);
-    long string_cap = rb_str_capacity(str);
-    if (buf_pos < 0 || buf_pos > buffer.len) buf_pos = buffer.len;
-
-    if (string_cap < expected_read_length + buf_pos) {
-      shrinkable_string = io_setstrbuf(&str, expected_read_length + buf_pos);
-      buffer.ptr = (unsigned char *)RSTRING_PTR(str) + buf_pos;
-      buffer.len = expected_read_length;
-    }
-    else {
-      buffer.ptr += buf_pos;
-      buffer.len = string_cap - buf_pos;
-      if (buffer.len > expected_read_length)
-        buffer.len = expected_read_length;
-    }
-  }
-
   GetBackend(self, backend);
+  backend_prepare_read_buffer(buffer, length, &buffer_spec, FIX2INT(pos));
   fd = fd_from_io(io, &fptr, 0, 1);
   watcher.fiber = Qnil;
 
   while (1) {
     backend->base.op_count++;
-    ssize_t result = read(fd, buffer.ptr, buffer.len);
+    ssize_t result = read(fd, buffer_spec.ptr, buffer_spec.len);
     if (result < 0) {
       int e = errno;
       if (e != EWOULDBLOCK && e != EAGAIN) rb_syserr_fail(e, strerror(e));
@@ -346,40 +320,34 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof,
       total += result;
       if (!read_to_eof) break;
 
-      if (result == buffer.len) {
-        if (!expandable_buffer) break;
-
-        // resize buffer to double its capacity
-        rb_str_resize(str, total + buf_pos);
-        rb_str_modify_expand(str, rb_str_capacity(str));
-        shrinkable_string = 0;
-        buffer.ptr = (unsigned char *)RSTRING_PTR(str) + total + buf_pos;
-        buffer.len = rb_str_capacity(str) - total - buf_pos;
+      if (result == buffer_spec.len) {
+        if (buffer_spec.expandable)
+          backend_grow_string_buffer(buffer, &buffer_spec, total);
+        else
+          break;
       }
       else {
-        buffer.ptr += result;
-        buffer.len -= result;
-        if (!buffer.len) break;
+        buffer_spec.ptr += result;
+        buffer_spec.len -= result;
+        if (!buffer_spec.len) break;
       }
     }
   }
 
-  if (!buffer.raw) {
-    io_set_read_length(str, buf_pos + total, shrinkable_string);
-    if (fptr) io_enc_str(str, fptr);
-  }
   if (!total) return Qnil;
+  
+  if (!buffer_spec.raw) backend_finalize_string_buffer(buffer, &buffer_spec, total, fptr);
 
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
 
-  return buffer.raw ? INT2FIX(total) : str;
+  return buffer_spec.raw ? INT2FIX(total) : buffer;
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE Backend_recv(VALUE self, VALUE io, VALUE str, VALUE length, VALUE pos) {
-  return Backend_read(self, io, str, length, Qnil, pos);
+VALUE Backend_recv(VALUE self, VALUE io, VALUE buffer, VALUE length, VALUE pos) {
+  return Backend_read(self, io, buffer, length, Qnil, pos);
 }
 
 VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
@@ -387,11 +355,11 @@ VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
   struct libev_io watcher;
   int fd;
   rb_io_t *fptr;
-  VALUE str;
+  VALUE buffer;
   long total;
+  char *ptr;
   long len = FIX2INT(maxlen);
   int shrinkable;
-  char *buf;
   VALUE switchpoint_result = Qnil;
 
   READ_LOOP_PREPARE_STR();
@@ -402,7 +370,7 @@ VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
 
   while (1) {
     backend->base.op_count++;
-    ssize_t n = read(fd, buf, len);
+    ssize_t n = read(fd, ptr, len);
     if (n < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -421,7 +389,7 @@ VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
     }
   }
 
-  RB_GC_GUARD(str);
+  RB_GC_GUARD(buffer);
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
 
@@ -435,11 +403,11 @@ VALUE Backend_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method) {
   struct libev_io watcher;
   int fd;
   rb_io_t *fptr;
-  VALUE str;
+  VALUE buffer;
   long total;
+  char *ptr;
   long len = 8192;
   int shrinkable;
-  char *buf;
   VALUE switchpoint_result = Qnil;
   ID method_id = SYM2ID(method);
 
@@ -451,7 +419,7 @@ VALUE Backend_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method) {
 
   while (1) {
     backend->base.op_count++;
-    ssize_t n = read(fd, buf, len);
+    ssize_t n = read(fd, ptr, len);
     if (n < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -470,7 +438,7 @@ VALUE Backend_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method) {
     }
   }
 
-  RB_GC_GUARD(str);
+  RB_GC_GUARD(buffer);
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
 
@@ -479,15 +447,15 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
+VALUE Backend_write(VALUE self, VALUE io, VALUE buffer) {
   Backend_t *backend;
   struct libev_io watcher;
   int fd;
   rb_io_t *fptr;
   VALUE switchpoint_result = Qnil;
 
-  struct io_buffer buffer = get_io_buffer(str, 1);
-  long left = buffer.len;
+  struct backend_buffer_spec buffer_spec = backend_get_buffer_spec(buffer, 1);
+  long left = buffer_spec.len;
 
   GetBackend(self, backend);
   fd = fd_from_io(io, &fptr, 1, 0);
@@ -495,7 +463,7 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
 
   while (left > 0) {
     backend->base.op_count++;
-    ssize_t result = write(fd, buffer.ptr, left);
+    ssize_t result = write(fd, buffer_spec.ptr, left);
     if (result < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -505,7 +473,7 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
-      buffer.ptr += result;
+      buffer_spec.ptr += result;
       left -= result;
     }
   }
@@ -519,7 +487,7 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
 
-  return INT2FIX(buffer.len);
+  return INT2FIX(buffer_spec.len);
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
@@ -542,9 +510,9 @@ VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
 
   iov = malloc(iov_count * sizeof(struct iovec));
   for (int i = 0; i < argc; i++) {
-    VALUE str = argv[i];
-    iov[i].iov_base = StringValuePtr(str);
-    iov[i].iov_len = RSTRING_LEN(str);
+    VALUE buffer = argv[i];
+    iov[i].iov_base = StringValuePtr(buffer);
+    iov[i].iov_len = RSTRING_LEN(buffer);
     total_length += iov[i].iov_len;
   }
   iov_ptr = iov;
@@ -754,15 +722,15 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
+VALUE Backend_send(VALUE self, VALUE io, VALUE buffer, VALUE flags) {
   Backend_t *backend;
   struct libev_io watcher;
   int fd;
   rb_io_t *fptr;
   VALUE switchpoint_result = Qnil;
 
-  struct io_buffer buffer = get_io_buffer(str, 1);
-  long left = buffer.len;
+  struct backend_buffer_spec buffer_spec = backend_get_buffer_spec(buffer, 1);
+  long left = buffer_spec.len;
   int flags_int = FIX2INT(flags);
 
   GetBackend(self, backend);
@@ -771,7 +739,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
 
   while (left > 0) {
     backend->base.op_count++;
-    ssize_t result = send(fd, buffer.ptr, left, flags_int);
+    ssize_t result = send(fd, buffer_spec.ptr, left, flags_int);
     if (result < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -781,7 +749,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
-      buffer.ptr += result;
+      buffer_spec.ptr += result;
       left -= result;
     }
   }
@@ -795,7 +763,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
 
-  return INT2FIX(buffer.len);
+  return INT2FIX(buffer_spec.len);
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
@@ -952,11 +920,11 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   rb_io_t *dest_fptr;
   int left = 0;
   int total = 0;
+  char *ptr;
   int maxlen_i = FIX2INT(maxlen);
   int splice_to_eof = maxlen_i < 0;
   if (splice_to_eof) maxlen_i = -maxlen_i;
-  VALUE str = rb_str_new(0, maxlen_i);
-  char *buf = RSTRING_PTR(str);
+  VALUE buffer = rb_str_new(0, maxlen_i);
 
   GetBackend(self, backend);
   src_fd = fd_from_io(src, &src_fptr, 0, 0);
@@ -967,7 +935,8 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
     int done;
     while (1) {
       backend->base.op_count++;
-      ssize_t n = read(src_fd, buf, maxlen_i);
+      ptr = RSTRING_PTR(buffer);
+      ssize_t n = read(src_fd, ptr, maxlen_i);
       if (n < 0) {
         int e = errno;
         if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -984,7 +953,7 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
 
     while (left > 0) {
       backend->base.op_count++;
-      ssize_t n = write(dest_fd, buf, left);
+      ssize_t n = write(dest_fd, ptr, left);
       if (n < 0) {
         int e = errno;
         if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -994,7 +963,7 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
         if (TEST_EXCEPTION(switchpoint_result)) goto error;
       }
       else {
-        buf += n;
+        ptr += n;
         left -= n;
       }
     }
@@ -1008,7 +977,7 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
 
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
-  RB_GC_GUARD(str);
+  RB_GC_GUARD(buffer);
 
   return INT2FIX(total);
 error:
@@ -1290,13 +1259,13 @@ inline VALUE Backend_run_idle_tasks(VALUE self) {
   return self;
 }
 
-static inline int splice_chunks_write(Backend_t *backend, int fd, VALUE str, struct libev_rw_io *watcher, VALUE *result) {
-  char *buf = RSTRING_PTR(str);
-  int len = RSTRING_LEN(str);
+static inline int splice_chunks_write(Backend_t *backend, int fd, VALUE buffer, struct libev_rw_io *watcher, VALUE *result) {
+  char *ptr = RSTRING_PTR(buffer);
+  int len = RSTRING_LEN(buffer);
   int left = len;
   while (left > 0) {
     backend->base.op_count++;
-    ssize_t n = write(fd, buf, left);
+    ssize_t n = write(fd, ptr, left);
     if (n < 0) {
       int err = errno;
       if ((err != EWOULDBLOCK && err != EAGAIN)) return err;
@@ -1305,7 +1274,7 @@ static inline int splice_chunks_write(Backend_t *backend, int fd, VALUE str, str
       if (TEST_EXCEPTION(*result)) return -1;
     }
     else {
-      buf += n;
+      ptr += n;
       left -= n;
     }
   }
@@ -1388,8 +1357,8 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
   struct libev_rw_io watcher;
   watcher.ctx.fiber = Qnil;
   int maxlen = FIX2INT(chunk_size);
-  VALUE str = Qnil;
   VALUE chunk_len_value = Qnil;
+  VALUE buffer;
 
   int pipefd[2] = { -1, -1 };
   if (pipe(pipefd) == -1) {
@@ -1414,8 +1383,8 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
     chunk_len_value = INT2FIX(chunk_len);
 
     if (chunk_prefix != Qnil) {
-      VALUE str = (TYPE(chunk_prefix) == T_STRING) ? chunk_prefix : rb_funcall(chunk_prefix, ID_call, 1, chunk_len_value);
-      int err = splice_chunks_write(backend, dest_fd, str, &watcher, &result);
+      buffer = (TYPE(chunk_prefix) == T_STRING) ? chunk_prefix : rb_funcall(chunk_prefix, ID_call, 1, chunk_len_value);
+      int err = splice_chunks_write(backend, dest_fd, buffer, &watcher, &result);
       if (err == -1) goto error; else if (err) goto syscallerror;
     }
 
@@ -1429,8 +1398,8 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
     }
 
     if (chunk_postfix != Qnil) {
-      VALUE str = (TYPE(chunk_postfix) == T_STRING) ? chunk_postfix : rb_funcall(chunk_postfix, ID_call, 1, chunk_len_value);
-      int err = splice_chunks_write(backend, dest_fd, str, &watcher, &result);
+      buffer = (TYPE(chunk_postfix) == T_STRING) ? chunk_postfix : rb_funcall(chunk_postfix, ID_call, 1, chunk_len_value);
+      int err = splice_chunks_write(backend, dest_fd, buffer, &watcher, &result);
       if (err == -1) goto error; else if (err) goto syscallerror;
     }
   }
@@ -1444,7 +1413,7 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
     result = backend_snooze(&backend->base);
     if (TEST_EXCEPTION(result)) goto error;
   }
-  RB_GC_GUARD(str);
+  RB_GC_GUARD(buffer);
   RB_GC_GUARD(chunk_len_value);
   RB_GC_GUARD(result);
   if (pipefd[0] != -1) close(pipefd[0]);

data/ext/polyphony/extconf.rb

@@ -5,7 +5,7 @@ require 'mkmf'
 
 dir_config 'polyphony_ext'
 
-KERNEL_INFO_RE = /Linux (\d)\.(\d+)\.(?:\d+)\-(?:\d+\-)?(\w+)/
+KERNEL_INFO_RE = /Linux (\d)\.(\d+)(?:\.)?((?:\d+\.?)*)(?:\-)?([\w\-]+)?/
 def get_config
   config = { linux: !!(RUBY_PLATFORM =~ /linux/) }
   return config if !config[:linux]
@@ -14,7 +14,7 @@ def get_config
   m = kernel_info.match(KERNEL_INFO_RE)
   raise "Could not parse Linux kernel information (#{kernel_info.inspect})" if !m
 
-  version, major_revision, distribution = m[1].to_i, m[2].to_i, m[3]
+  version, major_revision, distribution = m[1].to_i, m[2].to_i, m[4]
   config[:pidfd_open] = (version == 5) && (major_revision >= 3)
 
   force_libev = ENV['POLYPHONY_LIBEV'] != nil