semian 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 569ed1de876236ee7b8aee71e9325fd609f6a65c
-  data.tar.gz: 1308dfeea5b5f554d97397a5eb79bfca484d6854
+  metadata.gz: 85e7688d4e7394755e61fe1223f33646a9245f69
+  data.tar.gz: fc55fda5e5799267fc81f3fed586117f62762dc0
 SHA512:
-  metadata.gz: 1e4e89901bc8654a0003e2a097984520508cf4143735d2d8dd35c0c9112ad292d0ca044f7471e54947a2ec974d07322719174d15226e7ce147140c63cac597c7
-  data.tar.gz: ecf5a1656a9bc1f51111eb9274ebb73844e40161e67894f1abe57dfbd59364e2007d7b5c5b6c5de652b6063d597741f372895b6251fef95316d790c4560022ca
+  metadata.gz: f04b5bc23920ab15e8fb1a73890a66a7ce4719e8286eff31170506460680853dfc302cfc4683eeb33c03cf168b72f7ef9f235a16a66ace28456026ddd60e00bb
+  data.tar.gz: 2eed26a9736cd3114b172bce7ecbd7cfa77d6ef8601acd78ba18ea7c166c6b2fa7103e2cd78b74d9f30b2c75a3229934a198dbf8881529b452ba6b03e10cb75a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    semian (0.0.1)
+    semian (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/ext/semian/semian.c

@@ -23,7 +23,7 @@ typedef VALUE (*my_blocking_fn_t)(void*);
 #endif
 
 static ID id_timeout;
-static VALUE eTimeout;
+static VALUE eSyscall, eTimeout;
 
 typedef struct {
   int sem_id;
@@ -48,6 +48,12 @@ ms_to_timespec(long ms, struct timespec *ts)
   ts->tv_nsec = (ms % 1000) * 1000000;
 }
 
+static void
+raise_semian_syscall_error(const char *syscall, int error_num)
+{
+  rb_raise(eSyscall, "%s failed, errno: %d (%s)", syscall, error_num, strerror(error_num));
+}
+
 static void
 semian_resource_mark(void *ptr)
 {
@@ -128,12 +134,12 @@ semian_resource_initialize(VALUE self, VALUE id, VALUE tickets, VALUE default_ti
 
   res->sem_id = semget(key, 1, flags);
   if (res->sem_id == -1) {
-    rb_sys_fail("semget");
+    raise_semian_syscall_error("semget()", errno);
   }
 
   if (FIX2LONG(tickets) != 0
       && semctl(res->sem_id, 0, SETVAL, FIX2LONG(tickets)) == -1) {
-    rb_sys_fail("semctl");
+    raise_semian_syscall_error("semctl()", errno);
   }
 
   return self;
@@ -144,7 +150,7 @@ cleanup_semian_resource_acquire(VALUE self)
 {
   semian_resource_t *res = NULL;
   TypedData_Get_Struct(self, semian_resource_t, &semian_resource_type, res);
-  struct sembuf buf = { 0, 1, 0 };
+  struct sembuf buf = { 0, 1, SEM_UNDO };
   if (semop(res->sem_id, &buf, 1) == -1) {
     res->error = errno;
   }
@@ -195,7 +201,7 @@ semian_resource_acquire(int argc, VALUE *argv, VALUE self)
     if (res.error == EAGAIN) {
       rb_raise(eTimeout, "timed out waiting for resource '%s'", res.name);
     } else {
-      rb_raise(rb_eRuntimeError, "semop() error: %s (%d)", strerror(res.error), res.error);
+      raise_semian_syscall_error("semop()", res.error);
     }
   }
 
@@ -209,7 +215,7 @@ semian_resource_destroy(VALUE self)
 
   TypedData_Get_Struct(self, semian_resource_t, &semian_resource_type, res);
   if (semctl(res->sem_id, 0, IPC_RMID) == -1) {
-    rb_sys_fail("semctl");
+    raise_semian_syscall_error("semctl()", errno);
   }
 
   return Qtrue;
@@ -224,7 +230,7 @@ semian_resource_count(VALUE self)
   TypedData_Get_Struct(self, semian_resource_t, &semian_resource_type, res);
   ret = semctl(res->sem_id, 0, GETVAL);
   if (ret == -1) {
-    rb_raise(rb_eRuntimeError, "semctl() error: %s (%d)", strerror(errno), errno);
+    raise_semian_syscall_error("semctl()", errno);
   }
 
   return LONG2FIX(ret);
@@ -232,11 +238,13 @@ semian_resource_count(VALUE self)
 
 void Init_semian()
 {
-  VALUE cSemian, cResource;
+  VALUE cSemian, cResource, eBaseError;
 
   cSemian = rb_define_class("Semian", rb_cObject);
   cResource = rb_define_class("Resource", cSemian);
-  eTimeout = rb_define_class_under(cSemian, "Timeout", rb_eStandardError);
+  eBaseError = rb_define_class_under(cSemian, "BaseError", rb_eStandardError);
+  eSyscall = rb_define_class_under(cSemian, "SyscallError", eBaseError);
+  eTimeout = rb_define_class_under(cSemian, "TimeoutError", eBaseError);
 
   rb_define_alloc_func(cResource, semian_resource_alloc);
   rb_define_method(cResource, "initialize", semian_resource_initialize, 3);

data/lib/semian.rb

@@ -16,3 +16,5 @@ class Semian
     end
   end
 end
+
+require 'semian/version'

data/lib/semian/version.rb

@@ -0,0 +1,3 @@
+class Semian
+  VERSION = '0.0.2'
+end

data/semian.gemspec

@@ -1,6 +1,10 @@
+$:.unshift File.expand_path("../lib", __FILE__)
+
+require 'semian/version'
+
 Gem::Specification.new do |s|
   s.name = 'semian'
-  s.version = '0.0.1'
+  s.version = Semian::VERSION
   s.summary = 'SysV semaphore based library for shared resource control'
   s.description = <<-DOC
     A Ruby C extention that is used to control access to shared resources

data/test/test_semian.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 
 class TestSemian < Test::Unit::TestCase
   def setup
-    Semian[:testing].destroy rescue RuntimeError
+    Semian[:testing].destroy rescue Semian::BaseError
   end
 
   def test_register_invalid_args
@@ -22,7 +22,7 @@ class TestSemian < Test::Unit::TestCase
   end
 
   def test_register_with_no_tickets_raises
-    assert_raises Errno::ENOENT do
+    assert_raises Semian::SyscallError do
       Semian.register :testing
     end
   end
@@ -50,7 +50,7 @@ class TestSemian < Test::Unit::TestCase
     t = Thread.start do
       m.synchronize do
         cond.wait_until { acquired }
-        assert_raises Semian::Timeout do
+        assert_raises Semian::TimeoutError do
           Semian[:testing].acquire { refute true }
         end
       end
@@ -101,7 +101,7 @@ class TestSemian < Test::Unit::TestCase
       pid = fork do
         Semian.register :testing, timeout: 0.5
         Semian[:testing].acquire do
-          assert_raises Semian::Timeout do
+          assert_raises Semian::TimeoutError do
             Semian[:testing].acquire {  }
           end
         end
@@ -129,7 +129,7 @@ class TestSemian < Test::Unit::TestCase
       end
 
       sleep 0.1 until File.exists?(path)
-      assert_raises Semian::Timeout do
+      assert_raises Semian::TimeoutError do
         Semian[:testing].acquire {}
       end
 
@@ -155,10 +155,24 @@ class TestSemian < Test::Unit::TestCase
     assert acquired
   end
 
+  def test_sem_undo
+    Semian.register :testing, tickets: 1
+
+    # Ensure we don't hit ERANGE errors caused by lack of SEM_UNDO on semop* calls
+    # by doing an acquire > SEMVMX (32767) times:
+    #
+    # See: http://lxr.free-electrons.com/source/ipc/sem.c?v=3.8#L419
+    (1 << 16).times do # do an acquire 64k times
+      Semian[:testing].acquire do
+        1
+      end
+    end
+  end
+
   def test_destroy
     Semian.register :testing, tickets: 1
     Semian[:testing].destroy
-    assert_raises RuntimeError do
+    assert_raises Semian::SyscallError do
       Semian[:testing].acquire { }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Scott Francis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -43,6 +43,7 @@ files:
 - ext/semian/extconf.rb
 - ext/semian/semian.c
 - lib/semian.rb
+- lib/semian/version.rb
 - semian.gemspec
 - test/test_semian.rb
 homepage: https://github.com/csfrancis/semian