posix-mqueue 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ae9a5d3100496b7f88cb7e4945612486fcbbb2e
-  data.tar.gz: 616ca77fa4263904a3bafc37006a37ecfacffb01
+  metadata.gz: 5823cff6537672e41ae0166a4107bc262f6f5dc2
+  data.tar.gz: 00686b89630f12eed8b9d701417fda1e43825ea4
 SHA512:
-  metadata.gz: be4c7b435842ed7a6e05b9d31fa43802d676dc46c772c1a23d131181c488e8d3a2feb93a97be6313dd6f104cd15b961d194ef0c75a72effba838435879c1a2d2
-  data.tar.gz: 540803a81b08a973861e824b11f358e3231a4c3e302d6e9e4fdab5ca8c0f3f7f024363316f72b4ff7feb42ef30e04a535575cef497909678118181e27caf2007
+  metadata.gz: f00ad53969f1edd82ffc56275ff7994d55991dfd52fb772f11493861e8d6cac68cfa0b38ce1ccc211464f319283ea75c98db3083baf4a875bfac39b5d6d86a83
+  data.tar.gz: 1eb694b40bc7c4ccd1c82797b59ac1834adcbb923d94bd0dc4592613fb82b7cea962a7f43c81f08c0fa8907dd9ae40d1e9d34132b4f447d9eb1d574843f5cf59

data/ext/posix/mqueue.c

@@ -15,6 +15,7 @@ VALUE rb_cQueueEmpty = Qnil;
 
 typedef struct {
   mqd_t fd;
+  VALUE io;
   struct mq_attr attr;
   size_t queue_len;
   char *queue;
@@ -24,6 +25,8 @@ mqueue_t;
 static void
 mqueue_mark(void* ptr)
 {
+  mqueue_t* data = ptr;
+  rb_gc_mark(data->io);
   (void)ptr;
 }
 
@@ -33,6 +36,8 @@ mqueue_free(void* ptr)
   mqueue_t* data = ptr;
   mq_close(data->fd);
   xfree(data->queue);
+  // ??
+  // xfree(data->io);
   xfree(ptr);
 }
 
@@ -86,8 +91,8 @@ VALUE posix_mqueue_send(VALUE self, VALUE message)
 
   TypedData_Get_Struct(self, mqueue_t, &mqueue_type, data);
 
-  if (!RB_TYPE_P(message, T_STRING)) { 
-    rb_raise(rb_eTypeError, "Message must be a string"); 
+  if (!RB_TYPE_P(message, T_STRING)) {
+    rb_raise(rb_eTypeError, "Message must be a string");
   }
 
   rb_io_wait_writable(data->fd);
@@ -102,7 +107,7 @@ VALUE posix_mqueue_send(VALUE self, VALUE message)
   if (err < 0) {
     rb_sys_fail("Message sending failed, please consult mq_send(3)");
   }
-  
+
   return Qtrue;
 }
 
@@ -122,12 +127,12 @@ VALUE posix_mqueue_timedreceive(VALUE self, VALUE args)
 
   TypedData_Get_Struct(self, mqueue_t, &mqueue_type, data);
 
-  if (!RB_TYPE_P(seconds, T_FIXNUM)) { 
-    rb_raise(rb_eTypeError, "First argument must be a Fixnum"); 
+  if (!RB_TYPE_P(seconds, T_FIXNUM)) {
+    rb_raise(rb_eTypeError, "First argument must be a Fixnum");
   }
 
-  if (!RB_TYPE_P(nanoseconds, T_FIXNUM)) { 
-    rb_raise(rb_eTypeError, "Second argument must be a Fixnum"); 
+  if (!RB_TYPE_P(nanoseconds, T_FIXNUM)) {
+    rb_raise(rb_eTypeError, "Second argument must be a Fixnum");
   }
 
   timeout.tv_sec  = FIX2ULONG(seconds);
@@ -169,16 +174,16 @@ VALUE posix_mqueue_timedsend(VALUE self, VALUE args)
 
   TypedData_Get_Struct(self, mqueue_t, &mqueue_type, data);
 
-  if (!RB_TYPE_P(message, T_STRING)) { 
-    rb_raise(rb_eTypeError, "Message must be a string"); 
+  if (!RB_TYPE_P(message, T_STRING)) {
+    rb_raise(rb_eTypeError, "Message must be a string");
   }
 
   if (!RB_TYPE_P(seconds, T_FIXNUM)) {
-    rb_raise(rb_eTypeError, "First argument must be a Fixnum"); 
+    rb_raise(rb_eTypeError, "First argument must be a Fixnum");
   }
 
-  if (!RB_TYPE_P(nanoseconds, T_FIXNUM)) { 
-    rb_raise(rb_eTypeError, "Second argument must be a Fixnum"); 
+  if (!RB_TYPE_P(nanoseconds, T_FIXNUM)) {
+    rb_raise(rb_eTypeError, "Second argument must be a Fixnum");
   }
 
   timeout.tv_sec  = FIX2ULONG(seconds);
@@ -193,7 +198,7 @@ VALUE posix_mqueue_timedsend(VALUE self, VALUE args)
       rb_sys_fail("Message sending failed, please consult mq_send(3)");
     }
   }
-  
+
   return Qtrue;
 }
 
@@ -211,6 +216,14 @@ VALUE posix_mqueue_size(VALUE self)
   return INT2FIX(queue.mq_curmsgs);
 }
 
+VALUE posix_mqueue_to_io(VALUE self)
+{
+  mqueue_t* data;
+  TypedData_Get_Struct(self, mqueue_t, &mqueue_type, data);
+
+  return data->io;
+}
+
 VALUE posix_mqueue_msgsize(VALUE self)
 {
   mqueue_t* data;
@@ -259,14 +272,30 @@ VALUE posix_mqueue_receive(VALUE self)
   return str;
 }
 
-VALUE posix_mqueue_initialize(VALUE self, VALUE args)
+VALUE posix_mqueue_initialize(int argc, VALUE* argv, VALUE self)
 {
-  VALUE options = rb_ary_entry(args, 1);
-  if (options == Qnil) options = rb_hash_new();
+  if(argc < 1)
+  {
+    rb_raise(rb_eArgError, "initialize requires at least one argument");
+  }
+
+  VALUE queue = argv[0];
+  if (!RB_TYPE_P(queue, T_STRING)) {
+    rb_raise(rb_eTypeError, "Queue name must be a string");
+  }
+
+  VALUE options;
+  if (argc < 2)
+  {
+    options = rb_hash_new();
+  }
+  else
+  {
+    options = argv[1];
+  }
 
   int msgsize = FIX2INT(rb_hash_lookup2(options, ID2SYM(rb_intern("msgsize")), INT2FIX(4096)));
   int maxmsg = FIX2INT(rb_hash_lookup2(options, ID2SYM(rb_intern("maxmsg")), INT2FIX(10)));
-  VALUE queue = rb_ary_entry(args, 0);
 
   struct mq_attr attr = {
     .mq_flags   = 0,          // Flags, 0 or O_NONBLOCK
@@ -292,6 +321,11 @@ VALUE posix_mqueue_initialize(VALUE self, VALUE args)
     rb_sys_fail("Failed opening the message queue, please consult mq_open(3)");
   }
 
+  VALUE args[1];
+  args[0] = INT2FIX(data->fd);
+
+  data->io = rb_class_new_instance(1, args, rb_path2class("IO"));
+
   return self;
 }
 
@@ -303,7 +337,7 @@ void Init_mqueue()
   rb_cQueueEmpty = rb_define_class_under(mqueue, "QueueEmpty", rb_eStandardError);
 
   rb_define_alloc_func(mqueue, posix_mqueue_alloc);
-  rb_define_method(mqueue, "initialize", posix_mqueue_initialize, -2);
+  rb_define_method(mqueue, "initialize", posix_mqueue_initialize, -1);
   rb_define_method(mqueue, "send", posix_mqueue_send, 1);
   rb_define_method(mqueue, "receive", posix_mqueue_receive, 0);
   rb_define_method(mqueue, "timedsend", posix_mqueue_timedsend, -2);
@@ -311,5 +345,6 @@ void Init_mqueue()
   rb_define_method(mqueue, "msgsize", posix_mqueue_msgsize, 0);
   rb_define_method(mqueue, "size", posix_mqueue_size, 0);
   rb_define_method(mqueue, "unlink", posix_mqueue_unlink, 0);
+  rb_define_method(mqueue, "to_io", posix_mqueue_to_io, 0);
 }
 

data/lib/posix/mqueue/version.rb

@@ -1,5 +1,5 @@
 module POSIX
   class Mqueue
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/test/mqueue_test.rb

@@ -71,7 +71,7 @@ class MqueueTest < MiniTest::Unit::TestCase
 
     # Set to the maximum for Linux
     with_queue "/big-queue", msgsize: 2 ** 13 do |q|
-      assert_equal 2 ** 13, q.msgsiza
+      assert_equal 2 ** 13, q.msgsize
 
       q.send('c' * (2 ** 13))
     end
@@ -97,6 +97,10 @@ class MqueueTest < MiniTest::Unit::TestCase
     assert_equal 3, @queue.size
   end
 
+  def test_to_io
+    assert_instance_of IO, @queue.to_io
+  end
+
   private
   def with_queue(name, options = {})
     queue = POSIX::Mqueue.new(name, options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: posix-mqueue
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Simon Eskildsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler