uringmachine 0.5 → 0.5.1

data/ext/um/um_class.c

@@ -14,7 +14,6 @@ static void UM_mark(void *ptr) {
 static void UM_compact(void *ptr) {
   struct um *machine = ptr;
   machine->self = rb_gc_location(machine->self);
-  machine->poll_fiber = rb_gc_location(machine->poll_fiber);
 
   um_op_list_compact(machine, machine->transient_head);
   um_op_list_compact(machine, machine->runqueue_head);
@@ -41,7 +40,7 @@ static VALUE UM_allocate(VALUE klass) {
   return TypedData_Wrap_Struct(klass, &UM_type, machine);
 }
 
-inline struct um *get_machine(VALUE self) {
+inline struct um *um_get_machine(VALUE self) {
   struct um *machine = RTYPEDDATA_DATA(self);
   if (!machine->ring_initialized)
     rb_raise(rb_eRuntimeError, "Machine not initialized");
@@ -55,45 +54,45 @@ VALUE UM_initialize(VALUE self) {
 }
 
 VALUE UM_setup_buffer_ring(VALUE self, VALUE size, VALUE count) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   int bgid = um_setup_buffer_ring(machine, NUM2UINT(size), NUM2UINT(count));
   return INT2NUM(bgid);
 }
 
 VALUE UM_pending_count(VALUE self) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return INT2NUM(machine->pending_count);
 }
 
 VALUE UM_snooze(VALUE self) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   um_schedule(machine, rb_fiber_current(), Qnil);
   return um_await(machine);
 }
 
 VALUE UM_yield(VALUE self) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_await(machine);
 }
 
 VALUE UM_schedule(VALUE self, VALUE fiber, VALUE value) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   um_schedule(machine, fiber, value);
   return self;
 }
 
 VALUE UM_timeout(VALUE self, VALUE interval, VALUE class) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_timeout(machine, interval, class);
 }
 
 VALUE UM_sleep(VALUE self, VALUE duration) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_sleep(machine, NUM2DBL(duration));
 }
 
 VALUE UM_read(int argc, VALUE *argv, VALUE self) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   VALUE fd;
   VALUE buffer;
   VALUE maxlen;
@@ -108,7 +107,7 @@ VALUE UM_read(int argc, VALUE *argv, VALUE self) {
 
 VALUE UM_read_each(VALUE self, VALUE fd, VALUE bgid) {
 #ifdef HAVE_IO_URING_PREP_READ_MULTISHOT
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_read_each(machine, NUM2INT(fd), NUM2INT(bgid));
 #else
   rb_raise(rb_eRuntimeError, "Not supported by kernel");
@@ -116,7 +115,7 @@ VALUE UM_read_each(VALUE self, VALUE fd, VALUE bgid) {
 }
 
 VALUE UM_write(int argc, VALUE *argv, VALUE self) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   VALUE fd;
   VALUE buffer;
   VALUE len;
@@ -127,27 +126,27 @@ VALUE UM_write(int argc, VALUE *argv, VALUE self) {
 }
 
 VALUE UM_close(VALUE self, VALUE fd) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_close(machine, NUM2INT(fd));
 }
 
 VALUE UM_accept(VALUE self, VALUE fd) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_accept(machine, NUM2INT(fd));
 }
 
 VALUE UM_accept_each(VALUE self, VALUE fd) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_accept_each(machine, NUM2INT(fd));
 }
 
 VALUE UM_socket(VALUE self, VALUE domain, VALUE type, VALUE protocol, VALUE flags) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_socket(machine, NUM2INT(domain), NUM2INT(type), NUM2INT(protocol), NUM2UINT(flags));
 }
 
 VALUE UM_connect(VALUE self, VALUE fd, VALUE host, VALUE port) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
 
   struct sockaddr_in addr;
   memset(&addr, 0, sizeof(addr));
@@ -159,17 +158,17 @@ VALUE UM_connect(VALUE self, VALUE fd, VALUE host, VALUE port) {
 }
 
 VALUE UM_send(VALUE self, VALUE fd, VALUE buffer, VALUE len, VALUE flags) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_send(machine, NUM2INT(fd), buffer, NUM2INT(len), NUM2INT(flags));
 }
 
 VALUE UM_recv(VALUE self, VALUE fd, VALUE buffer, VALUE maxlen, VALUE flags) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_recv(machine, NUM2INT(fd), buffer, NUM2INT(maxlen), NUM2INT(flags));
 }
 
 VALUE UM_recv_each(VALUE self, VALUE fd, VALUE bgid, VALUE flags) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_recv_each(machine, NUM2INT(fd), NUM2INT(bgid), NUM2INT(flags));
 }
 
@@ -181,7 +180,7 @@ VALUE UM_bind(VALUE self, VALUE fd, VALUE host, VALUE port) {
   addr.sin_port = htons(NUM2INT(port));
 
 #ifdef HAVE_IO_URING_PREP_BIND
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_bind(machine, NUM2INT(fd), (struct sockaddr *)&addr, sizeof(addr));
 #else
   int res = bind(NUM2INT(fd), (struct sockaddr *)&addr, sizeof(addr));
@@ -193,7 +192,7 @@ VALUE UM_bind(VALUE self, VALUE fd, VALUE host, VALUE port) {
 
 VALUE UM_listen(VALUE self, VALUE fd, VALUE backlog) {
 #ifdef HAVE_IO_URING_PREP_LISTEN
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_listen(machine, NUM2INT(fd), NUM2INT(backlog));
 #else
   int res = listen(NUM2INT(fd), NUM2INT(backlog));
@@ -215,43 +214,43 @@ static inline int numeric_value(VALUE value) {
 }
 
 VALUE UM_getsockopt(VALUE self, VALUE fd, VALUE level, VALUE opt) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_getsockopt(machine, NUM2INT(fd), NUM2INT(level), NUM2INT(opt));
 }
 
 VALUE UM_setsockopt(VALUE self, VALUE fd, VALUE level, VALUE opt, VALUE value) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_setsockopt(machine, NUM2INT(fd), NUM2INT(level), NUM2INT(opt), numeric_value(value));
 }
 
 #ifdef HAVE_IO_URING_PREP_FUTEX
 
 VALUE UM_mutex_synchronize(VALUE self, VALUE mutex) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   struct um_mutex *mutex_data = Mutex_data(mutex);
   return um_mutex_synchronize(machine, &mutex_data->state);
 }
 
 VALUE UM_queue_push(VALUE self, VALUE queue, VALUE value) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   struct um_queue *que = Queue_data(queue);
   return um_queue_push(machine, que, value);
 }
 
 VALUE UM_queue_pop(VALUE self, VALUE queue) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   struct um_queue *que = Queue_data(queue);
   return um_queue_pop(machine, que);
 }
 
 VALUE UM_queue_unshift(VALUE self, VALUE queue, VALUE value) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   struct um_queue *que = Queue_data(queue);
   return um_queue_unshift(machine, que, value);
 }
 
 VALUE UM_queue_shift(VALUE self, VALUE queue) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   struct um_queue *que = Queue_data(queue);
   return um_queue_shift(machine, que);
 }
@@ -270,7 +269,7 @@ VALUE UM_open_ensure(VALUE arg) {
 }
 
 VALUE UM_open(VALUE self, VALUE pathname, VALUE flags) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   // TODO: take optional perm (mode) arg
   VALUE fd = um_open(machine, pathname, NUM2INT(flags), 0666);
   if (rb_block_given_p()) {
@@ -282,10 +281,15 @@ VALUE UM_open(VALUE self, VALUE pathname, VALUE flags) {
 }
 
 VALUE UM_waitpid(VALUE self, VALUE pid, VALUE options) {
-  struct um *machine = get_machine(self);
+  struct um *machine = um_get_machine(self);
   return um_waitpid(machine, NUM2INT(pid), NUM2INT(options));
 }
 
+VALUE UM_prep_timeout(VALUE self, VALUE interval) {
+  struct um *machine = um_get_machine(self);
+  return um_prep_timeout(machine, NUM2DBL(interval));
+}
+
 VALUE UM_pipe(VALUE self) {
   int fds[2];
   int ret = pipe(fds);
@@ -341,6 +345,8 @@ void Init_UM(void) {
   rb_define_method(cUM, "setsockopt", UM_setsockopt, 4);
   rb_define_method(cUM, "socket", UM_socket, 4);
 
+  rb_define_method(cUM, "prep_timeout", UM_prep_timeout, 1);
+
   #ifdef HAVE_IO_URING_PREP_FUTEX
   rb_define_method(cUM, "pop", UM_queue_pop, 1);
   rb_define_method(cUM, "push", UM_queue_push, 2);
@@ -349,5 +355,7 @@ void Init_UM(void) {
   rb_define_method(cUM, "unshift", UM_queue_unshift, 2);
   #endif
 
+  // Init_micro_ssl(cUM);
+
   um_define_net_constants(cUM);
 }

data/ext/um/um_const.c

@@ -16,6 +16,19 @@
 #define DEF_CONST_INT(mod, v) rb_define_const(mod, #v, INT2NUM(v))
 
 void um_define_net_constants(VALUE mod) {
+  DEF_CONST_INT(mod, MSG_CONFIRM);
+  DEF_CONST_INT(mod, MSG_DONTROUTE);
+  DEF_CONST_INT(mod, MSG_DONTWAIT);
+  DEF_CONST_INT(mod, MSG_EOR);
+  DEF_CONST_INT(mod, MSG_ERRQUEUE);
+  DEF_CONST_INT(mod, MSG_FASTOPEN);
+  DEF_CONST_INT(mod, MSG_MORE);
+  DEF_CONST_INT(mod, MSG_NOSIGNAL);
+  DEF_CONST_INT(mod, MSG_OOB);
+  DEF_CONST_INT(mod, MSG_PEEK);
+  DEF_CONST_INT(mod, MSG_TRUNC);
+  DEF_CONST_INT(mod, MSG_WAITALL);
+
   DEF_CONST_INT(mod, O_APPEND);
   DEF_CONST_INT(mod, O_CLOEXEC);
   DEF_CONST_INT(mod, O_CREAT);
@@ -38,7 +51,6 @@ void um_define_net_constants(VALUE mod) {
   DEF_CONST_INT(mod, WCONTINUED);
   DEF_CONST_INT(mod, WEXITED);
   DEF_CONST_INT(mod, WSTOPPED);
-  DEF_CONST_INT(mod, WCONTINUED);
   DEF_CONST_INT(mod, WNOWAIT);
 
   DEF_CONST_INT(mod, SOCK_STREAM);
@@ -64,13 +76,6 @@ void um_define_net_constants(VALUE mod) {
   DEF_CONST_INT(mod, AF_MAX);
   DEF_CONST_INT(mod, PF_MAX);
 
-  DEF_CONST_INT(mod, MSG_OOB);
-  DEF_CONST_INT(mod, MSG_PEEK);
-  DEF_CONST_INT(mod, MSG_DONTROUTE);
-  DEF_CONST_INT(mod, MSG_WAITALL);
-  DEF_CONST_INT(mod, MSG_DONTWAIT);
-  DEF_CONST_INT(mod, MSG_MORE);
-
   DEF_CONST_INT(mod, SOL_SOCKET);
   DEF_CONST_INT(mod, SOL_IP);
 
@@ -146,7 +151,7 @@ void um_define_net_constants(VALUE mod) {
   DEF_CONST_INT(mod, TCP_WINDOW_CLAMP);
   DEF_CONST_INT(mod, TCP_FASTOPEN);
   DEF_CONST_INT(mod, TCP_CONGESTION);
-  DEF_CONST_INT(mod, TCP_COOKIE_TRANSACTIONS);
+  // DEF_CONST_INT(mod, TCP_COOKIE_TRANSACTIONS);
   DEF_CONST_INT(mod, TCP_QUEUE_SEQ);
   DEF_CONST_INT(mod, TCP_REPAIR);
   DEF_CONST_INT(mod, TCP_REPAIR_OPTIONS);
@@ -210,4 +215,135 @@ void um_define_net_constants(VALUE mod) {
   DEF_CONST_INT(mod, IF_NAMESIZE);
 
   DEF_CONST_INT(mod, SOMAXCONN);
+
+  DEF_CONST_INT(mod, EPERM);
+  DEF_CONST_INT(mod, ENOENT);
+  DEF_CONST_INT(mod, ESRCH);
+  DEF_CONST_INT(mod, EINTR);
+  DEF_CONST_INT(mod, EIO);
+  DEF_CONST_INT(mod, ENXIO);
+  DEF_CONST_INT(mod, E2BIG);
+  DEF_CONST_INT(mod, ENOEXEC);
+  DEF_CONST_INT(mod, EBADF);
+  DEF_CONST_INT(mod, ECHILD);
+  DEF_CONST_INT(mod, EAGAIN);
+  DEF_CONST_INT(mod, ENOMEM);
+  DEF_CONST_INT(mod, EACCES);
+  DEF_CONST_INT(mod, EFAULT);
+  DEF_CONST_INT(mod, ENOTBLK);
+  DEF_CONST_INT(mod, EBUSY);
+  DEF_CONST_INT(mod, EEXIST);
+  DEF_CONST_INT(mod, EXDEV);
+  DEF_CONST_INT(mod, ENODEV);
+  DEF_CONST_INT(mod, ENOTDIR);
+  DEF_CONST_INT(mod, EISDIR);
+  DEF_CONST_INT(mod, EINVAL);
+  DEF_CONST_INT(mod, ENFILE);
+  DEF_CONST_INT(mod, EMFILE);
+  DEF_CONST_INT(mod, ENOTTY);
+  DEF_CONST_INT(mod, ETXTBSY);
+  DEF_CONST_INT(mod, EFBIG);
+  DEF_CONST_INT(mod, ENOSPC);
+  DEF_CONST_INT(mod, ESPIPE);
+  DEF_CONST_INT(mod, EROFS);
+  DEF_CONST_INT(mod, EMLINK);
+  DEF_CONST_INT(mod, EPIPE);
+  DEF_CONST_INT(mod, EDOM);
+  DEF_CONST_INT(mod, ERANGE);
+  DEF_CONST_INT(mod, EDEADLK);
+  DEF_CONST_INT(mod, ENAMETOOLONG);
+  DEF_CONST_INT(mod, ENOLCK);
+  DEF_CONST_INT(mod, ENOSYS);
+  DEF_CONST_INT(mod, ENOTEMPTY);
+  DEF_CONST_INT(mod, ELOOP);
+  DEF_CONST_INT(mod, ENOMSG);
+  DEF_CONST_INT(mod, EIDRM);
+  DEF_CONST_INT(mod, ECHRNG);
+  DEF_CONST_INT(mod, EL2NSYNC);
+  DEF_CONST_INT(mod, EL3HLT);
+  DEF_CONST_INT(mod, EL3RST);
+  DEF_CONST_INT(mod, ELNRNG);
+  DEF_CONST_INT(mod, EUNATCH);
+  DEF_CONST_INT(mod, ENOCSI);
+  DEF_CONST_INT(mod, EL2HLT);
+  DEF_CONST_INT(mod, EBADE);
+  DEF_CONST_INT(mod, EBADR);
+  DEF_CONST_INT(mod, EXFULL);
+  DEF_CONST_INT(mod, ENOANO);
+  DEF_CONST_INT(mod, EBADRQC);
+  DEF_CONST_INT(mod, EBADSLT);
+  DEF_CONST_INT(mod, EBFONT);
+  DEF_CONST_INT(mod, ENOSTR);
+  DEF_CONST_INT(mod, ENODATA);
+  DEF_CONST_INT(mod, ETIME);
+  DEF_CONST_INT(mod, ENOSR);
+  DEF_CONST_INT(mod, ENONET);
+  DEF_CONST_INT(mod, ENOPKG);
+  DEF_CONST_INT(mod, EREMOTE);
+  DEF_CONST_INT(mod, ENOLINK);
+  DEF_CONST_INT(mod, EADV);
+  DEF_CONST_INT(mod, ESRMNT);
+  DEF_CONST_INT(mod, ECOMM);
+  DEF_CONST_INT(mod, EPROTO);
+  DEF_CONST_INT(mod, EMULTIHOP);
+  DEF_CONST_INT(mod, EDOTDOT);
+  DEF_CONST_INT(mod, EBADMSG);
+  DEF_CONST_INT(mod, EOVERFLOW);
+  DEF_CONST_INT(mod, ENOTUNIQ);
+  DEF_CONST_INT(mod, EBADFD);
+  DEF_CONST_INT(mod, EREMCHG);
+  DEF_CONST_INT(mod, ELIBACC);
+  DEF_CONST_INT(mod, ELIBBAD);
+  DEF_CONST_INT(mod, ELIBSCN);
+  DEF_CONST_INT(mod, ELIBMAX);
+  DEF_CONST_INT(mod, ELIBEXEC);
+  DEF_CONST_INT(mod, EILSEQ);
+  DEF_CONST_INT(mod, ERESTART);
+  DEF_CONST_INT(mod, ESTRPIPE);
+  DEF_CONST_INT(mod, EUSERS);
+  DEF_CONST_INT(mod, ENOTSOCK);
+  DEF_CONST_INT(mod, EDESTADDRREQ);
+  DEF_CONST_INT(mod, EMSGSIZE);
+  DEF_CONST_INT(mod, EPROTOTYPE);
+  DEF_CONST_INT(mod, ENOPROTOOPT);
+  DEF_CONST_INT(mod, EPROTONOSUPPORT);
+  DEF_CONST_INT(mod, ESOCKTNOSUPPORT);
+  DEF_CONST_INT(mod, EOPNOTSUPP);
+  DEF_CONST_INT(mod, EPFNOSUPPORT);
+  DEF_CONST_INT(mod, EAFNOSUPPORT);
+  DEF_CONST_INT(mod, EADDRINUSE);
+  DEF_CONST_INT(mod, EADDRNOTAVAIL);
+  DEF_CONST_INT(mod, ENETDOWN);
+  DEF_CONST_INT(mod, ENETUNREACH);
+  DEF_CONST_INT(mod, ENETRESET);
+  DEF_CONST_INT(mod, ECONNABORTED);
+  DEF_CONST_INT(mod, ECONNRESET);
+  DEF_CONST_INT(mod, ENOBUFS);
+  DEF_CONST_INT(mod, EISCONN);
+  DEF_CONST_INT(mod, ENOTCONN);
+  DEF_CONST_INT(mod, ESHUTDOWN);
+  DEF_CONST_INT(mod, ETOOMANYREFS);
+  DEF_CONST_INT(mod, ETIMEDOUT);
+  DEF_CONST_INT(mod, ECONNREFUSED);
+  DEF_CONST_INT(mod, EHOSTDOWN);
+  DEF_CONST_INT(mod, EHOSTUNREACH);
+  DEF_CONST_INT(mod, EALREADY);
+  DEF_CONST_INT(mod, EINPROGRESS);
+  DEF_CONST_INT(mod, ESTALE);
+  DEF_CONST_INT(mod, EUCLEAN);
+  DEF_CONST_INT(mod, ENOTNAM);
+  DEF_CONST_INT(mod, ENAVAIL);
+  DEF_CONST_INT(mod, EISNAM);
+  DEF_CONST_INT(mod, EREMOTEIO);
+  DEF_CONST_INT(mod, EDQUOT);
+  DEF_CONST_INT(mod, ENOMEDIUM);
+  DEF_CONST_INT(mod, EMEDIUMTYPE);
+  DEF_CONST_INT(mod, ECANCELED);
+  DEF_CONST_INT(mod, ENOKEY);
+  DEF_CONST_INT(mod, EKEYEXPIRED);
+  DEF_CONST_INT(mod, EKEYREVOKED);
+  DEF_CONST_INT(mod, EKEYREJECTED);
+  DEF_CONST_INT(mod, EOWNERDEAD);
+  DEF_CONST_INT(mod, ENOTRECOVERABLE);
+
 }

data/ext/um/um_ext.c

@@ -1,9 +1,13 @@
 void Init_UM();
 void Init_Mutex();
 void Init_Queue();
+void Init_AsyncOp();
+void Init_SSL();
 
 void Init_um_ext(void) {
   Init_UM();
   Init_Mutex();
   Init_Queue();
+  Init_AsyncOp();
+  // Init_SSL();
 }

data/ext/um/um_op.c

@@ -2,8 +2,9 @@
 
 inline void um_op_clear(struct um *machine, struct um_op *op) {
   memset(op, 0, sizeof(struct um_op));
-  RB_OBJ_WRITE(machine->self, &op->fiber, Qnil);
-  RB_OBJ_WRITE(machine->self, &op->value, Qnil);
+  op->fiber = Qnil;
+  op->value = Qnil;
+  op->async_op = Qnil;
 }
 
 inline void um_op_transient_add(struct um *machine, struct um_op *op) {
@@ -50,6 +51,7 @@ inline void um_op_list_mark(struct um *machine, struct um_op *head) {
     struct um_op *next = head->next;
     rb_gc_mark_movable(head->fiber);
     rb_gc_mark_movable(head->value);
+    rb_gc_mark_movable(head->async_op);
     head = next;
   }
 }
@@ -59,6 +61,7 @@ inline void um_op_list_compact(struct um *machine, struct um_op *head) {
     struct um_op *next = head->next;
     head->fiber = rb_gc_location(head->fiber);
     head->value = rb_gc_location(head->value);
+    head->async_op = rb_gc_location(head->async_op);
     head = next;
   }
 }