posix_mq 1.0.0 → 2.0.0

data/ChangeLog

@@ -1,5 +1,118 @@
 ChangeLog from http://bogomips.org/ruby_posix_mq.git
 
+   commit 86f36a2d88aca8fdef45fd2a757f98a593935ba9
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Mon Aug 6 20:58:04 2012 +0000
+   
+       posix_mq 2.0.0 - a minor API change + FreeBSD fixes
+       
+       Blocking methods no longer raise Errno::EINTR (to match
+       Ruby IO semantics, making code easier to work with).
+       
+       There are also many FreeBSD-related fixes thanks to
+       Hleb Valoshka <375gnu@gmail.com> and small code cleanups.
+   
+   commit a7fc8eea6fbe774d289676ac197972d8fb6c41f4
+   Author: ew@fbsd90-32.(none) <ew@fbsd90-32.(none)>
+   Date:   Wed Jul 11 02:54:33 2012 +0000
+   
+       test: relax test timings for timed* tests
+       
+       On my i386-freebsd9 VM, this takes just longer than the
+       maximum allowable time.
+   
+   commit abbe5f16a9c3e17a9a6bab39bb105dc655e55eb6
+   Author: ew@fbsd90-32.(none) <ew@fbsd90-32.(none)>
+   Date:   Wed Jul 11 02:25:44 2012 +0000
+   
+       extconf: fix __mq_oshandle() detection on FreeBSD
+       
+       We need to have -lrt in LDFLAGS before we can detect it.
+   
+   commit 00b84b3d2d9bec7ed480a0715408148af0a0d057
+   Author: ew@fbsd90-32.(none) <ew@fbsd90-32.(none)>
+   Date:   Wed Jul 11 02:02:43 2012 +0000
+   
+       test: disable IO.select test if #to_io is missing
+   
+   commit 78c63761660a96f96e8f465c4cecedd803df9afe
+   Author: ew@fbsd90-32.(none) <ew@fbsd90-32.(none)>
+   Date:   Wed Jul 11 01:58:57 2012 +0000
+   
+       ext: fix type inconsistencies for int vs mqd_t retvals
+       
+       Somehow I mixed up return values for mq_* functions that
+       return "int".  This was noticed on FreeBSD where mqd_t
+       is NOT an integer.
+   
+   commit dc05c43b65460d72ae45164f61e327d715a6e954
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Jul 12 12:30:20 2012 -0700
+   
+       notify: set lower bound for notify stack size
+       
+       Some OSes have ridiculously low boundaries and we don't
+       want mysterious failures on them
+   
+   commit 73dfbeb1d59fbc1e22651cb4da8ee85f0a6fd9ce
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Tue Jul 3 17:57:44 2012 -0700
+   
+       blocking functions do not raise Errno::EINTR
+       
+       Blocking functions should not raise Errno::EINTR to match
+       existing semantics of Ruby IO methods (e.g. IO.select, IO#read,
+       IO#write).  This makes user code easier to read/write.
+       
+       Like th Ruby methods we emulate, we only reacquire the GVL on
+       EINTR to fire signal handlers, but otherwise emulate SA_RESTART
+       semantics.
+       
+       This is a backwards-incompatible API change (but unlikely
+       to break existing code).
+   
+   commit cf0665e57bf4857d4eb4c733527e77545190af59
+   Author: Hleb Valoshka <375gnu@gmail.com>
+   Date:   Tue Jul 3 23:13:49 2012 +0300
+   
+       Add libc names for Debian GNU/kFreeBSD and FreeBSD in tests.
+       
+       Signed-off-by: Eric Wong <normalperson@yhbt.net>
+   
+   commit 5e49637bdc37eb11b9d30863e8ba07a29e2948fe
+   Author: Hleb Valoshka <375gnu@gmail.com>
+   Date:   Tue Jul 3 23:13:48 2012 +0300
+   
+       Fix call to DL::Function.new in tests
+       
+       The 3rd argument of DL::Function.new is ABI type, not a return type.
+       
+       Signed-off-by: Eric Wong <normalperson@yhbt.net>
+   
+   commit 3ae56d273aaa871a328ab5275f5700fa396dad03
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Jun 16 07:41:48 2011 +0000
+   
+       fix compiler warnings, oops
+       
+       CFLAGS=-Wall somehow got disabled in my Ruby installation...
+   
+   commit b5bee9559dadcbe6a5669faac98d3201954c0606
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Tue Jun 14 07:44:18 2011 +0000
+   
+       num2timespec: remove needless double-assignment
+       
+       Oops
+   
+   commit 67d7da847965079367c325b876ed36e7bc5e25c1
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Tue Jun 14 07:21:25 2011 +0000
+   
+       no need to rb_intern("*")
+       
+       '*' works just the same
+   
    commit 90b66d0a4390e7794247d43b49160a50a9028caa
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Tue Mar 1 09:07:05 2011 +0000

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 1.0.0
+GIT_VERSION = 2.0.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.0.0.GIT
+DEF_VER=v2.0.0.GIT
 
 LF='
 '

data/LATEST

@@ -1,17 +1,8 @@
-=== posix_mq 1.0.0 - kinder, gentler message queues / 2011-03-01 09:17 UTC
+=== posix_mq 2.0.0 - a minor API change + FreeBSD fixes / 2012-08-06 21:02 UTC
 
-  There is one backwards-incompatible API change:
+  Blocking methods no longer raise Errno::EINTR (to match
+  Ruby IO semantics, making code easier to work with).
 
-    POSIX_MQ#send returns +true+ on success instead of +nil+
-    for consistency with POSIX_MQ#trysend.
-
-  This release adds the POSIX_MQ#trysend, POSIX_MQ#tryreceive and
-  POSIX_MQ#tryshift interfaces to avoid exceptions on common
-  EAGAIN errors for users of non-blocking queues.
-
-  Bugfixes: non-blocking behavior changes to a shared descriptor
-  in a different process are reflected immediately in the child
-  (this won't fix race conditions in your code, however).
-  Minor bugfixes for posix-mq-rb(1) and quieted warnings for
-  1.9.3dev.
+  There are also many FreeBSD-related fixes thanks to
+  Hleb Valoshka <375gnu@gmail.com> and small code cleanups.
 

data/NEWS

@@ -1,3 +1,11 @@
+=== posix_mq 2.0.0 - a minor API change + FreeBSD fixes / 2012-08-06 21:02 UTC
+
+  Blocking methods no longer raise Errno::EINTR (to match
+  Ruby IO semantics, making code easier to work with).
+
+  There are also many FreeBSD-related fixes thanks to
+  Hleb Valoshka <375gnu@gmail.com> and small code cleanups.
+
 === posix_mq 1.0.0 - kinder, gentler message queues / 2011-03-01 09:17 UTC
 
   There is one backwards-incompatible API change:
@@ -141,8 +149,7 @@
   functionality.  Under FreeBSD, using IO.select on POSIX_MQ
   objects is now possible as it has always been under Linux.
 
-=== posix_mq 0.1.0 - initial release
- / 2010-01-02 11:01 UTC
+=== posix_mq 0.1.0 - initial release / 2010-01-02 11:01 UTC
 
   initial
 

data/ext/posix_mq/extconf.rb

@@ -3,7 +3,6 @@ require "mkmf"
 have_header("sys/select.h")
 have_header("signal.h")
 have_header("mqueue.h") or abort "mqueue.h header missing"
-have_func("__mq_oshandle")
 have_header("pthread.h")
 have_func("rb_str_set_len")
 have_func('rb_thread_blocking_region')
@@ -11,6 +10,7 @@ have_library("m")
 have_library("rt")
 have_library("pthread")
 
+have_func("__mq_oshandle")
 have_func("mq_timedsend")
 have_func("mq_timedreceive")
 create_makefile("posix_mq_ext")

data/ext/posix_mq/posix_mq.c

@@ -66,7 +66,7 @@ static int MQ_IO_CLOSE(struct posix_mq *mq)
 # define PMQ_TRY       (1<<1)
 
 static VALUE cAttr;
-static ID id_new, id_kill, id_fileno, id_mul, id_divmod;
+static ID id_new, id_kill, id_fileno, id_divmod;
 static ID id_flags, id_maxmsg, id_msgsize, id_curmsgs;
 static VALUE sym_r, sym_w, sym_rw;
 static const mqd_t MQD_INVALID = (mqd_t)-1;
@@ -185,7 +185,6 @@ static void num2timespec(struct timespec *ts, VALUE t)
 		ts->tv_sec = (time_t)f;
 		if (f != ts->tv_sec)
 			rb_raise(rb_eRangeError, "%f out of range", val);
-		ts->tv_sec = (time_t)f;
 		}
 		break;
 	default: {
@@ -196,7 +195,7 @@ static void num2timespec(struct timespec *ts, VALUE t)
 
 		ts->tv_sec = NUM2TIMET(rb_ary_entry(ary, 0));
 		f = rb_ary_entry(ary, 1);
-		f = rb_funcall(f, id_mul, 1, INT2FIX(1000000000));
+		f = rb_funcall(f, '*', 1, INT2FIX(1000000000));
 		ts->tv_nsec = NUM2LONG(f);
 		}
 	}
@@ -469,9 +468,9 @@ static VALUE init(int argc, VALUE *argv, VALUE self)
  */
 static VALUE s_unlink(VALUE self, VALUE name)
 {
-	mqd_t rv = mq_unlink(StringValueCStr(name));
+	int rv = mq_unlink(StringValueCStr(name));
 
-	if (rv == MQD_INVALID)
+	if (rv == -1)
 		rb_sys_fail("mq_unlink");
 
 	return INT2NUM(1);
@@ -490,12 +489,12 @@ static VALUE s_unlink(VALUE self, VALUE name)
 static VALUE _unlink(VALUE self)
 {
 	struct posix_mq *mq = get(self, 0);
-	mqd_t rv;
+	int rv;
 
 	assert(TYPE(mq->name) == T_STRING && "mq->name is not a string");
 
 	rv = mq_unlink(RSTRING_PTR(mq->name));
-	if (rv == MQD_INVALID)
+	if (rv == -1)
 		rb_sys_fail("mq_unlink");
 
 	return self;
@@ -533,7 +532,7 @@ static VALUE _send(int sflags, int argc, VALUE *argv, VALUE self)
 	struct posix_mq *mq = get(self, 1);
 	struct rw_args x;
 	VALUE buffer, prio, timeout;
-	mqd_t rv;
+	int rv;
 	struct timespec expire;
 
 	rb_scan_args(argc, argv, "12", &buffer, &prio, &timeout);
@@ -543,8 +542,11 @@ static VALUE _send(int sflags, int argc, VALUE *argv, VALUE self)
 	x.timeout = convert_timeout(&expire, timeout);
 	x.msg_prio = NIL_P(prio) ? 0 : NUM2UINT(prio);
 
-	rv = (mqd_t)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
-	if (rv == MQD_INVALID) {
+retry:
+	rv = (int)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
+	if (rv == -1) {
+		if (errno == EINTR)
+			goto retry;
 		if (errno == EAGAIN && (sflags & PMQ_TRY))
 			return Qfalse;
 		rb_sys_fail("mq_send");
@@ -568,16 +570,20 @@ static VALUE send0(VALUE self, VALUE buffer)
 {
 	struct posix_mq *mq = get(self, 1);
 	struct rw_args x;
-	mqd_t rv;
+	int rv;
 
 	setup_send_buffer(&x, buffer);
 	x.des = mq->des;
 	x.timeout = NULL;
 	x.msg_prio = 0;
 
-	rv = (mqd_t)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
-	if (rv == MQD_INVALID)
+retry:
+	rv = (int)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
+	if (rv == -1) {
+		if (errno == EINTR)
+			goto retry;
 		rb_sys_fail("mq_send");
+	}
 
 	return self;
 }
@@ -679,8 +685,11 @@ static VALUE _receive(int rflags, int argc, VALUE *argv, VALUE self)
 	x.msg_len = (size_t)mq->attr.mq_msgsize;
 	x.des = mq->des;
 
+retry:
 	r = (ssize_t)rb_thread_blocking_region(xrecv, &x, RUBY_UBF_IO, 0);
 	if (r < 0) {
+		if (errno == EINTR)
+			goto retry;
 		if (errno == EAGAIN && (rflags & PMQ_TRY))
 			return Qnil;
 		rb_sys_fail("mq_receive");
@@ -704,7 +713,6 @@ static VALUE _receive(int rflags, int argc, VALUE *argv, VALUE self)
 static VALUE getattr(VALUE self)
 {
 	struct posix_mq *mq = get(self, 1);
-	VALUE astruct;
 
 	if (mq_getattr(mq->des, &mq->attr) < 0)
 		rb_sys_fail("mq_getattr");
@@ -830,18 +838,31 @@ static void thread_notify_fd(union sigval sv)
 
 static void my_mq_notify(mqd_t des, struct sigevent *not)
 {
-	mqd_t rv = mq_notify(des, not);
+	int rv = mq_notify(des, not);
 
-	if (rv == MQD_INVALID) {
+	if (rv == -1) {
 		if (errno == ENOMEM) {
 			rb_gc();
 			rv = mq_notify(des, not);
 		}
-		if (rv == MQD_INVALID)
+		if (rv == -1)
 			rb_sys_fail("mq_notify");
 	}
 }
 
+static void lower_stack_size(pthread_attr_t *attr)
+{
+/* some OSes have ridiculously small stack sizes */
+#ifdef PTHREAD_STACK_MIN
+	size_t stack_size = PTHREAD_STACK_MIN;
+	size_t min_size = 4096;
+
+	if (stack_size < min_size)
+		stack_size = min_size;
+	pthread_attr_setstacksize(attr, stack_size);
+#endif
+}
+
 /* :nodoc: */
 static VALUE setnotify_exec(VALUE self, VALUE io, VALUE thr)
 {
@@ -856,10 +877,7 @@ static VALUE setnotify_exec(VALUE self, VALUE io, VALUE thr)
 	errno = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 	if (errno) rb_sys_fail("pthread_attr_setdetachstate");
 
-#ifdef PTHREAD_STACK_MIN
-	(void)pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
-#endif
-
+	lower_stack_size(&attr);
 	not.sigev_notify = SIGEV_THREAD;
 	not.sigev_notify_function = thread_notify_fd;
 	not.sigev_notify_attributes = &attr;
@@ -1001,7 +1019,7 @@ static VALUE setnonblock(VALUE self, VALUE nb)
  */
 static VALUE trysend(int argc, VALUE *argv, VALUE self)
 {
-	_send(PMQ_TRY, argc, argv, self);
+	return _send(PMQ_TRY, argc, argv, self);
 }
 
 /*
@@ -1086,7 +1104,6 @@ void Init_posix_mq_ext(void)
 	id_new = rb_intern("new");
 	id_kill = rb_intern("kill");
 	id_fileno = rb_intern("fileno");
-	id_mul = rb_intern("*");
 	id_divmod = rb_intern("divmod");
 	id_flags = rb_intern("flags");
 	id_maxmsg = rb_intern("maxmsg");

data/test/test_posix_mq.rb

@@ -73,8 +73,8 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     t0 = Time.now
     maybe_timeout { @mq.receive "", interval } or return
     elapsed = Time.now - t0
-    assert elapsed > interval, elapsed.inspect
-    assert elapsed < 0.02, elapsed.inspect
+    assert_operator elapsed, :>, interval, elapsed.inspect
+    assert_operator elapsed, :<, 0.04, elapsed.inspect
   end
 
   def test_timed_receive_divmod
@@ -87,8 +87,8 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     t0 = Time.now
     maybe_timeout { @mq.receive "", interval } or return
     elapsed = Time.now - t0
-    assert elapsed >= 0.01, elapsed.inspect
-    assert elapsed <= 0.02, elapsed.inspect
+    assert_operator elapsed, :>=, 0.01, elapsed.inspect
+    assert_operator elapsed, :<=, 0.04, elapsed.inspect
   end
 
   def test_timed_receive_fixnum
@@ -104,13 +104,13 @@ class Test_POSIX_MQ < Test::Unit::TestCase
 
   def test_alarm_signal_safe
     libc = alarm = nil
-    libcs = %w(libc.so.6 /usr/lib/libc.sl)
+    libcs = %w(libc.so.6 libc.so.0.1 libc.so.7 /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)
+        alarm = DL::Function.new(alarm, [DL::TYPE_INT])
       else
         alarm = libc["alarm", "II"]
       end
@@ -118,16 +118,18 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     end
     alarm or return warn "alarm() not found in #{libcs.inspect}"
     alarms = 0
-    trap("ALRM") { alarms += 1 }
+    trap("ALRM") do
+      alarms += 1
+      Thread.new { @mq.send("HI") }
+    end
     interval = 1
     alarm.call interval
     @mq = POSIX_MQ.new(@path, :rw)
     assert ! @mq.nonblock?
     t0 = Time.now
-    a = nil
-    assert_raises(Errno::EINTR) { a = @mq.receive }
+    a = @mq.receive
     elapsed = Time.now - t0
-    assert_nil a
+    assert_equal(["HI", 0], a)
     assert elapsed >= interval, elapsed.inspect
     assert elapsed < 1.10, elapsed.inspect
     assert_equal 1, alarms
@@ -255,7 +257,7 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     assert_nil IO.select([rd], nil, nil, 0.1)
     ensure
       trap(:USR1, orig)
-  end
+  end if POSIX_MQ.method_defined?(:to_io)
 
   def test_notify_none
     @mq = POSIX_MQ.new @path, IO::CREAT|IO::RDWR, 0666

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: posix_mq
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
-  - 1
+  - 2
   - 0
   - 0
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Ruby POSIX MQ hackers
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +00:00
-default_executable: 
+date: 2012-08-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wrongdoc
@@ -78,7 +77,6 @@ files:
 - posix_mq.gemspec
 - setup.rb
 - test/test_posix_mq.rb
-has_rdoc: true
 homepage: http://bogomips.org/ruby_posix_mq/
 licenses: []
 
@@ -111,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: qrp
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: POSIX Message Queues for Ruby