process_shared 0.0.1 → 0.0.2

data/README.rdoc

@@ -4,8 +4,9 @@ Concurrency primitives that may be used in a cross-process way to
 coordinate share memory between processes.
 
 A small C library (libpsem) is compiled to provide portable access to
-semaphores.  This library is then accessed using FFI to implement Ruby
-classes ProcessShared::Semaphore, ProcessShared::BoundedSemaphore,
+semaphores (based on http://pyprocessing.berlios.de/).  This library
+is then accessed using FFI to implement Ruby classes
+ProcessShared::Semaphore, ProcessShared::BoundedSemaphore,
 ProcessShared::Mutex, and ProcessShared::SharedMemory.
 
 This is an incomplete work in progress.

data/ext/libpsem/extconf.rb

@@ -3,7 +3,8 @@ require 'mkmf'
 $objs = []
 
 # posix semaphores
-if have_func('sem_open', 'semaphore.h')
+if have_func('sem_open', 'semaphore.h') ||
+    ($libs << '-lpthread' && have_func('sem_open', 'semaphore.h'))
   have_func('floorf', 'math.h') or abort("Missing required floorf() in math.h")
   have_library('m', 'floorf')
 
@@ -12,12 +13,15 @@ if have_func('sem_open', 'semaphore.h')
   end
 
   have_library('rt', 'sem_open')
+else
+  abort('Win32 or platform without sem_open not supported (yet?)')
 end
 
 c_sources = ['psem.c', 'psem_error.c', 'psem_posix.c', 'bsem.c', 'constants.c']
 $objs += ['psem.o', 'psem_error.o', 'bsem.o', 'constants.o']
 
-depend_rules <<-END
+if respond_to? :depend_rules
+  depend_rules <<-END
 psem.c: psem.h psem_posix.c
 psem_error.c: psem_error.h
 
@@ -31,6 +35,6 @@ mempcpy.c: mempcpy.h
 
 libpsem.o: #{$objs.join(' ')}
 END
-
+end
 
 create_makefile('libpsem')

data/ext/libpsem/psem.h

@@ -5,6 +5,8 @@
  * Portable semaphore interface focusing on cross-process use.
  */
 
+#include <stdlib.h>		/* size_t */
+
 #ifdef HAVE_SEM_OPEN
 #include "psem_posix.h"
 #endif

data/lib/process_shared.rb

@@ -1,6 +1,25 @@
 require 'ffi'
 
+if VERSION =~ /^1.8/
+  require 'process_shared/define_singleton_method'
+  
+  module ProcessShared
+    module PSem
+      extend DefineSingletonMethod
+    end
+
+    module RT
+      extend DefineSingletonMethod
+    end
+
+    module LibC
+      extend DefineSingletonMethod
+    end
+  end
+end
+
 require 'process_shared/semaphore'
 require 'process_shared/bounded_semaphore'
 require 'process_shared/mutex'
 require 'process_shared/shared_memory'
+

data/lib/process_shared/define_singleton_method.rb

@@ -0,0 +1,14 @@
+module ProcessShared
+  module DefineSingletonMethod
+    # This method was added in Ruby 1.9.x.  Include this module for
+    # backwards compatibility.
+    #
+    # This isn't exactly compatible with the method in 1.9 which can
+    # take a Proc, Method, or a block.  This only accepts a block.
+    def define_singleton_method(sym, &block)
+      eigenclass = class << self; self; end
+      eigenclass.send(:define_method, sym, &block)
+    end
+  end
+end
+

data/lib/process_shared/mutex.rb

@@ -20,6 +20,10 @@ module ProcessShared
 
     # @return [Mutex]
     def lock
+      if locked_by == ::Process.pid
+        raise ProcessError, "already locked by this process #{::Process.pid}"
+      end
+
       @sem.wait
       self.locked_by = ::Process.pid
       self
@@ -37,7 +41,7 @@ module ProcessShared
     def sleep(timeout = nil)
       unlock
       begin
-        timeout ? sleep(timeout) : sleep
+        timeout ? Kernel.sleep(timeout) : Kernel.sleep
       ensure
         lock
       end
@@ -62,6 +66,7 @@ module ProcessShared
         raise ProcessError, "lock is held by #{p} not #{::Process.pid}"
       end
 
+      self.locked_by = 0
       @sem.post
       self
     end

data/spec/process_shared/mutex_spec.rb

@@ -70,5 +70,13 @@ module ProcessShared
 
       ::Process.wait(pid)
     end
+
+    it 'raises exception when locked twice by same process' do
+      mutex = Mutex.new
+
+      mutex.lock
+      proc { mutex.lock }.must_raise(ProcessError)
+      mutex.unlock
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,11 @@
+require 'rubygems' if VERSION =~ /^1.8/
 gem 'minitest'
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'minitest/matchers'
 
+require 'process_shared'
+
 class RangeMatcher
   def initialize(operator, limit)
     @operator = operator.to_sym

metadata

@@ -1,72 +1,91 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: process_shared
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Patrick Mahoney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ffi
-  requirement: &19463720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *19463720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: &19462580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19462580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &19461120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19461120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: minitest-matchers
-  requirement: &19459840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19459840
-description: FFI wrapper around portable semaphore library with mutex and condition
-  vars built on top.
+  version_requirements: *id004
+description: FFI wrapper around portable semaphore library with mutex and condition vars built on top.
 email: pat@polycrystal.org
 executables: []
-extensions:
+
+extensions: 
 - ext/pthread_sync_helper/extconf.rb
 - ext/libpsem/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - README.rdoc
 - ChangeLog
 - COPYING
-files:
+files: 
 - lib/scratch.rb
 - lib/process_shared.rb
 - lib/process_shared/abstract_semaphore.rb
@@ -78,6 +97,7 @@ files:
 - lib/process_shared/rt.rb
 - lib/process_shared/psem.rb
 - lib/process_shared/with_self.rb
+- lib/process_shared/define_singleton_method.rb
 - lib/process_shared/condition_variable.rb
 - lib/process_shared/bounded_semaphore.rb
 - lib/process_shared/libc.rb
@@ -114,26 +134,36 @@ files:
 - COPYING
 homepage: https://github.com/pmahoney/process_shared
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: process-shared synchronization primitives
 test_files: []
+