sysvmq 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d566493d3060b35ef5d50756f2222e02e9e0e1ac
-  data.tar.gz: 65f7630c46cad73ef1221d8997c37ad288376653
+  metadata.gz: 9b62bd6b368c988aa1821158c4a68eade4d2dd28
+  data.tar.gz: 1722201de77944fd64324927a0c681f08b700596
 SHA512:
-  metadata.gz: 61deff9290193b8fd854d3218e85a6570d4864cc8019995834f4d9b869fbe6f34e88c194fd618864417aa61d186866dd673b4435acef5281afd5670e0cf3cbc7
-  data.tar.gz: ff8ddcf9e22ffca17957d1d5109de66afe5c86f51c9fca5e46fc2461e2c5cfc097f55c50a4c75cc9098adc241876fa585ecec8c4be457fd1763cf2fd2197d5db
+  metadata.gz: 6810448b3b02f863bb4a0989d0b45b36693ecdb3ef68252a2beb5578367741910b5e7193d61307d65d7fe252e8c5dcdfe73995a4eb659ad2ba399f1f22ba2bec
+  data.tar.gz: e986084ee94f00982699a93cc67063a58d7f43db3c2e15b4d4d36bcd506cccfc25e2b386b77c49d6f92ff7f5fb4e3be1426b076296c9553e017fe5c88f2adf4a

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - 1.9.3
   - 2.0.0
   - 2.1.0

data/README.md

@@ -18,7 +18,7 @@ Add `sysvm` to your Gemfile.
 
 `gem 'sysvmq'`
 
-Currently known to work on Linux and OS X for MRI >= 2.0.
+Currently known to work on Linux and OS X for MRI >= 1.9
 
 ## Usage
 
@@ -40,6 +40,29 @@ ensure
 mq.destroy
 ```
 
+## Proc settings
+
+System V queues are limited by default to a maximum of 16 message queues, a maximum of 8KB per message, and a maximum of 16KB for the total size of all messages in a queue.
+
+To increase (or decrease) these limits, either run:
+
+```sh
+sysctl -w kernel.msgmni=32
+sysctl -w kernel.msgmax=1000000
+sysctl -w kernel.msgmnb=2000000
+```
+
+or write to /etc/sysctl.conf:
+
+```sh
+echo 'kernel.msgmni=32' >> /etc/sysctl.conf # maximum number of message queues
+echo 'kernel.msgmax=1000000' >> /etc/sysctl.conf # maximum number of bytes per message
+echo 'kernel.msgmnb=2000000' >> /etc/sysctl.conf # maximum total size of all messages in a queue
+sysctl -p
+```
+
+See http://man7.org/linux/man-pages/man5/proc.5.html for more information.
+
 ## Todo
 
 * Explain messages types

data/ext/extconf.rb

@@ -1,5 +1,10 @@
 require 'mkmf'
+
 have_header 'sys/ipc.h'
 have_header 'sys/msg.h'
 have_header 'sys/types.h'
+
+have_func 'rb_thread_blocking_region'
+have_func 'rb_thread_call_without_gvl'
+
 create_makefile 'sysvmq'

data/ext/sysvmq.c

@@ -1,6 +1,5 @@
 #include <ruby.h>
 #include <ruby/util.h>
-#include <ruby/thread.h>
 #include <ruby/io.h>
 
 #include <sys/types.h>
@@ -15,6 +14,20 @@
 
 #define UNINITIALIZED_ERROR -2
 
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) && defined(HAVE_RUBY_THREAD_H)
+// 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)
+// 1.9
+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))
+
+#endif
+
 // This is the buffer passed to msg{rcv,snd,ctl}(2)
 typedef struct {
   long mtype;
@@ -220,7 +233,7 @@ sysvmq_receive(int argc, VALUE *argv, VALUE self)
     // We unlock the GVL waiting for the call so other threads (e.g. signal
     // handling) can continue to work. Sets `length` on `blocking` with the size
     // of the message returned.
-    while (rb_thread_call_without_gvl(sysvmq_maybe_blocking_receive, &blocking, RUBY_UBF_IO, NULL) == NULL
+    while (WITHOUT_GVL(sysvmq_maybe_blocking_receive, &blocking, RUBY_UBF_IO, NULL) == NULL
             && blocking.error < 0) {
       if (errno == EINTR || blocking.error == UNINITIALIZED_ERROR) {
         continue;
@@ -308,7 +321,7 @@ sysvmq_send(int argc, VALUE *argv, VALUE self)
     // msgsnd(2) can block waiting for a message, if IPC_NOWAIT is not passed.
     // We unlock the GVL waiting for the call so other threads (e.g. signal
     // handling) can continue to work.
-    while (rb_thread_call_without_gvl(sysvmq_maybe_blocking_send, &blocking, RUBY_UBF_IO, NULL) == NULL
+    while (WITHOUT_GVL(sysvmq_maybe_blocking_send, &blocking, RUBY_UBF_IO, NULL) == NULL
             && blocking.error < 0) {
       if (errno == EINTR || blocking.error == UNINITIALIZED_ERROR) {
         continue;

data/sysvmq.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "sysvmq"
-  spec.version       = '0.2.0'
+  spec.version       = '0.2.1'
   spec.authors       = ["Simon Eskildsen"]
   spec.email         = ["sirup@sirupsen.com"]
   spec.summary       = %q{Ruby wrapper for SysV Message Queues}

data/test/sysv_mq_test.rb

@@ -1,3 +1,4 @@
+#coding: utf-8
 require_relative 'test_helper'
 
 class SysVMQTest < MiniTest::Unit::TestCase
@@ -52,7 +53,7 @@ class SysVMQTest < MiniTest::Unit::TestCase
   def test_sending_utf_should_report_correct_size_queue
     message = "ø" * 5
     @mq.send message
-    assert_equal "ø".bytes.size * 5, @mq.stats[:size]
+    assert_equal "ø".bytes.to_a.size * 5, @mq.stats[:size]
   end
 
   def test_receive_on_empty_queue_raises_enomsg_if_ipc_nowait

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sysvmq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Simon Eskildsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler