fdpass 0.1.1 → 0.1.2

data/ext/fdpass.c

@@ -32,4 +32,5 @@ void Init_fdpass() {
 
   Init_fdpass_server();
   Init_fdpass_client();
+  Init_fdpass_fd();
 }

data/ext/fdpass.h

@@ -26,6 +26,11 @@ struct fdpass_socket {
   VALUE path;
 };
 
+struct fdpass_fd {
+  int fd;
+  int closed;
+};
+
 #define Check_Socket(p) do { \
   if ((p)->sock < 0 || (p)->closed || NIL_P((p)->path)) { \
     rb_raise(rb_eFDPassError, "Invalid socket"); \
@@ -35,5 +40,6 @@ struct fdpass_socket {
 
 void Init_fdpass_server();
 void Init_fdpass_client();
+void Init_fdpass_fd();
 
 #endif // __FDPASS_H__

data/ext/fdpass_fd.c

@@ -0,0 +1,65 @@
+#include "fdpass.h"
+
+extern VALUE rb_mFDPass;
+VALUE rb_cFDPassFD;
+
+static void fdpass_fd_free(struct fdpass_fd *p) {
+  if (!p->closed && p->fd >= 0) {
+    close(p->fd);
+  }
+
+  xfree(p);
+}
+
+static VALUE fdpass_fd_alloc(VALUE klass) {
+  struct fdpass_fd *p = ALLOC(struct fdpass_fd);
+  p->fd = -1;
+  p->closed = 1;
+  return Data_Wrap_Struct(klass, 0, fdpass_fd_free, p);
+}
+
+static VALUE rd_fdpass_fd_close(VALUE self) {
+  struct fdpass_fd *p;
+
+  Data_Get_Struct(self, struct fdpass_fd, p);
+
+  if (!p->closed && p->fd >= 0) {
+    close(p->fd);
+    p->fd = -1;
+    p->closed = 1;
+  }
+
+  return Qnil;
+}
+
+static VALUE rd_fdpass_fd_is_closed(VALUE self) {
+  struct fdpass_fd *p;
+  Data_Get_Struct(self, struct fdpass_fd, p);
+  return p->closed ? Qtrue : Qfalse;
+}
+
+static VALUE rd_fdpass_fd_to_int(VALUE self) {
+  struct fdpass_fd *p;
+  Data_Get_Struct(self, struct fdpass_fd, p);
+  return INT2FIX(p->fd);
+}
+
+static VALUE rd_fdpass_fd_initialize(VALUE self, VALUE fd) {
+  struct fdpass_fd *p;
+
+  Data_Get_Struct(self, struct fdpass_fd, p);
+
+  p->fd = NUM2INT(fd);
+  p->closed = 0;
+
+  return Qnil;
+}
+
+void Init_fdpass_fd() {
+  rb_cFDPassFD = rb_define_class_under(rb_mFDPass, "FD", rb_cObject);
+  rb_define_alloc_func(rb_cFDPassFD, fdpass_fd_alloc);
+  rb_define_private_method(rb_cFDPassFD, "initialize", rd_fdpass_fd_initialize, 1);
+  rb_define_method(rb_cFDPassFD, "close", rd_fdpass_fd_close, 0);
+  rb_define_method(rb_cFDPassFD, "closed?", rd_fdpass_fd_is_closed, 0);
+  rb_define_method(rb_cFDPassFD, "to_int", rd_fdpass_fd_to_int, 0);
+}

data/ext/fdpass_server.c

@@ -2,6 +2,7 @@
 
 extern VALUE rb_mFDPass;
 extern VALUE rb_eFDPassError;
+extern VALUE rb_cFDPassFD;
 VALUE rb_cFDPassServer;
 
 static void unlink_socket(struct fdpass_socket *p) {
@@ -106,6 +107,7 @@ static VALUE rb_fdpass_server_recv(VALUE self) {
   int *cmsg_data;
   struct iovec iov;
   char iov_data[1];
+  VALUE fd;
 
   Data_Get_Struct(self, struct fdpass_socket, p);
   Check_Socket(p);
@@ -127,7 +129,8 @@ static VALUE rb_fdpass_server_recv(VALUE self) {
   cmsg = CMSG_FIRSTHDR(&msg);
   cmsg_data = (int *) CMSG_DATA(cmsg);
 
-  return INT2NUM(*cmsg_data);
+  fd = INT2NUM(*cmsg_data);
+  return rb_class_new_instance(1, &fd, rb_cFDPassFD);
 }
 
 void Init_fdpass_server() {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fdpass
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 +09:00
+date: 2011-01-09 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,7 @@ extra_rdoc_files: []
 
 files: 
 - ext/fdpass_client.c
+- ext/fdpass_fd.c
 - ext/fdpass_server.c
 - ext/fdpass.c
 - ext/fdpass.h