posix_mq 2.0.0 → 2.1.0

data/ChangeLog

@@ -1,5 +1,50 @@
 ChangeLog from http://bogomips.org/ruby_posix_mq.git
 
+   commit b14ae708a9e53b1f8a274aa78a610b2f776847f5
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Sat Feb 15 13:34:12 2014 +0000
+   
+       posix_mq 2.1.0 - ensure compatibility with future Rubies
+       
+       * avoid deprecated rb_thread_blocking_region in Ruby 2.0/2.1
+       * prepare for rb_thread_blocking_region removal
+   
+   commit b77f930e712812024c3d379395c2879b312336f8
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Sat Feb 15 13:13:06 2014 +0000
+   
+       avoid deprecated rb_thread_blocking_region in Ruby 2.0/2.1
+       
+       This will be removed in Ruby 2.2, so avoid the deprecation warning.
+   
+   commit a2a00d4ba8d16838e613cbecfad98cb188929e14
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Sun Feb 9 00:40:11 2014 +0000
+   
+       prepare for rb_thread_blocking_region removal
+       
+       It'll be OK to use rb_thread_call_without_gvl when
+       rb_thread_blocking_region is not detectable at all.
+       We still use rb_thread_blocking_region for Ruby 2.0-2.1 because
+       rb_thread_call_without_gvl was detectable in 1.9.3, but not
+       usable as an internal symbol.
+       
+       ref: https://bugs.ruby-lang.org/issues/9502
+   
+   commit 5f620f4435afcdc2304f53c74ff8b65fc4f04b0d
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Mon Sep 30 18:24:33 2013 +0000
+   
+       Rakefile: kill raa_update task
+       
+       RAA is dead.
+   
+   commit 0e9e6c54bb25eadcf955a7abb0b60e97388d8290
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Mon Aug 6 21:06:38 2012 +0000
+   
+       pkg.mk: update
+   
    commit 86f36a2d88aca8fdef45fd2a757f98a593935ba9
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Mon Aug 6 20:58:04 2012 +0000

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 2.0.0
+GIT_VERSION = 2.1.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -8,7 +8,6 @@ doc:: man-rdoc
 include pkg.mk
 ifneq ($(VERSION),)
 release::
-	$(RAKE) raa_update VERSION=$(VERSION)
 	$(RAKE) publish_news VERSION=$(VERSION)
 endif
 

data/LATEST

@@ -1,8 +1,5 @@
-=== posix_mq 2.0.0 - a minor API change + FreeBSD fixes / 2012-08-06 21:02 UTC
+=== posix_mq 2.1.0 - ensure compatibility with future Rubies / 2014-02-15 13:35 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.
+  * avoid deprecated rb_thread_blocking_region in Ruby 2.0/2.1
+  * prepare for rb_thread_blocking_region removal
 

data/NEWS

@@ -1,3 +1,8 @@
+=== posix_mq 2.1.0 - ensure compatibility with future Rubies / 2014-02-15 13:35 UTC
+
+  * avoid deprecated rb_thread_blocking_region in Ruby 2.0/2.1
+  * prepare for rb_thread_blocking_region removal
+
 === 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

data/Rakefile

@@ -31,41 +31,3 @@ task :publish_news do
   rf.login
   rf.post_news('qrp', subject, body)
 end
-
-desc "post to RAA"
-task :raa_update do
-  require 'rubygems'
-  require 'net/http'
-  require 'net/netrc'
-  rc = Net::Netrc.locate('posix_mq-raa') or abort "~/.netrc not found"
-  password = rc.password
-
-  s = Gem::Specification.load('posix_mq.gemspec')
-  desc = [ s.description.strip ]
-  desc << ""
-  desc << "* #{s.email}"
-  desc << "* #{git_url}"
-  desc << "* #{cgit_url}"
-  desc = desc.join("\n")
-  uri = URI.parse('http://raa.ruby-lang.org/regist.rhtml')
-  form = {
-    :name => s.name,
-    :short_description => s.summary,
-    :version => s.version.to_s,
-    :status => 'experimental',
-    :owner => s.authors.first,
-    :email => s.email,
-    :category_major => 'Library',
-    :category_minor => 'System',
-    :url => s.homepage,
-    :download => 'http://rubyforge.org/frs/?group_id=5626',
-    :license => 'LGPL', # LGPLv3, actually, but RAA is ancient...
-    :description_style => 'Plain',
-    :description => desc,
-    :pass => password,
-    :submit => 'Update',
-  }
-  res = Net::HTTP.post_form(uri, form)
-  p res
-  puts res.body
-end

data/ext/posix_mq/extconf.rb

@@ -6,6 +6,7 @@ have_header("mqueue.h") or abort "mqueue.h header missing"
 have_header("pthread.h")
 have_func("rb_str_set_len")
 have_func('rb_thread_blocking_region')
+have_func('rb_thread_call_without_gvl')
 have_library("m")
 have_library("rt")
 have_library("pthread")

data/ext/posix_mq/posix_mq.c

@@ -95,18 +95,26 @@ static void rb_18_str_set_len(VALUE str, long len)
 #define rb_str_set_len rb_18_str_set_len
 #endif /* !defined(HAVE_RB_STR_SET_LEN) */
 
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) && defined(HAVE_RUBY_THREAD_H)
+/* Ruby 2.0+ */
+#  include <ruby/thread.h>
+#  define WITHOUT_GVL(fn,a,ubf,b) \
+        rb_thread_call_without_gvl((fn),(a),(ubf),(b))
+#elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
+typedef VALUE (*my_blocking_fn_t)(void*);
+#  define WITHOUT_GVL(fn,a,ubf,b) \
+	rb_thread_blocking_region((my_blocking_fn_t)(fn),(a),(ubf),(b))
+
+#else /* Ruby 1.8 */
 /* partial emulation of the 1.9 rb_thread_blocking_region under 1.8 */
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
 #  include <rubysig.h>
 #  define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
 typedef void rb_unblock_function_t(void *);
-typedef VALUE rb_blocking_function_t(void *);
-static VALUE
-rb_thread_blocking_region(
-	rb_blocking_function_t *func, void *data1,
-	rb_unblock_function_t *ubf, void *data2)
+typedef void * rb_blocking_function_t(void *);
+static void * WITHOUT_GVL(rb_blocking_function_t *func, void *data1,
+			rb_unblock_function_t *ubf, void *data2)
 {
-	VALUE rv;
+	void *rv;
 
 	assert(RUBY_UBF_IO == ubf && "RUBY_UBF_IO required for emulation");
 
@@ -120,6 +128,7 @@ rb_thread_blocking_region(
 
 /* used to pass arguments to mq_open inside blocking region */
 struct open_args {
+	mqd_t des;
 	int argc;
 	const char *name;
 	int oflags;
@@ -130,6 +139,10 @@ struct open_args {
 /* used to pass arguments to mq_send/mq_receive inside blocking region */
 struct rw_args {
 	mqd_t des;
+	union {
+		ssize_t received;
+		int retval;
+	};
 	char *msg_ptr;
 	size_t msg_len;
 	unsigned msg_prio;
@@ -229,43 +242,44 @@ static struct timespec *convert_timeout(struct timespec *dest, VALUE t)
 }
 
 /* (may) run without GVL */
-static VALUE xopen(void *ptr)
+static void * xopen(void *ptr)
 {
 	struct open_args *x = ptr;
-	mqd_t rv;
 
 	switch (x->argc) {
-	case 2: rv = mq_open(x->name, x->oflags); break;
-	case 3: rv = mq_open(x->name, x->oflags, x->mode, NULL); break;
-	case 4: rv = mq_open(x->name, x->oflags, x->mode, &x->attr); break;
-	default: rv = MQD_INVALID;
+	case 2: x->des = mq_open(x->name, x->oflags); break;
+	case 3: x->des = mq_open(x->name, x->oflags, x->mode, NULL); break;
+	case 4: x->des = mq_open(x->name, x->oflags, x->mode, &x->attr); break;
+	default: x->des = MQD_INVALID;
 	}
 
-	return (VALUE)rv;
+	return NULL;
 }
 
 /* runs without GVL */
-static VALUE xsend(void *ptr)
+static void *xsend(void *ptr)
 {
 	struct rw_args *x = ptr;
 
-	if (x->timeout)
-		return (VALUE)mq_timedsend(x->des, x->msg_ptr, x->msg_len,
-		                           x->msg_prio, x->timeout);
+	x->retval = x->timeout ?
+		mq_timedsend(x->des, x->msg_ptr, x->msg_len,
+		             x->msg_prio, x->timeout) :
+		mq_send(x->des, x->msg_ptr, x->msg_len, x->msg_prio);
 
-	return (VALUE)mq_send(x->des, x->msg_ptr, x->msg_len, x->msg_prio);
+	return NULL;
 }
 
 /* runs without GVL */
-static VALUE xrecv(void *ptr)
+static void * xrecv(void *ptr)
 {
 	struct rw_args *x = ptr;
 
-	if (x->timeout)
-		return (VALUE)mq_timedreceive(x->des, x->msg_ptr, x->msg_len,
-		                              &x->msg_prio, x->timeout);
+	x->received = x->timeout ?
+		mq_timedreceive(x->des, x->msg_ptr, x->msg_len,
+		                &x->msg_prio, x->timeout) :
+		mq_receive(x->des, x->msg_ptr, x->msg_len, &x->msg_prio);
 
-	return (VALUE)mq_receive(x->des, x->msg_ptr, x->msg_len, &x->msg_prio);
+	return NULL;
 }
 
 /* called by GC */
@@ -438,7 +452,8 @@ static VALUE init(int argc, VALUE *argv, VALUE self)
 		check_struct_type(attr);
 	}
 
-	mq->des = (mqd_t)xopen(&x);
+	(void)xopen(&x);
+	mq->des = x.des;
 	if (mq->des == MQD_INVALID) {
 		switch (errno) {
 		case ENOMEM:
@@ -446,7 +461,8 @@ static VALUE init(int argc, VALUE *argv, VALUE self)
 		case ENFILE:
 		case ENOSPC:
 			rb_gc();
-			mq->des = (mqd_t)xopen(&x);
+			(void)xopen(&x);
+			mq->des = x.des;
 		}
 		if (mq->des == MQD_INVALID)
 			rb_sys_fail("mq_open");
@@ -532,7 +548,6 @@ 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;
-	int rv;
 	struct timespec expire;
 
 	rb_scan_args(argc, argv, "12", &buffer, &prio, &timeout);
@@ -543,8 +558,8 @@ static VALUE _send(int sflags, int argc, VALUE *argv, VALUE self)
 	x.msg_prio = NIL_P(prio) ? 0 : NUM2UINT(prio);
 
 retry:
-	rv = (int)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
-	if (rv == -1) {
+	WITHOUT_GVL(xsend, &x, RUBY_UBF_IO, 0);
+	if (x.retval == -1) {
 		if (errno == EINTR)
 			goto retry;
 		if (errno == EAGAIN && (sflags & PMQ_TRY))
@@ -570,7 +585,6 @@ static VALUE send0(VALUE self, VALUE buffer)
 {
 	struct posix_mq *mq = get(self, 1);
 	struct rw_args x;
-	int rv;
 
 	setup_send_buffer(&x, buffer);
 	x.des = mq->des;
@@ -578,8 +592,8 @@ static VALUE send0(VALUE self, VALUE buffer)
 	x.msg_prio = 0;
 
 retry:
-	rv = (int)rb_thread_blocking_region(xsend, &x, RUBY_UBF_IO, 0);
-	if (rv == -1) {
+	WITHOUT_GVL(xsend, &x, RUBY_UBF_IO, 0);
+	if (x.retval == -1) {
 		if (errno == EINTR)
 			goto retry;
 		rb_sys_fail("mq_send");
@@ -662,7 +676,6 @@ static VALUE _receive(int rflags, int argc, VALUE *argv, VALUE self)
 	struct posix_mq *mq = get(self, 1);
 	struct rw_args x;
 	VALUE buffer, timeout;
-	ssize_t r;
 	struct timespec expire;
 
 	if (mq->attr.mq_msgsize < 0) {
@@ -686,8 +699,8 @@ static VALUE _receive(int rflags, int argc, VALUE *argv, VALUE self)
 	x.des = mq->des;
 
 retry:
-	r = (ssize_t)rb_thread_blocking_region(xrecv, &x, RUBY_UBF_IO, 0);
-	if (r < 0) {
+	WITHOUT_GVL(xrecv, &x, RUBY_UBF_IO, 0);
+	if (x.received < 0) {
 		if (errno == EINTR)
 			goto retry;
 		if (errno == EAGAIN && (rflags & PMQ_TRY))
@@ -695,7 +708,7 @@ retry:
 		rb_sys_fail("mq_receive");
 	}
 
-	rb_str_set_len(buffer, r);
+	rb_str_set_len(buffer, x.received);
 
 	if (rflags & PMQ_WANTARRAY)
 		return rb_ary_new3(2, buffer, UINT2NUM(x.msg_prio));

data/pkg.mk

@@ -69,7 +69,7 @@ doc:: .document .wrongdoc.yml $(pkg_extra)
 	$(RM) -r doc
 	$(WRONGDOC) all
 	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document) doc/
+	install -m644 $(shell LC_ALL=C grep '^[A-Z]' .document) doc/
 
 ifneq ($(VERSION),)
 pkggem := pkg/$(rfpackage)-$(VERSION).gem
@@ -167,5 +167,9 @@ doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
 doc_gz:
 	for i in $(docs); do \
 	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+check-warnings:
+	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
+	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
 
 .PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
+.PHONY: check-warnings

metadata

@@ -1,47 +1,54 @@
---- !ruby/object:Gem::Specification 
-name: posix_mq
-version: !ruby/object:Gem::Version 
-  hash: 15
+--- !ruby/object:Gem::Specification
+name: !binary |-
+  cG9zaXhfbXE=
+version: !ruby/object:Gem::Version
+  version: 2.1.0
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 0
-  version: 2.0.0
 platform: ruby
-authors: 
-- Ruby POSIX MQ hackers
+authors:
+- !binary |-
+  UnVieSBQT1NJWCBNUSBoYWNrZXJz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: wrongdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2014-02-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: !binary |-
+    d3Jvbmdkb2M=
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS41
   type: :development
-  version_requirements: *id001
-description: |-
-  POSIX message queues allow local processes to exchange data in the form
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS41
+description: ! 'POSIX message queues allow local processes to exchange data in the
+  form
+
   of messages.  This API is distinct from that provided by System V
-  message queues, but provides similar functionality.
-email: ruby.posix.mq@librelist.com
-executables: 
-- posix-mq-rb
-extensions: 
-- ext/posix_mq/extconf.rb
-extra_rdoc_files: 
+
+  message queues, but provides similar functionality.'
+email: !binary |-
+  cnVieS5wb3NpeC5tcUBsaWJyZWxpc3QuY29t
+executables:
+- !binary |-
+  cG9zaXgtbXEtcmI=
+extensions:
+- !binary |-
+  ZXh0L3Bvc2l4X21xL2V4dGNvbmYucmI=
+extra_rdoc_files:
 - README
 - LICENSE
 - NEWS
@@ -49,7 +56,7 @@ extra_rdoc_files:
 - lib/posix_mq.rb
 - ext/posix_mq/posix_mq.c
 - LATEST
-files: 
+files:
 - .document
 - .gitignore
 - .manifest
@@ -79,39 +86,32 @@ files:
 - test/test_posix_mq.rb
 homepage: http://bogomips.org/ruby_posix_mq/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -t
 - posix_mq - POSIX Message Queues for Ruby
 - -W
 - http://bogomips.org/ruby_posix_mq.git/tree/%s
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: qrp
-rubygems_version: 1.8.24
+rubyforge_project: !binary |-
+  cXJw
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: POSIX Message Queues for Ruby
-test_files: 
+test_files:
 - test/test_posix_mq.rb