posix_mq 0.7.0 → 0.8.0pre

data/.wrongdoc.yml

@@ -4,4 +4,4 @@ cgit_url: http://bogomips.org/ruby_posix_mq.git
 git_url: git://bogomips.org/ruby_posix_mq.git
 changelog_since: 0.4.0
 merge_html:
-  posix-mq-rb_1: Documentation/posix-mq.rb.1.html
+  posix-mq-rb_1: Documentation/posix-mq-rb.1.html

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.7.0.GIT
+DEF_VER=v0.8.0pre.GIT
 
 LF='
 '

data/ext/posix_mq/posix_mq.c

@@ -62,10 +62,13 @@ static int MQ_IO_CLOSE(struct posix_mq *mq)
 }
 #endif
 
-static VALUE cPOSIX_MQ, cAttr;
+# define PMQ_WANTARRAY (1<<0)
+# define PMQ_TRY       (1<<1)
+
+static VALUE cAttr;
 static ID id_new, id_kill, id_fileno, id_mul, id_divmod;
 static ID id_flags, id_maxmsg, id_msgsize, id_curmsgs;
-static ID sym_r, sym_w, sym_rw;
+static VALUE sym_r, sym_w, sym_rw;
 static const mqd_t MQD_INVALID = (mqd_t)-1;
 
 /* Ruby 1.8.6+ macros (for compatibility with Ruby 1.9) */
@@ -438,7 +441,11 @@ static VALUE init(int argc, VALUE *argv, VALUE self)
 
 	mq->des = (mqd_t)xopen(&x);
 	if (mq->des == MQD_INVALID) {
-		if (errno == ENOMEM || errno == EMFILE || errno == ENFILE) {
+		switch (errno) {
+		case ENOMEM:
+		case EMFILE:
+		case ENFILE:
+		case ENOSPC:
 			rb_gc();
 			mq->des = (mqd_t)xopen(&x);
 		}
@@ -501,6 +508,7 @@ static void setup_send_buffer(struct rw_args *x, VALUE buffer)
 	x->msg_len = (size_t)RSTRING_LEN(buffer);
 }
 
+static VALUE _send(int sflags, int argc, VALUE *argv, VALUE self);
 /*
  * call-seq:
  *	mq.send(string [,priority[, timeout]])	=> nil
@@ -514,7 +522,12 @@ static void setup_send_buffer(struct rw_args *x, VALUE buffer)
  * On some older systems, the +timeout+ argument is not currently
  * supported and may raise NotImplementedError if +timeout+ is used.
  */
-static VALUE _send(int argc, VALUE *argv, VALUE self)
+static VALUE my_send(int argc, VALUE *argv, VALUE self)
+{
+	_send(0, argc, argv, self);
+}
+
+static VALUE _send(int sflags, int argc, VALUE *argv, VALUE self)
 {
 	struct posix_mq *mq = get(self, 1);
 	struct rw_args x;
@@ -529,15 +542,14 @@ static VALUE _send(int argc, VALUE *argv, VALUE self)
 	x.timeout = convert_timeout(&expire, timeout);
 	x.msg_prio = NIL_P(prio) ? 0 : NUM2UINT(prio);
 
-	if (mq->attr.mq_flags & O_NONBLOCK)
-		rv = (mqd_t)xsend(&x);
-	else
-		rv = (mqd_t)rb_thread_blocking_region(xsend, &x,
-		                                      RUBY_UBF_IO, 0);
-	if (rv == MQD_INVALID)
+	rv = (mqd_t)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
+	if (rv == MQD_INVALID) {
+		if (errno == EAGAIN && (sflags & PMQ_TRY))
+			return Qfalse;
 		rb_sys_fail("mq_send");
+	}
 
-	return Qnil;
+	return (sflags & PMQ_TRY) ? Qtrue : Qnil;
 }
 
 /*
@@ -558,12 +570,7 @@ static VALUE send0(VALUE self, VALUE buffer)
 	x.timeout = NULL;
 	x.msg_prio = 0;
 
-	if (mq->attr.mq_flags & O_NONBLOCK)
-		rv = (mqd_t)xsend(&x);
-	else
-		rv = (mqd_t)rb_thread_blocking_region(xsend, &x,
-		                                      RUBY_UBF_IO, 0);
-
+	rv = (mqd_t)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
 	if (rv == MQD_INVALID)
 		rb_sys_fail("mq_send");
 
@@ -590,7 +597,7 @@ static VALUE to_io(VALUE self)
 }
 #endif
 
-static VALUE _receive(int wantarray, int argc, VALUE *argv, VALUE self);
+static VALUE _receive(int rflags, int argc, VALUE *argv, VALUE self);
 
 /*
  * call-seq:
@@ -613,7 +620,7 @@ static VALUE _receive(int wantarray, int argc, VALUE *argv, VALUE self);
  */
 static VALUE receive(int argc, VALUE *argv, VALUE self)
 {
-	return _receive(1, argc, argv, self);
+	return _receive(PMQ_WANTARRAY, argc, argv, self);
 }
 
 /*
@@ -639,7 +646,7 @@ static VALUE shift(int argc, VALUE *argv, VALUE self)
 	return _receive(0, argc, argv, self);
 }
 
-static VALUE _receive(int wantarray, int argc, VALUE *argv, VALUE self)
+static VALUE _receive(int rflags, int argc, VALUE *argv, VALUE self)
 {
 	struct posix_mq *mq = get(self, 1);
 	struct rw_args x;
@@ -667,18 +674,16 @@ static VALUE _receive(int wantarray, int argc, VALUE *argv, VALUE self)
 	x.msg_len = (size_t)mq->attr.mq_msgsize;
 	x.des = mq->des;
 
-	if (mq->attr.mq_flags & O_NONBLOCK) {
-		r = (ssize_t)xrecv(&x);
-	} else {
-		r = (ssize_t)rb_thread_blocking_region(xrecv, &x,
-		                                       RUBY_UBF_IO, 0);
-	}
-	if (r < 0)
+	r = (ssize_t)rb_thread_blocking_region(xrecv, &x, RUBY_UBF_IO, 0);
+	if (r < 0) {
+		if (errno == EAGAIN && (rflags & PMQ_TRY))
+			return Qnil;
 		rb_sys_fail("mq_receive");
+	}
 
 	rb_str_set_len(buffer, r);
 
-	if (wantarray)
+	if (rflags & PMQ_WANTARRAY)
 		return rb_ary_new3(2, buffer, UINT2NUM(x.msg_prio));
 	return buffer;
 }
@@ -940,10 +945,12 @@ static VALUE setnotify(VALUE self, VALUE arg)
  *
  * Returns the current non-blocking state of the message queue descriptor.
  */
-static VALUE getnonblock(VALUE self)
+static VALUE nonblock_p(VALUE self)
 {
 	struct posix_mq *mq = get(self, 1);
 
+	if (mq_getattr(mq->des, &mq->attr) < 0)
+		rb_sys_fail("mq_getattr");
 	return mq->attr.mq_flags & O_NONBLOCK ? Qtrue : Qfalse;
 }
 
@@ -976,9 +983,62 @@ static VALUE setnonblock(VALUE self, VALUE nb)
 	return nb;
 }
 
+static VALUE tryinit(int argc, VALUE *argv, VALUE self)
+{
+	init(argc, argv, self);
+	setnonblock(self, Qtrue);
+
+	return self;
+}
+
+/*
+ * call-seq:
+ *	mq.trysend(string [,priority[, timeout]]) => +true+ or +false+
+ *
+ * Exactly like POSIX_MQ#send, except it returns +false+ instead of raising
+ * +Errno::EAGAIN+ when non-blocking operation is desired and returns +true+
+ * on success instead of +nil+.
+ * This does not guarantee non-blocking behavior, the message queue must
+ * be made non-blocking before calling this method.
+ */
+static VALUE trysend(int argc, VALUE *argv, VALUE self)
+{
+	_send(PMQ_TRY, argc, argv, self);
+}
+
+/*
+ * call-seq:
+ *	mq.tryshift([buffer [, timeout]])	=> message or nil
+ *
+ * Exactly like POSIX_MQ#shift, except it returns +nil+ instead of raising
+ * +Errno::EAGAIN+ when non-blocking operation is desired.
+ *
+ * This does not guarantee non-blocking behavior, the message queue must
+ * be made non-blocking before calling this method.
+ */
+static VALUE tryshift(int argc, VALUE *argv, VALUE self)
+{
+	return _receive(PMQ_TRY, argc, argv, self);
+}
+
+/*
+ * call-seq:
+ *	mq.tryreceive([buffer [, timeout]])	=> [ message, priority ] or nil
+ *
+ * Exactly like POSIX_MQ#receive, except it returns +nil+ instead of raising
+ * +Errno::EAGAIN+ when non-blocking operation is desired.
+ *
+ * This does not guarantee non-blocking behavior, the message queue must
+ * be made non-blocking before calling this method.
+ */
+static VALUE tryreceive(int argc, VALUE *argv, VALUE self)
+{
+	return _receive(PMQ_WANTARRAY|PMQ_TRY, argc, argv, self);
+}
+
 void Init_posix_mq_ext(void)
 {
-	cPOSIX_MQ = rb_define_class("POSIX_MQ", rb_cObject);
+	VALUE cPOSIX_MQ = rb_define_class("POSIX_MQ", rb_cObject);
 	rb_define_alloc_func(cPOSIX_MQ, alloc);
 	cAttr = rb_const_get(cPOSIX_MQ, rb_intern("Attr"));
 
@@ -1003,10 +1063,13 @@ void Init_posix_mq_ext(void)
 	rb_define_singleton_method(cPOSIX_MQ, "unlink", s_unlink, 1);
 
 	rb_define_method(cPOSIX_MQ, "initialize", init, -1);
-	rb_define_method(cPOSIX_MQ, "send", _send, -1);
+	rb_define_method(cPOSIX_MQ, "send", my_send, -1);
 	rb_define_method(cPOSIX_MQ, "<<", send0, 1);
+	rb_define_method(cPOSIX_MQ, "trysend", trysend, -1);
 	rb_define_method(cPOSIX_MQ, "receive", receive, -1);
+	rb_define_method(cPOSIX_MQ, "tryreceive", tryreceive, -1);
 	rb_define_method(cPOSIX_MQ, "shift", shift, -1);
+	rb_define_method(cPOSIX_MQ, "tryshift", tryshift, -1);
 	rb_define_method(cPOSIX_MQ, "attr", getattr, 0);
 	rb_define_method(cPOSIX_MQ, "attr=", setattr, 1);
 	rb_define_method(cPOSIX_MQ, "close", _close, 0);
@@ -1017,7 +1080,7 @@ void Init_posix_mq_ext(void)
 	rb_define_method(cPOSIX_MQ, "nonblock=", setnonblock, 1);
 	rb_define_method(cPOSIX_MQ, "notify_exec", setnotify_exec, 2);
 	rb_define_method(cPOSIX_MQ, "notify_cleanup", notify_cleanup, 0);
-	rb_define_method(cPOSIX_MQ, "nonblock?", getnonblock, 0);
+	rb_define_method(cPOSIX_MQ, "nonblock?", nonblock_p, 0);
 #ifdef MQD_TO_FD
 	rb_define_method(cPOSIX_MQ, "to_io", to_io, 0);
 #endif

data/lib/posix_mq.rb

@@ -6,11 +6,6 @@
 # See the link:README for examples on how to use it.
 class POSIX_MQ
 
-  # version of POSIX_MQ, currently 0.7.0
-  # This constant is deprecated and will be removed in the next
-  # release.  Use +respond_to?+ instead to test for features.
-  VERSION = "0.7.0"
-
   # An analogous Struct to "struct mq_attr" in C.
   # This may be used in arguments for POSIX_MQ.new and
   # POSIX_MQ#attr=.  POSIX_MQ#attr returns an instance

data/test/test_posix_mq.rb

@@ -4,6 +4,11 @@ require 'posix_mq'
 require 'thread'
 require 'fcntl'
 $stderr.sync = $stdout.sync = true
+require "dl"
+begin
+  require "dl/func"
+rescue LoadError
+end
 
 class Test_POSIX_MQ < Test::Unit::TestCase
 
@@ -97,21 +102,24 @@ class Test_POSIX_MQ < Test::Unit::TestCase
   end
 
   def test_alarm_signal_safe
-    alarm = nil
-    libcs = %w(/lib/libc-2.7.so /usr/lib/libc.sl)
-    libcs.each do |libc|
-      if File.readable?(libc)
-        require "dl"
-        libc = DL.dlopen libc
+    libc = alarm = nil
+    libcs = %w(libc.so.6 /usr/lib/libc.sl)
+    libcs.each do |name|
+      libc = DL::Handle.new(name) rescue next
+      if defined?(DL::Function)
+        alarm = libc["alarm"]
+        alarm = DL::CFunc.new(alarm, DL::TYPE_INT, "alarm")
+        alarm = DL::Function.new(alarm, [DL::TYPE_INT], DL::TYPE_INT)
+      else
         alarm = libc["alarm", "II"]
-        break
       end
+      break
     end
     alarm or return warn "alarm() not found in #{libcs.inspect}"
     alarms = 0
     trap("ALRM") { alarms += 1 }
     interval = 1
-    alarm[interval]
+    alarm.call interval
     @mq = POSIX_MQ.new(@path, :rw)
     assert ! @mq.nonblock?
     t0 = Time.now
@@ -277,6 +285,17 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     assert_equal 0, @mq.attr.flags
   end
 
+  def test_setattr_fork
+    @mq = POSIX_MQ.new @path, IO::CREAT|IO::WRONLY, 0666
+    mq_attr = POSIX_MQ::Attr.new(IO::NONBLOCK)
+    @mq.attr = mq_attr
+    assert @mq.nonblock?
+
+    pid = fork { @mq.nonblock = false }
+    assert Process.waitpid2(pid)[1].success?
+    assert ! @mq.nonblock?
+  end
+
   def test_new_nonblocking
     @mq = POSIX_MQ.new @path, IO::CREAT|IO::WRONLY|IO::NONBLOCK, 0666
     assert @mq.nonblock?
@@ -337,6 +356,20 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     assert_raises(Errno::EAGAIN) { @mq << '.' }
   end
 
+  def test_try
+    mq_attr = POSIX_MQ::Attr.new(IO::NONBLOCK, 1, 1, 0)
+    @mq = POSIX_MQ.new @path, IO::CREAT|IO::RDWR, 0666, mq_attr
+
+    assert_nil @mq.tryreceive
+    assert_nil @mq.tryshift
+    assert_equal true, @mq.trysend("a")
+    assert_equal [ "a", 0 ], @mq.tryreceive
+    assert_equal true, @mq.trysend("b")
+    assert_equal "b", @mq.tryshift
+    assert_equal true, @mq.trysend("c")
+    assert_equal false, @mq.trysend("d")
+  end
+
   def test_prio_max
     min_posix_mq_prio_max = 31 # defined by POSIX
     assert POSIX_MQ::PRIO_MAX >= min_posix_mq_prio_max

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: posix_mq
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 961915908
+  prerelease: 5
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  - pre
+  version: 0.8.0pre
 platform: ruby
 authors: 
 - Ruby POSIX MQ hackers
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +00:00
+date: 2011-02-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,12 +103,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: qrp