polyphony 0.93 → 0.94

data/ext/polyphony/backend_io_uring.c

@@ -359,42 +359,16 @@ 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;
   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;
   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);
 
   while (1) {
@@ -404,12 +378,12 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof,
     int result;
     int completed;
     
-    io_uring_prep_read(sqe, fd, buffer.ptr, buffer.len, -1);
+    io_uring_prep_read(sqe, fd, buffer_spec.ptr, buffer_spec.len, -1);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
     if (!completed) {
-      context_attach_buffers(ctx, 1, &str);
+      context_attach_buffers(ctx, 1, &buffer);
       RAISE_IF_EXCEPTION(resume_value);
       return resume_value;
     }
@@ -423,42 +397,35 @@ 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;
-
-  return buffer.raw ? INT2FIX(total) : str;
+  
+  if (!buffer_spec.raw) backend_finalize_string_buffer(buffer, &buffer_spec, total, fptr);
+  return buffer_spec.raw ? INT2FIX(total) : buffer;
 }
 
 VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
   Backend_t *backend;
   int fd;
   rb_io_t *fptr;
-  VALUE str;
+  VALUE buffer;
   long total;
+  char *ptr;
   long len = FIX2INT(maxlen);
   int shrinkable;
-  char *buf;
 
   READ_LOOP_PREPARE_STR();
 
@@ -472,12 +439,12 @@ VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
     ssize_t result;
     int completed;
 
-    io_uring_prep_read(sqe, fd, buf, len, -1);
+    io_uring_prep_read(sqe, fd, ptr, len, -1);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
     if (!completed) {
-      context_attach_buffers(ctx, 1, &str);
+      context_attach_buffers(ctx, 1, &buffer);
       RAISE_IF_EXCEPTION(resume_value);
       return resume_value;
     }
@@ -493,7 +460,7 @@ VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
     }
   }
 
-  RB_GC_GUARD(str);
+  RB_GC_GUARD(buffer);
 
   return io;
 }
@@ -502,11 +469,11 @@ VALUE Backend_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method) {
   Backend_t *backend;
   int fd;
   rb_io_t *fptr;
-  VALUE str;
+  VALUE buffer;
   long total;
+  char *ptr;
   long len = 8192;
   int shrinkable;
-  char *buf;
   ID method_id = SYM2ID(method);
 
   READ_LOOP_PREPARE_STR();
@@ -521,12 +488,12 @@ VALUE Backend_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method) {
     ssize_t result;
     int completed;
 
-    io_uring_prep_read(sqe, fd, buf, len, -1);
+    io_uring_prep_read(sqe, fd, ptr, len, -1);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
     if (!completed) {
-      context_attach_buffers(ctx, 1, &str);
+      context_attach_buffers(ctx, 1, &buffer);
       RAISE_IF_EXCEPTION(resume_value);
       return resume_value;
     }
@@ -542,18 +509,18 @@ VALUE Backend_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method) {
     }
   }
 
-  RB_GC_GUARD(str);
+  RB_GC_GUARD(buffer);
 
   return io;
 }
 
-VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
+VALUE Backend_write(VALUE self, VALUE io, VALUE buffer) {
   Backend_t *backend;
   int fd;
   rb_io_t *fptr;
 
-  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);
@@ -565,12 +532,12 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
     int result;
     int completed;
 
-    io_uring_prep_write(sqe, fd, buffer.ptr, left, -1);
+    io_uring_prep_write(sqe, fd, buffer_spec.ptr, left, -1);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
     if (!completed) {
-      context_attach_buffers(ctx, 1, &str);
+      context_attach_buffers(ctx, 1, &buffer);
       RAISE_IF_EXCEPTION(resume_value);
       return resume_value;
     }
@@ -579,12 +546,12 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
     if (result < 0)
       rb_syserr_fail(-result, strerror(-result));
     else {
-      buffer.ptr += result;
+      buffer_spec.ptr += result;
       left -= result;
     }
   }
 
-  return INT2FIX(buffer.len);
+  return INT2FIX(buffer_spec.len);
 }
 
 VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
@@ -602,9 +569,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;
@@ -664,41 +631,15 @@ VALUE Backend_write_m(int argc, VALUE *argv, VALUE self) {
     Backend_writev(self, argv[0], argc - 1, argv + 1);
 }
 
-VALUE Backend_recv(VALUE self, VALUE io, VALUE str, VALUE length, VALUE pos) {
+VALUE Backend_recv(VALUE self, VALUE io, VALUE buffer, VALUE length, VALUE pos) {
   Backend_t *backend;
   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;
 
-  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, 0);
 
   while (1) {
@@ -708,12 +649,12 @@ VALUE Backend_recv(VALUE self, VALUE io, VALUE str, VALUE length, VALUE pos) {
     int result;
     int completed;
 
-    io_uring_prep_recv(sqe, fd, buffer.ptr, buffer.len, 0);
+    io_uring_prep_recv(sqe, fd, buffer_spec.ptr, buffer_spec.len, 0);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
     if (!completed) {
-      context_attach_buffers(ctx, 1, &str);
+      context_attach_buffers(ctx, 1, &buffer);
       RAISE_IF_EXCEPTION(resume_value);
       return resume_value;
     }
@@ -727,24 +668,21 @@ VALUE Backend_recv(VALUE self, VALUE io, VALUE str, VALUE length, VALUE pos) {
     }
   }
 
-  if (!buffer.raw) {
-    io_set_read_length(str, buf_pos + total, shrinkable_string);
-    if (fptr) io_enc_str(str, fptr);
-  }
   if (!total) return Qnil;
 
-  return buffer.raw ? INT2FIX(total) : str;
+  if (!buffer_spec.raw) backend_finalize_string_buffer(buffer, &buffer_spec, total, fptr);
+  return buffer_spec.raw ? INT2FIX(total) : buffer;
 }
 
 VALUE Backend_recv_loop(VALUE self, VALUE io, VALUE maxlen) {
   Backend_t *backend;
   int fd;
   rb_io_t *fptr;
-  VALUE str;
+  VALUE buffer;
   long total;
+  char *ptr;
   long len = FIX2INT(maxlen);
   int shrinkable;
-  char *buf;
 
   READ_LOOP_PREPARE_STR();
 
@@ -758,12 +696,12 @@ VALUE Backend_recv_loop(VALUE self, VALUE io, VALUE maxlen) {
     int result;
     int completed;
 
-    io_uring_prep_recv(sqe, fd, buf, len, 0);
+    io_uring_prep_recv(sqe, fd, ptr, len, 0);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
     if (!completed) {
-      context_attach_buffers(ctx, 1, &str);
+      context_attach_buffers(ctx, 1, &buffer);
       RAISE_IF_EXCEPTION(resume_value);
       return resume_value;
     }
@@ -779,7 +717,7 @@ VALUE Backend_recv_loop(VALUE self, VALUE io, VALUE maxlen) {
     }
   }
 
-  RB_GC_GUARD(str);
+  RB_GC_GUARD(buffer);
   return io;
 }
 
@@ -787,11 +725,11 @@ VALUE Backend_recv_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method)
   Backend_t *backend;
   int fd;
   rb_io_t *fptr;
-  VALUE str;
+  VALUE buffer;
   long total;
+  char *ptr;
   long len = 8192;
   int shrinkable;
-  char *buf;
   ID method_id = SYM2ID(method);
 
   READ_LOOP_PREPARE_STR();
@@ -806,12 +744,12 @@ VALUE Backend_recv_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method)
     int result;
     int completed;
 
-    io_uring_prep_recv(sqe, fd, buf, len, 0);
+    io_uring_prep_recv(sqe, fd, ptr, len, 0);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
     if (!completed) {
-      context_attach_buffers(ctx, 1, &str);
+      context_attach_buffers(ctx, 1, &buffer);
       RAISE_IF_EXCEPTION(resume_value);
       return resume_value;
     }
@@ -827,17 +765,17 @@ VALUE Backend_recv_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method)
     }
   }
 
-  RB_GC_GUARD(str);
+  RB_GC_GUARD(buffer);
   return io;
 }
 
-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;
   int fd;
   rb_io_t *fptr;
 
-  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);
@@ -850,12 +788,12 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
     int result;
     int completed;
 
-    io_uring_prep_send(sqe, fd, buffer.ptr, left, flags_int);
+    io_uring_prep_send(sqe, fd, buffer_spec.ptr, left, flags_int);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
     if (!completed) {
-      context_attach_buffers(ctx, 1, &str);
+      context_attach_buffers(ctx, 1, &buffer);
       RAISE_IF_EXCEPTION(resume_value);
       return resume_value;
     }
@@ -864,12 +802,12 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
     if (result < 0)
       rb_syserr_fail(-result, strerror(-result));
     else {
-      buffer.ptr += result;
+      buffer_spec.ptr += result;
       left -= result;
     }
   }
 
-  return INT2FIX(buffer.len);
+  return INT2FIX(buffer_spec.len);
 }
 
 VALUE io_uring_backend_accept(Backend_t *backend, VALUE server_socket, VALUE socket_class, int loop) {
@@ -1406,18 +1344,18 @@ VALUE Backend_kind(VALUE self) {
   return SYM_io_uring;
 }
 
-struct io_uring_sqe *Backend_chain_prepare_write(Backend_t *backend, VALUE io, VALUE str) {
+struct io_uring_sqe *Backend_chain_prepare_write(Backend_t *backend, VALUE io, VALUE buffer) {
   int fd;
   rb_io_t *fptr;
   struct io_uring_sqe *sqe;
 
   fd = fd_from_io(io, &fptr, 1, 0);
   sqe = io_uring_backend_get_sqe(backend);
-  io_uring_prep_write(sqe, fd, StringValuePtr(str), RSTRING_LEN(str), 0);
+  io_uring_prep_write(sqe, fd, StringValuePtr(buffer), RSTRING_LEN(buffer), 0);
   return sqe;
 }
 
-struct io_uring_sqe *Backend_chain_prepare_send(Backend_t *backend, VALUE io, VALUE str, VALUE flags) {
+struct io_uring_sqe *Backend_chain_prepare_send(Backend_t *backend, VALUE io, VALUE buffer, VALUE flags) {
   int fd;
   rb_io_t *fptr;
   struct io_uring_sqe *sqe;
@@ -1425,7 +1363,7 @@ struct io_uring_sqe *Backend_chain_prepare_send(Backend_t *backend, VALUE io, VA
   fd = fd_from_io(io, &fptr, 1, 0);
 
   sqe = io_uring_backend_get_sqe(backend);
-  io_uring_prep_send(sqe, fd, StringValuePtr(str), RSTRING_LEN(str), FIX2INT(flags));
+  io_uring_prep_send(sqe, fd, StringValuePtr(buffer), RSTRING_LEN(buffer), FIX2INT(flags));
   return sqe;
 }
 
@@ -1560,9 +1498,9 @@ inline VALUE Backend_run_idle_tasks(VALUE self) {
   return self;
 }
 
-static inline void splice_chunks_prep_write(op_context_t *ctx, struct io_uring_sqe *sqe, int fd, VALUE str) {
-  char *buf = RSTRING_PTR(str);
-  int len = RSTRING_LEN(str);
+static inline void splice_chunks_prep_write(op_context_t *ctx, struct io_uring_sqe *sqe, int fd, VALUE buffer) {
+  char *buf = RSTRING_PTR(buffer);
+  int len = RSTRING_LEN(buffer);
   io_uring_prep_write(sqe, fd, buf, len, 0);
   // io_uring_prep_send(sqe, fd, buf, len, 0);
   io_uring_sqe_set_data(sqe, ctx);
@@ -1629,7 +1567,6 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
   op_context_t *ctx = 0;
   struct io_uring_sqe *sqe = 0;
   int maxlen;
-  VALUE str = Qnil;
   VALUE chunk_len_value = Qnil;
   int src_fd;
   int dest_fd;
@@ -1701,7 +1638,6 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
     SPLICE_CHUNKS_AWAIT_OPS(backend, &ctx, 0, &switchpoint_result);
   }
 
-  RB_GC_GUARD(str);
   RB_GC_GUARD(chunk_len_value);
   RB_GC_GUARD(switchpoint_result);
   if (pipefd[0] != -1) close(pipefd[0]);