process_shared 0.0.4 → 0.1.0

data/spec/mach/task_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'mach'
+require 'mach/port'
+require 'mach/task'
+
+module Mach
+  describe Task do
+    before :each do
+      @task = Task.self
+    end
+
+    it 'gets special ports' do
+      bp = @task.get_special_port(:bootstrap)
+      bp.must_equal @task.get_bootstrap_port
+    end
+
+    it 'redefines bootstrap port' do
+      bp = @task.get_bootstrap_port
+      new_bp = Port.new
+      bp.wont_equal(new_bp)
+
+      begin
+        new_bp.insert_right(:make_send)
+        @task.set_bootstrap_port(new_bp)
+        @task.get_bootstrap_port.must_equal(new_bp)
+      ensure
+        @task.set_bootstrap_port(bp)
+      end
+    end
+  end
+end

data/spec/process_shared/scratch.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'process_shared'
+
+module ProcessShared
+  describe Semaphore2 do
+    it 'does stuff' do
+      sem = Semaphore2.new(0)
+      puts ProcessShared::Mach.shared_ports.inspect
+      fork do
+        puts "child: #{Process.pid}"
+        sleep 2
+        puts "child signaling sem"
+        sem.post
+      end
+
+      puts "parent waiting..."
+      sem.wait
+      puts "parent woke up"
+    end
+  end
+end

data/spec/process_shared/semaphore_spec.rb

@@ -58,16 +58,18 @@ module ProcessShared
     end
 
     describe '#post and #wait' do
-      it 'increments and decrements the value' do
-        Semaphore.open(0) do |sem|
-          10.times do |i|
-            sem.post
-            sem.value.must_equal(i + 1)
-          end
+      unless FFI::Platform.mac?
+        it 'increments and decrements the value' do
+          Semaphore.open(0) do |sem|
+            10.times do |i|
+              sem.post
+              sem.value.must_equal(i + 1)
+            end
 
-          10.times do |i|
-            sem.wait
-            sem.value.must_equal(10 - i - 1)
+            10.times do |i|
+              sem.wait
+              sem.value.must_equal(10 - i - 1)
+            end
           end
         end
       end
@@ -98,14 +100,13 @@ module ProcessShared
 
       it 'returns after waiting if another processes posts' do
         Semaphore.open(0) do |sem|
-          start = Time.now.to_f
-
           pid = fork do
             sleep 0.01
             sem.post
             Kernel.exit!
           end
 
+          start = Time.now.to_f
           sem.try_wait(0.1)
           (Time.now.to_f - start).must be_lt(0.1)
 

data/spec/process_shared/shared_memory_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'process_shared/shared_memory'
+require 'process_shared'
 
 module ProcessShared
   describe SharedMemory do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_shared
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000Z
+date: 2012-02-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &13991240 !ruby/object:Gem::Requirement
+  requirement: &13298820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *13991240
+  version_requirements: *13298820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13990820 !ruby/object:Gem::Requirement
+  requirement: &13297880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13990820
+  version_requirements: *13297880
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &13990280 !ruby/object:Gem::Requirement
+  requirement: &13297020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13990280
+  version_requirements: *13297020
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &13989780 !ruby/object:Gem::Requirement
+  requirement: &13296040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13989780
+  version_requirements: *13296040
 - !ruby/object:Gem::Dependency
   name: minitest-matchers
-  requirement: &13989260 !ruby/object:Gem::Requirement
+  requirement: &13295120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,67 +65,71 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13989260
+  version_requirements: *13295120
 description: FFI wrapper around portable semaphore library with mutex and condition
   vars built on top.
 email: pat@polycrystal.org
 executables: []
 extensions:
 - ext/pthread_sync_helper/extconf.rb
-- ext/libpsem/extconf.rb
+- ext/helper/extconf.rb
 extra_rdoc_files:
 - README.rdoc
 - ChangeLog
 - COPYING
 files:
+- lib/mach.rb
 - lib/scratch.rb
 - lib/process_shared.rb
+- lib/mach/host.rb
+- lib/mach/clock.rb
+- lib/mach/semaphore.rb
+- lib/mach/functions.rb
+- lib/mach/time_spec.rb
+- lib/mach/error.rb
+- lib/mach/port.rb
+- lib/mach/task.rb
 - lib/process_shared/abstract_semaphore.rb
 - lib/process_shared/posix_call.rb
+- lib/process_shared/mach.rb
 - lib/process_shared/process_error.rb
 - lib/process_shared/thread.rb
+- lib/process_shared/posix/errno.rb
+- lib/process_shared/posix/semaphore.rb
+- lib/process_shared/posix/time_spec.rb
+- lib/process_shared/posix/shared_array.rb
+- lib/process_shared/posix/time_val.rb
+- lib/process_shared/posix/libc.rb
+- lib/process_shared/posix/shared_memory.rb
 - lib/process_shared/mutex.rb
 - lib/process_shared/shared_memory_io.rb
 - lib/process_shared/semaphore.rb
+- lib/process_shared/time_spec.rb
 - lib/process_shared/rt.rb
+- lib/process_shared/mach/semaphore.rb
 - lib/process_shared/shared_array.rb
 - lib/process_shared/binary_semaphore.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
 - lib/process_shared/shared_memory.rb
-- lib/process_shared/libpsem.bundle
-- lib/process_shared/libpsem.so
 - ext/pthread_sync_helper/pthread_sync_helper.c
 - ext/semaphore.c
-- ext/libpsem/mempcpy.c
-- ext/libpsem/psem_error.c
-- ext/libpsem/bsem.c
-- ext/libpsem/psem_posix.c
-- ext/libpsem/psem.c
-- ext/libpsem/mutex.c
-- ext/libpsem/constants.c
-- ext/libpsem/bsem.h
-- ext/libpsem/psem_error.h
-- ext/libpsem/mutex.h
-- ext/libpsem/constants.h
-- ext/libpsem/psem.h
-- ext/libpsem/psem_posix.h
-- ext/libpsem/mempcpy.h
+- ext/helper/helper.c
 - ext/pthread_sync_helper/extconf.rb
-- ext/libpsem/extconf.rb
-- spec/process_shared/psem_spec.rb
+- ext/helper/extconf.rb
+- spec/mach/scratch2.rb
+- spec/mach/task_spec.rb
+- spec/mach/scratch.rb
+- spec/mach/port_spec.rb
+- spec/mach/semaphore_spec.rb
 - spec/process_shared/shared_memory_spec.rb
 - spec/process_shared/binary_semaphore_spec.rb
 - spec/process_shared/condition_variable_spec.rb
 - spec/process_shared/mutex_spec.rb
 - spec/process_shared/shared_array_spec.rb
-- spec/process_shared/bounded_semaphore_spec.rb
+- spec/process_shared/scratch.rb
 - spec/process_shared/semaphore_spec.rb
-- spec/process_shared/libc_spec.rb
 - spec/spec_helper.rb
 - README.rdoc
 - ChangeLog
@@ -142,12 +146,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4219144460365832731
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4219144460365832731
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/ext/libpsem/bsem.c

@@ -1,188 +0,0 @@
-/*
- * Extensions atop psem.  Recursive mutex, bounded semaphore.
- */
-
-#include <stdlib.h>		/* malloc, free */
-
-#include "mempcpy.h"            /* includes string.h */
-#include "psem.h"
-#include "psem_error.h"
-#include "bsem.h"
-
-#define MAX_NAME 128            /* This is much less the POSIX max
-                                   name. Users of this library must
-                                   not use longer names. */
-
-static const char bsem_lock_suffix[] = "-bsem-lock";
-
-#define MAX_LOCK_NAME (MAX_NAME + strlen(bsem_lock_suffix) + 1)
-
-/**
- * Assumes dest has sufficient space to hold "[MAX_NAME]-bsem-lock".
- */
-static int
-make_lockname(char *dest, const char *name, error_t **err)
-{
-  int namelen;
-
-  namelen = strlen(name);
-  if (namelen > MAX_NAME) {
-    error_new(err, E_SOURCE_PSEM, E_NAME_TOO_LONG);
-    return ERROR;
-  }
-
-  *((char *) mempcpy(mempcpy(dest, name, namelen),
-                     bsem_lock_suffix,
-                     strlen(bsem_lock_suffix))) = '\0';
-}
-
-size_t sizeof_bsem_t = sizeof (bsem_t);
-
-bsem_t *
-bsem_alloc(void) {
-  return malloc(sizeof(bsem_t));
-}
-
-void
-bsem_free(bsem_t *bsem) {
-  free(bsem);
-}
-
-#define call_or_return(exp)					\
-  do { if ((exp) == ERROR) { return ERROR; } } while (0)
-
-#define bsem_lock_or_return(bsem, err) call_or_return(bsem_lock((bsem), (err)))
-
-#define bsem_unlock_or_return(bsem, err) call_or_return(bsem_unlock((bsem), (err)))
-
-int
-bsem_open(bsem_t *bsem, const char *name, unsigned int maxvalue, unsigned int value, error_t **err)
-{
-  char lockname[MAX_LOCK_NAME];
-
-  call_or_return(psem_open(&bsem->psem, name, value, err));
-  call_or_return(make_lockname(lockname, name, err));
-  call_or_return(psem_open(&bsem->lock, lockname, 1, err));
-
-  bsem->maxvalue = maxvalue;
-  
-  return OK;
-}
-
-static int
-bsem_lock(bsem_t *bsem, error_t **err)
-{
-  call_or_return(psem_wait(&bsem->lock, err));
-  return OK;
-}
-
-static int
-bsem_unlock(bsem_t *bsem, error_t **err)
-{
-  call_or_return(psem_post(&bsem->lock, err));
-  return OK;
-}
-
-int
-bsem_close(bsem_t *bsem, error_t **err)
-{
-  bsem_lock_or_return(bsem, err);
-
-  if (psem_close(&bsem->psem, err) == ERROR) {
-    bsem_unlock(bsem, NULL);
-    return ERROR;
-  }
-
-  bsem_unlock_or_return(bsem, err);
-
-  call_or_return(psem_close(&bsem->lock, err));
-  return OK;
-}
-
-int
-bsem_unlink(const char *name, error_t **err)
-{
-  char lockname[MAX_LOCK_NAME];
-
-  call_or_return(psem_unlink(name, err));
-  call_or_return(make_lockname(lockname, name, err));
-  call_or_return(psem_unlink(lockname, err));
-  return OK;
-}
-
-int
-bsem_post(bsem_t *bsem, error_t **err)
-{
-  int sval;
-
-  bsem_lock_or_return(bsem, err);
-
-  /* FIXME: maxvalue is broken on some systems... (cygwin? mac?) */
-  if (psem_getvalue(&bsem->psem, &sval, err) == ERROR) {
-    bsem_unlock(bsem, err);
-    return ERROR;
-  }
-
-  if (sval >= bsem->maxvalue) {
-    /* ignored silently */
-    bsem_unlock(bsem, err);
-    return OK;
-  }
-
-  if (psem_post(&bsem->psem, err) == ERROR) {
-    bsem_unlock(bsem, err);
-    return ERROR;
-  }
-
-  bsem_unlock_or_return(bsem, err);
-  return OK;
-}
-
-int
-bsem_wait(bsem_t *bsem, error_t **err)
-{
-  call_or_return(psem_wait(&bsem->psem, err));
-  return OK;
-}
-
-int
-bsem_trywait(bsem_t *bsem, error_t **err)
-{
-  bsem_lock_or_return(bsem, err);
-
-  if (psem_trywait(&bsem->psem, err) == ERROR) {
-    bsem_unlock(bsem, NULL);
-    return ERROR;
-  }
-
-  bsem_unlock_or_return(bsem, err);
-  return OK;
-}
-
-int
-bsem_timedwait(bsem_t *bsem, float timeout_s, error_t **err)
-{
-  bsem_lock_or_return(bsem, err);
-
-  if (psem_timedwait(&bsem->psem, timeout_s, err) == ERROR) {
-    bsem_unlock(bsem, NULL);
-    return ERROR;
-  }
-
-  bsem_unlock_or_return(bsem, err);
-  return OK;
-}
-
-int
-bsem_getvalue(bsem_t *bsem, int *sval, error_t **err)
-{
-  bsem_lock_or_return(bsem, err);
-
-  if (psem_getvalue(&bsem->psem, sval, err) == ERROR) {
-    bsem_unlock(bsem, NULL);
-    return ERROR;
-  }
-
-  bsem_unlock_or_return(bsem, err);
-  return OK;
-}