fdpass 0.1.0 → 0.1.1

data/README

@@ -1,9 +1,13 @@
-= Libarchive/Ruby
+= fdpass
 
 == Description
 
 This is a library to transmit the file descriptor between the processes. 
 
+== Install
+
+gem install fdpass
+
 == Example
 === Server (Reciever)
   require 'fdpass'
@@ -16,6 +20,7 @@ This is a library to transmit the file descriptor between the processes.
         fd = fdpass.recv
         io = IO.open(fd)
         io.puts('%s: %s' % [fd, __FILE__])
+        FDPass.close_fd(fd)
       end
     }
 

data/ext/fdpass.c

@@ -13,10 +13,20 @@ static VALUE rb_fdpass_client(VALUE self, VALUE path) {
   return rb_funcall(rb_cFDPassClient, rb_intern("new"), 1, path);
 }
 
+static VALUE rd_fdpass_close_fd(VALUE self, VALUE fd) {
+  int ifd;
+
+  ifd = NUM2INT(fd);
+  close(ifd);
+
+  return Qnil;
+}
+
 void Init_fdpass() {
   rb_mFDPass = rb_define_module("FDPass");
   rb_define_module_function(rb_mFDPass, "server", rb_fdpass_server, 1);
   rb_define_module_function(rb_mFDPass, "client", rb_fdpass_client, 1);
+  rb_define_module_function(rb_mFDPass, "close_fd", rd_fdpass_close_fd, 1);
 
   rb_eFDPassError = rb_define_class_under(rb_mFDPass, "Error", rb_eStandardError);
 

data/ext/fdpass.h

@@ -20,6 +20,19 @@
 #define RSTRING_LEN(s) (RSTRING(s)->len)
 #endif
 
+struct fdpass_socket {
+  int sock;
+  int closed;
+  VALUE path;
+};
+
+#define Check_Socket(p) do { \
+  if ((p)->sock < 0 || (p)->closed || NIL_P((p)->path)) { \
+    rb_raise(rb_eFDPassError, "Invalid socket"); \
+  } \
+  Check_Type((p)->path, T_STRING); \
+} while(0)
+
 void Init_fdpass_server();
 void Init_fdpass_client();
 

data/ext/fdpass_client.c

@@ -1,10 +1,50 @@
 #include "fdpass.h"
-#include "fdpass_socket.h"
 
 extern VALUE rb_mFDPass;
 extern VALUE rb_eFDPassError;
 VALUE rb_cFDPassClient;
 
+static void fdpass_client_mark(struct fdpass_socket *p) {
+  rb_gc_mark(p->path);
+}
+
+static void fdpass_client_free(struct fdpass_socket *p) {
+  if (!p->closed) {
+    close(p->sock);
+  }
+
+  xfree(p);
+}
+
+static VALUE fdpass_client_alloc(VALUE klass) {
+  struct fdpass_socket *p = ALLOC(struct fdpass_socket);
+  p->sock = -1;
+  p->closed = 1;
+  p->path = Qnil;
+  return Data_Wrap_Struct(klass, fdpass_client_mark, fdpass_client_free, p);
+}
+
+static VALUE rd_fdpass_client_close(VALUE self) {
+  struct fdpass_socket *p;
+
+  Data_Get_Struct(self, struct fdpass_socket, p);
+
+  if (!p->closed) {
+    close(p->sock);
+    p->sock = -1;
+    p->closed = 1;
+    p->path = Qnil;
+  }
+
+  return Qnil;
+}
+
+static VALUE rd_fdpass_client_is_closed(VALUE self) {
+  struct fdpass_socket *p;
+  Data_Get_Struct(self, struct fdpass_socket, p);
+  return p->closed ? Qtrue : Qfalse;
+}
+
 static VALUE rd_fdpass_client_initialize(VALUE self, VALUE path) {
   struct fdpass_socket *p;
   char *cpath;
@@ -34,7 +74,6 @@ static VALUE rd_fdpass_client_initialize(VALUE self, VALUE path) {
   p->sock = sock;
   p->closed = 0;
   p->path = path;
-  p->is_server = 0;
 
   return Qnil;
 }
@@ -80,9 +119,9 @@ static VALUE rb_fdpass_client_send(VALUE self, VALUE fd) {
 
 void Init_fdpass_client() {
   rb_cFDPassClient = rb_define_class_under(rb_mFDPass, "Client", rb_cObject);
-  rb_define_alloc_func(rb_cFDPassClient, fdpass_socket_alloc);
+  rb_define_alloc_func(rb_cFDPassClient, fdpass_client_alloc);
   rb_define_private_method(rb_cFDPassClient, "initialize", rd_fdpass_client_initialize, 1);
-  rb_define_method(rb_cFDPassClient, "close", rd_fdpass_socket_close, 0);
-  rb_define_method(rb_cFDPassClient, "closed?", rd_fdpass_socket_is_closed, 0);
+  rb_define_method(rb_cFDPassClient, "close", rd_fdpass_client_close, 0);
+  rb_define_method(rb_cFDPassClient, "closed?", rd_fdpass_client_is_closed, 0);
   rb_define_method(rb_cFDPassClient, "send", rb_fdpass_client_send, 1);
-}
+}

data/ext/fdpass_server.c

@@ -1,10 +1,70 @@
 #include "fdpass.h"
-#include "fdpass_socket.h"
 
 extern VALUE rb_mFDPass;
 extern VALUE rb_eFDPassError;
 VALUE rb_cFDPassServer;
 
+static void unlink_socket(struct fdpass_socket *p) {
+#ifdef S_ISSOCK
+  char *cpath;
+  struct stat st;
+
+  if (NIL_P(p->path)) {
+    return;
+  }
+
+  Check_Type(p->path, T_STRING);
+  cpath = RSTRING_PTR(p->path);
+
+  if (stat(cpath, &st) == 0 && S_ISSOCK(st.st_mode)) {
+    unlink(cpath);
+  }
+#endif
+}
+
+static void fdpass_server_mark(struct fdpass_socket *p) {
+  rb_gc_mark(p->path);
+}
+
+static void fdpass_server_free(struct fdpass_socket *p) {
+  if (!p->closed) {
+    close(p->sock);
+    unlink_socket(p);
+  }
+
+  xfree(p);
+}
+
+static VALUE fdpass_server_alloc(VALUE klass) {
+  struct fdpass_socket *p = ALLOC(struct fdpass_socket);
+  p->sock = -1;
+  p->closed = 1;
+  p->path = Qnil;
+  return Data_Wrap_Struct(klass, fdpass_server_mark, fdpass_server_free, p);
+}
+
+static VALUE rd_fdpass_server_close(VALUE self) {
+  struct fdpass_socket *p;
+
+  Data_Get_Struct(self, struct fdpass_socket, p);
+
+  if (!p->closed) {
+    close(p->sock);
+    unlink_socket(p);
+    p->sock = -1;
+    p->closed = 1;
+    p->path = Qnil;
+  }
+
+  return Qnil;
+}
+
+static VALUE rd_fdpass_server_is_closed(VALUE self) {
+  struct fdpass_socket *p;
+  Data_Get_Struct(self, struct fdpass_socket, p);
+  return p->closed ? Qtrue : Qfalse;
+}
+
 static VALUE rd_fdpass_server_initialize(VALUE self, VALUE path) {
   struct fdpass_socket *p;
   char *cpath;
@@ -34,7 +94,6 @@ static VALUE rd_fdpass_server_initialize(VALUE self, VALUE path) {
   p->sock = sock;
   p->closed = 0;
   p->path = path;
-  p->is_server = 1;
 
   return Qnil;
 }
@@ -73,9 +132,9 @@ static VALUE rb_fdpass_server_recv(VALUE self) {
 
 void Init_fdpass_server() {
   rb_cFDPassServer = rb_define_class_under(rb_mFDPass, "Server", rb_cObject);
-  rb_define_alloc_func(rb_cFDPassServer, fdpass_socket_alloc);
+  rb_define_alloc_func(rb_cFDPassServer, fdpass_server_alloc);
   rb_define_private_method(rb_cFDPassServer, "initialize", rd_fdpass_server_initialize, 1);
-  rb_define_method(rb_cFDPassServer, "close", rd_fdpass_socket_close, 0);
-  rb_define_method(rb_cFDPassServer, "closed?", rd_fdpass_socket_is_closed, 0);
+  rb_define_method(rb_cFDPassServer, "close", rd_fdpass_server_close, 0);
+  rb_define_method(rb_cFDPassServer, "closed?", rd_fdpass_server_is_closed, 0);
   rb_define_method(rb_cFDPassServer, "recv", rb_fdpass_server_recv, 0);
-}
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fdpass
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 +09:00
+date: 2011-01-08 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -28,16 +28,14 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- ext/fdpass.c
 - ext/fdpass_client.c
 - ext/fdpass_server.c
-- ext/fdpass_socket.c
+- ext/fdpass.c
 - ext/fdpass.h
-- ext/fdpass_socket.h
 - ext/extconf.rb
 - README
 has_rdoc: true
-homepage: https://github.com/winebarrel/fdpass
+homepage: https://bitbucket.org/winebarrel/fdpass
 licenses: []
 
 post_install_message: 
@@ -66,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: This is a library to transmit the file descriptor between the processes.

data/ext/fdpass_socket.c

@@ -1,64 +0,0 @@
-#include "fdpass_socket.h"
-
-extern VALUE rb_eFDPassError;
-
-static void unlink_socket(struct fdpass_socket *p) {
-#ifdef S_ISSOCK
-  char *cpath;
-  struct stat st;
-
-  if (!p->is_server || NIL_P(p->path)) {
-    return;
-  }
-
-  Check_Type(p->path, T_STRING);
-  cpath = RSTRING_PTR(p->path);
-
-  if (stat(cpath, &st) == 0 && S_ISSOCK(st.st_mode)) {
-    unlink(cpath);
-  }
-#endif
-}
-
-static void fdpass_socket_mark(struct fdpass_socket *p) {
-  rb_gc_mark(p->path);
-}
-
-static void fdpass_socket_free(struct fdpass_socket *p) {
-  if (!p->closed) {
-    close(p->sock);
-    unlink_socket(p);
-  }
-
-  xfree(p);
-}
-
-VALUE fdpass_socket_alloc(VALUE klass) {
-  struct fdpass_socket *p = ALLOC(struct fdpass_socket);
-  p->sock = -1;
-  p->closed = 1;
-  p->path = Qnil;
-  return Data_Wrap_Struct(klass, fdpass_socket_mark, fdpass_socket_free, p);
-}
-
-VALUE rd_fdpass_socket_close(VALUE self) {
-  struct fdpass_socket *p;
-
-  Data_Get_Struct(self, struct fdpass_socket, p);
-
-  if (!p->closed) {
-    close(p->sock);
-    unlink_socket(p);
-    p->sock = -1;
-    p->closed = 1;
-    p->path = Qnil;
-  }
-
-  return Qnil;
-}
-
-VALUE rd_fdpass_socket_is_closed(VALUE self) {
-  struct fdpass_socket *p;
-  Data_Get_Struct(self, struct fdpass_socket, p);
-  return p->closed ? Qtrue : Qfalse;
-}

data/ext/fdpass_socket.h

@@ -1,24 +0,0 @@
-#ifndef __FDPASS_SOCKET_H__
-#define __FDPASS_SOCKET_C__
-
-#include "fdpass.h"
-
-struct fdpass_socket {
-  int sock;
-  int closed;
-  VALUE path;
-  int is_server;
-};
-
-#define Check_Socket(p) do { \
-  if ((p)->sock < 0 || (p)->closed || NIL_P((p)->path)) { \
-    rb_raise(rb_eFDPassError, "Invalid socket"); \
-  } \
-  Check_Type((p)->path, T_STRING); \
-} while(0)
-
-VALUE fdpass_socket_alloc(VALUE klass);
-VALUE rd_fdpass_socket_close(VALUE self);
-VALUE rd_fdpass_socket_is_closed(VALUE self);
-
-#endif // __FDPASS_SOCKET_H__