process_shared 0.2.0 → 0.2.1a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 159a6ddc012e5c9ae969b505375b65c4ce28211d
-  data.tar.gz: d1ecb4700906ad8b9534fd3535f4e4e33e34bc52
+  metadata.gz: 42192608a911df5503886fa0f851a7cd23f13348
+  data.tar.gz: 1f8db3382f895196e5bb7edb9818d1a414186740
 SHA512:
-  metadata.gz: 1ab8b394e065e57c42bfb403a7f37262651fd3c8a81ee98c2fd7d7bec812afb9e305ab598b43ee3321a09407bfd901da8397abc4baa3e24bd64d20ef3b5ca3ef
-  data.tar.gz: 266a1ed392b960097f638c59389e7fc5b1de1c08c4be28ace68f6987293801b1da38542f8354951cd20fa9f307e8e8bcb133ea6905572fffd8b90a1100a1b21b
+  metadata.gz: 59e6a4763c2d04a72ffbae080e1b999230faba801307662465bb5fcf94ead89c32a4494af60962807c7f49345fa29f96a271c98dba75c383210dde5b590cbe6c
+  data.tar.gz: 7924ce60532cc79c8992dc7f8b435212b890255d4afaac331c19466cb7cc369260946d7254182f07aaeec68d074adcc5015e599b90fed04957f2e42e3eacb0a3

data/lib/mach/functions.rb

@@ -15,7 +15,7 @@ module Mach
     # Replace methods in +syms+ with error checking wrappers that
     # invoke the original method and raise a {SystemCallError}.
     #
-    # The original method is invoked, and it's return value is passed
+    # The original method is invoked, and its return value is passed
     # to the block (or a default check).  The block should return true
     # if the return value indicates an error state.
     def self.error_check(*syms, &is_err)

data/lib/process_shared/posix/libc.rb

@@ -16,8 +16,22 @@ module ProcessShared
                    FFI::Platform::LIBSUFFIX
                  end
 
-        ffi_lib File.join(File.expand_path(File.dirname(__FILE__)),
-                          'helper.' + suffix)
+        # Ruby 2.1 (also 2.0?) puts extensions into, e.g.
+        # $GEM_HOME/extensions/x86_64-linux/2.1.0/static/$gemname-$gemversion,
+        # so they aren't in the same dir as this file. Normally that's
+        # fine since you're just 'require'ing them, but 'helper.so'
+        # isn't a real Ruby extension; it's just a shared lib to
+        # export some constants that are only available as macros in
+        # libc.
+        #
+        # Fallback to attempting to load from same directory as this file.
+        helper = 'process_shared/posix/helper.' + suffix
+        fallback_path = File.expand_path(File.dirname(__FILE__))
+        path = $LOAD_PATH.find(fallback_path) do |path|
+          File.exists?(File.join(path, helper))
+        end
+
+        ffi_lib File.join(path, helper)
         
         [:o_rdwr,
          :o_creat,

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
-require 'rubygems' if RUBY_VERSION =~ /^1.8/
-gem 'minitest'
-require 'minitest/spec'
 require 'minitest/autorun'
+require 'minitest/spec'
 require 'minitest/matchers'
 
 require 'process_shared'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: process_shared
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1a
 platform: ruby
 authors:
 - Patrick Mahoney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,6 @@ email: pat@polycrystal.org
 executables: []
 extensions:
 - ext/helper/extconf.rb
-- ext/pthread_sync_helper/extconf.rb
 extra_rdoc_files:
 - README.md
 - ChangeLog
@@ -153,9 +152,6 @@ files:
 - README.md
 - ext/helper/extconf.rb
 - ext/helper/helper.c
-- ext/pthread_sync_helper/extconf.rb
-- ext/pthread_sync_helper/pthread_sync_helper.c
-- ext/semaphore.c
 - lib/mach.rb
 - lib/mach/clock.rb
 - lib/mach/error.rb
@@ -181,22 +177,15 @@ files:
 - lib/process_shared/posix/errno.rb
 - lib/process_shared/posix/libc.rb
 - lib/process_shared/posix/semaphore.rb
-- lib/process_shared/posix/shared_array.rb
 - lib/process_shared/posix/shared_memory.rb
 - lib/process_shared/posix/time_spec.rb
 - lib/process_shared/posix/time_val.rb
-- lib/process_shared/posix_call.rb
 - lib/process_shared/process_error.rb
-- lib/process_shared/rt.rb
 - lib/process_shared/shared_array.rb
 - lib/process_shared/shared_memory_io.rb
 - lib/process_shared/synchronizable_semaphore.rb
-- lib/process_shared/thread.rb
 - lib/process_shared/time_spec.rb
-- lib/scratch.rb
 - spec/mach/port_spec.rb
-- spec/mach/scratch.rb
-- spec/mach/scratch2.rb
 - spec/mach/semaphore_spec.rb
 - spec/mach/task_spec.rb
 - spec/process_shared/binary_semaphore_spec.rb
@@ -224,9 +213,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0
@@ -234,3 +223,4 @@ signing_key:
 specification_version: 4
 summary: process-shared synchronization primitives
 test_files: []
+has_rdoc: true

data/ext/pthread_sync_helper/extconf.rb

@@ -1,9 +0,0 @@
-require 'mkmf'
-
-#have_func("pthread_mutex_init", "pthread.h")
-#have_func("pthread_cond_init", "pthread.h")
-#have_func("pthread_mutex_trylock", "pthread.h")
-
-have_library("pthread", "pthread_mutex_init")
-
-create_makefile("pthread_sync_helper")

data/ext/pthread_sync_helper/pthread_sync_helper.c

@@ -1,43 +0,0 @@
-#include <pthread.h>
-#include <sys/mman.h>		/* PROT_*, MAP_* */
-#include <fcntl.h>		/* O_* */
-
-/* Declarations. These are split this way to avoid compiler warnings. */
-
-extern size_t sizeof_pthread_mutex_t;
-extern size_t sizeof_pthread_mutexattr_t;
-
-extern int pthread_process_shared;
-
-extern int o_rdwr;
-extern int o_creat;
-
-extern int prot_read;
-extern int prot_write;
-extern int prot_exec;
-extern int prot_none;
-
-extern void * map_failed;
-
-extern int map_shared;
-extern int map_private;
-
-/* Definitions. These are split from declrations to avoid compiler warnings. */
-
-size_t sizeof_pthread_mutex_t = sizeof (pthread_mutex_t);
-size_t sizeof_pthread_mutexattr_t = sizeof (pthread_mutexattr_t);
-
-int pthread_process_shared = PTHREAD_PROCESS_SHARED;
-
-int o_rdwr = O_RDWR;
-int o_creat = O_CREAT;
-
-int prot_read = PROT_READ;
-int prot_write = PROT_WRITE;
-int prot_exec = PROT_EXEC;
-int prot_none = PROT_NONE;
-
-void * map_failed = MAP_FAILED;
-
-int map_shared = MAP_SHARED;
-int map_private = MAP_PRIVATE;

data/ext/semaphore.c

@@ -1,623 +0,0 @@
-/*
- *  A type which wraps a semaphore
- *
- *  semaphore.c
- *
- *  Copyright (c) 2006-2008, R Oudkerk
- *
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *  2. Redistributions in binary form must reproduce the above
- *     copyright notice, this list of conditions and the following
- *     disclaimer in the documentation and/or other materials provided
- *     with the distribution.
- *
- *  3. Neither the name of author nor the names of any contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- *  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- *  PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR
- *  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- *  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- *  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- *  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Modifications Copyright (c) 2011, Patrick Mahoney
- */
-
-#include "processing.h"
-
-enum {
-  RECURSIVE_MUTEX,
-  SEMAPHORE,
-  BOUNDED_SEMAPHORE
-};
-
-typedef struct {
-    PyObject_HEAD
-    SEM_HANDLE handle;
-    long last_tid;
-    int count;
-    int maxvalue;
-    int kind;
-} SemLock;
-
-#define ISMINE(o) (o->count > 0 && PyThread_get_thread_ident() == o->last_tid)
-
-
-#ifdef MS_WINDOWS
-
-/*
- * Windows definitions
- */
-
-static SECURITY_ATTRIBUTES sa = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE };
-
-#define SEM_FAILED NULL
-
-#define SEM_CLEAR_ERROR() SetLastError(0)
-#define SEM_GET_LAST_ERROR() GetLastError()
-#define SEM_CREATE(name, val, max) CreateSemaphore(&sa, val, max, NULL)
-#define SEM_CLOSE(sem) (CloseHandle(sem) ? 0 : -1)
-#define SEM_GETVALUE(sem, pval) _SemLock_GetSemaphoreValue(sem, pval)
-#define SEM_UNLINK(name) 0
-
-static int
-_SemLock_GetSemaphoreValue(HANDLE handle, long *value)
-{
-    long previous;
-
-    switch (WaitForSingleObject(handle, 0)) {
-    case WAIT_OBJECT_0:
-        if (!ReleaseSemaphore(handle, 1, &previous))
-            return STANDARD_ERROR;
-        *value = previous + 1;
-        return 0;
-    case WAIT_TIMEOUT:
-        *value = 0;
-        return 0;
-    default:
-        return STANDARD_ERROR;
-    }
-}
-
-static PyObject *
-SemLock_acquire(SemLock *self, PyObject *args, PyObject *kwds)
-{
-    int blocking = 1;
-    double timeout;
-    PyObject *timeout_obj = Py_None;
-    DWORD res, dwTimeout;
-    
-    static char *kwlist[] = {"block", "timeout", NULL};
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|iO", kwlist,
-                                     &blocking, &timeout_obj))
-        return NULL;
-
-    if (self->kind == RECURSIVE_MUTEX && ISMINE(self)) {
-        ++self->count;
-        Py_RETURN_TRUE;
-    }
-
-    /* work out timeout */
-    if (!blocking) {
-        dwTimeout = 0;
-    } else if (timeout_obj == Py_None) {
-        dwTimeout = INFINITE;
-    } else {
-        timeout = PyFloat_AsDouble(timeout_obj);
-        if (PyErr_Occurred())
-            return NULL;
-        timeout *= 1000.0;      /* convert to millisecs */
-        if (timeout < 0.0) {
-            timeout = 0.0;
-        } else if (timeout >= ((double)INFINITE - 0.5)) {
-            PyErr_SetString(PyExc_OverflowError, "timeout is too large");
-            return NULL;
-        }
-        dwTimeout = (DWORD)(timeout + 0.5);
-    }
-    
-    /* do the wait */
-    if (dwTimeout == 0) {
-        res = WaitForSingleObject(self->handle, 0);
-    } else if (main_thread == GetCurrentThreadId()) {
-        res = WaitForSingleObject(self->handle, 0);
-        if (res == WAIT_TIMEOUT) {
-            HANDLE handles[2] = {self->handle, hInterruptEvent};
-            ResetEvent(hInterruptEvent);
-            Py_BEGIN_ALLOW_THREADS
-            res = WaitForMultipleObjects(2, handles, FALSE, dwTimeout);
-            Py_END_ALLOW_THREADS
-        }
-    } else {
-        Py_BEGIN_ALLOW_THREADS
-        res = WaitForSingleObject(self->handle, dwTimeout);
-        Py_END_ALLOW_THREADS
-    }
-    
-    /* handle result */
-    switch (res) {
-    case WAIT_TIMEOUT:
-        Py_RETURN_FALSE;
-    case WAIT_OBJECT_0:
-        self->last_tid = GetCurrentThreadId();
-        ++self->count;
-        Py_RETURN_TRUE;
-    case (WAIT_OBJECT_0 + 1):  /* we got SIGINT; do like in timemodule.c */
-        Sleep(1);
-        errno = EINTR;
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    case WAIT_FAILED:
-        return PyErr_SetFromWindowsErr(0);
-    default:
-        PyErr_SetString(PyExc_RuntimeError, "WaitForSingleObject() or "
-                        "WaitForMultipleObjects() gave unrecognized value");
-        return NULL;
-    }
-}
-
-static PyObject *
-SemLock_release(SemLock *self, PyObject *args)
-{
-    if (self->kind == RECURSIVE_MUTEX) {
-        if (!ISMINE(self)) {
-            PyErr_SetString(PyExc_AssertionError, "attempt to release "
-                            "recursive lock not owned by thread");
-            return NULL;
-        }
-        if (self->count > 1) {
-            --self->count;
-            Py_RETURN_NONE;
-        }
-        assert(self->count == 1);
-    }
-
-    if (!ReleaseSemaphore(self->handle, 1, NULL)) {
-        if (GetLastError() == ERROR_TOO_MANY_POSTS) {
-            PyErr_SetString(PyExc_ValueError,
-                            "semaphore or lock released too many times");
-            return NULL;
-        } else {
-            return PyErr_SetFromWindowsErr(0);
-        }
-    }
-    
-    --self->count;
-    Py_RETURN_NONE;
-}
-
-#else /* !MS_WINDOWS */
-
-/*
- * Unix definitions
- */
-
-#define SEM_CLEAR_ERROR()
-#define SEM_GET_LAST_ERROR() 0
-#define SEM_CREATE(name, val, max) sem_open(name, O_CREAT | O_EXCL, 0600, val)
-#define SEM_CLOSE(sem) sem_close(sem)
-#define SEM_GETVALUE(sem, pval) sem_getvalue(sem, pval)
-#define SEM_UNLINK(name) sem_unlink(name)
-
-#if HAVE_BROKEN_SEM_UNLINK
-#  define sem_unlink(name) 0
-#endif
-
-#if !HAVE_SEM_TIMEDWAIT
-#  define sem_timedwait(sem,deadline) sem_timedwait_save(sem,deadline,_save)
-
-int
-sem_timedwait_save(sem_t *sem, struct timespec *deadline, PyThreadState *_save)
-{
-    int res;
-    unsigned long delay, difference;
-    struct timeval now, tvdeadline, tvdelay;
-
-    errno = 0;
-    tvdeadline.tv_sec = deadline->tv_sec;
-    tvdeadline.tv_usec = deadline->tv_nsec / 1000;
-
-    for (delay = 0 ; ; delay += 1000) {
-        /* poll */
-        if (sem_trywait(sem) == 0)
-            return 0;
-        else if (errno != EAGAIN)
-            return STANDARD_ERROR;
-            
-        /* get current time */
-        if (gettimeofday(&now, NULL) < 0)
-            return STANDARD_ERROR;
-            
-        /* check for timeout */
-        if (tvdeadline.tv_sec < now.tv_sec || 
-            (tvdeadline.tv_sec == now.tv_sec && 
-             tvdeadline.tv_usec <= now.tv_usec)) {
-            errno = ETIMEDOUT;
-            return STANDARD_ERROR;
-        }
-        
-        /* calculate how much time is left */
-        difference = (tvdeadline.tv_sec - now.tv_sec) * 1000000 + 
-            (tvdeadline.tv_usec - now.tv_usec);
-            
-        /* check delay not too long -- maximum is 20 msecs */
-        if (delay > 20000)
-            delay = 20000;
-        if (delay > difference)
-            delay = difference;
-        
-        /* sleep */
-        tvdelay.tv_sec = delay / 1000000;
-        tvdelay.tv_usec = delay % 1000000;
-        if (select(0, NULL, NULL, NULL, &tvdelay) < 0)
-            return STANDARD_ERROR;
-
-        /* check for signals */
-        Py_BLOCK_THREADS 
-        res = PyErr_CheckSignals();
-        Py_UNBLOCK_THREADS
-
-        if (res) {
-            errno = EINTR;
-            return EXCEPTION_HAS_BEEN_SET;
-        }
-    }
-}
-
-#endif /* !HAVE_SEM_TIMEDWAIT */
-
-static PyObject *
-SemLock_acquire(SemLock *self, PyObject *args, PyObject *kwds)
-{
-    int blocking = 1, res;
-    double timeout;
-    PyObject *timeout_obj = Py_None;
-    struct timespec deadline = {0};
-    struct timeval now;
-    long sec, nsec;
-    
-    static char *kwlist[] = {"block", "timeout", NULL};
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|iO", kwlist,
-                                     &blocking, &timeout_obj))
-        return NULL;
-        
-    if (self->kind == RECURSIVE_MUTEX && ISMINE(self)) {
-        ++self->count;
-        Py_RETURN_TRUE;
-    }
-    
-    if (timeout_obj != Py_None) {
-        timeout = PyFloat_AsDouble(timeout_obj);
-        if (PyErr_Occurred())
-            return NULL;
-        if (timeout < 0.0)
-            timeout = 0.0;
-            
-        if (gettimeofday(&now, NULL) < 0) {
-            PyErr_SetFromErrno(PyExc_OSError);
-            return NULL;
-        }
-        sec = (long) timeout;
-        nsec = (long) (1e9 * (timeout - sec) + 0.5);
-        deadline.tv_sec = now.tv_sec + sec;
-        deadline.tv_nsec = now.tv_usec * 1000 + nsec;
-        deadline.tv_sec += (deadline.tv_nsec / 1000000000);
-        deadline.tv_nsec %= 1000000000;
-    }
-    
-    do {
-        Py_BEGIN_ALLOW_THREADS
-        if (blocking && timeout_obj == Py_None)
-            res = sem_wait(self->handle);
-        else if (!blocking)
-            res = sem_trywait(self->handle);
-        else
-            res = sem_timedwait(self->handle, &deadline);
-        Py_END_ALLOW_THREADS
-        if (res == EXCEPTION_HAS_BEEN_SET)
-            break;
-    } while (res < 0 && errno == EINTR && !PyErr_CheckSignals());
-    
-    if (res < 0) {
-        if (errno == EAGAIN || errno == ETIMEDOUT)
-            Py_RETURN_FALSE;
-        else if (errno == EINTR)
-            return NULL;
-        else
-            return PyErr_SetFromErrno(PyExc_OSError);
-    }
-    
-    ++self->count;
-    self->last_tid = PyThread_get_thread_ident();
-    
-    Py_RETURN_TRUE;
-}
-
-static PyObject *
-SemLock_release(SemLock *self, PyObject *args)
-{
-    switch (self->kind) {
-    case RECURSIVE_MUTEX:
-        if (!ISMINE(self)) {
-            PyErr_SetString(PyExc_AssertionError, "attempt to release "
-                            "recursive lock not owned by thread");
-            return NULL;
-        }
-        if (self->count > 1) {
-            --self->count;
-            Py_RETURN_NONE;
-        }
-        assert(self->count == 1);
-        break;
-#if HAVE_BROKEN_SEM_GETVALUE
-    case BOUNDED_SEMAPHORE:
-        /* We will only check properly the Lock case (where maxvalue == 1) */
-        if (self->maxvalue == 1) {
-            /* make sure that already locked */
-            if (sem_trywait(self->handle) < 0) {
-                if (errno != EAGAIN)
-                    return PyErr_SetFromErrno(PyExc_OSError);
-                /* it is already locked as expected */
-            } else {
-                /* it was not locked -- so undo wait and raise error */
-                if (sem_post(self->handle) < 0)
-                    return PyErr_SetFromErrno(PyExc_OSError);
-                PyErr_SetString(PyExc_ValueError, 
-                                "semaphore or lock released too many times");
-                return NULL;
-            }
-        }
-#else
-    case BOUNDED_SEMAPHORE:
-        {
-            int sval;
-
-            /* This check is not an absolute guarantee that the semaphore
-               does not rise above maxvalue. */
-            if (sem_getvalue(self->handle, &sval) < 0) {
-                return PyErr_SetFromErrno(PyExc_OSError);
-            } else if (sval >= self->maxvalue) {
-                PyErr_SetString(PyExc_ValueError, 
-                                "semaphore or lock released too many times");
-                return NULL;
-            }
-        }
-#endif
-    }
-    
-    if (sem_post(self->handle) < 0)
-        return PyErr_SetFromErrno(PyExc_OSError);
-    
-    --self->count;
-    Py_RETURN_NONE;
-}
-
-#endif /* !MS_WINDOWS */
-
-/*
- * All platforms
- */
-
-static PyObject *
-_SemLock_create(PyTypeObject *type, SEM_HANDLE handle, int kind, int maxvalue)
-{
-    SemLock *self;
-
-    self = (SemLock*)type->tp_alloc(type, 0);
-    if (!self)
-        return NULL;
-    self->handle = handle;
-    self->kind = kind;
-    self->count = 0;
-    self->last_tid = 0;
-    self->maxvalue = maxvalue;
-    return (PyObject*)self;
-}
-
-static PyObject *
-SemLock_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
-    char buffer[256];
-    SEM_HANDLE handle = SEM_FAILED;
-    int kind, maxvalue, value;
-    PyObject *result;
-    static char *kwlist[] = {"kind", "value", NULL};
-    static int counter = 0;
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "ii", kwlist, &kind, &value))
-        return NULL;
-
-    if (kind < RECURSIVE_MUTEX || kind > BOUNDED_SEMAPHORE) {
-        PyErr_SetString(PyExc_ValueError, "unrecongnized blocker type");
-        return NULL;
-    }
-    
-    PyOS_snprintf(buffer, sizeof(buffer), "/pr%d-%d", getpid(), counter++);
-    
-    if (kind == BOUNDED_SEMAPHORE)
-        maxvalue = value;
-    else if (kind == RECURSIVE_MUTEX)
-        maxvalue = 1;
-    else 
-        maxvalue = INT_MAX;
-
-    SEM_CLEAR_ERROR();
-    handle = SEM_CREATE(buffer, value, maxvalue);
-    /* On Windows we should fail if GetLastError() == ERROR_ALREADY_EXISTS */
-    if (handle == SEM_FAILED || SEM_GET_LAST_ERROR() != 0)
-        goto failure;
-
-    if (SEM_UNLINK(buffer) < 0)
-        goto failure;
-
-    result = _SemLock_create(type, handle, kind, maxvalue);
-    if (!result)
-        goto failure;
-
-    return result;
-
- failure:
-    if (handle != SEM_FAILED)
-        SEM_CLOSE(handle);
-    SetException(NULL, STANDARD_ERROR);
-    return NULL;
-}
-
-static PyObject *
-SemLock_rebuild(PyTypeObject *type, PyObject *args)
-{
-    SEM_HANDLE handle;
-    int kind, maxvalue;
-
-    if (!PyArg_ParseTuple(args, F_SEM_HANDLE "ii", &handle, &kind, &maxvalue))
-        return NULL;
-
-    return _SemLock_create(type, handle, kind, maxvalue);
-}
-
-static void
-SemLock_dealloc(SemLock* self)
-{
-    if (self->handle != SEM_FAILED)
-        SEM_CLOSE(self->handle);
-    self->ob_type->tp_free((PyObject*)self);
-}
-
-static PyObject *
-SemLock_count(SemLock *self)
-{
-    return PyInt_FromLong((long)self->count);
-}
-
-static PyObject *
-SemLock_ismine(SemLock *self)
-{
-    /* only makes sense for a lock */
-    return PyBool_FromLong(ISMINE(self));
-}
-
-static PyObject *
-SemLock_getvalue(SemLock *self)
-{
-#if HAVE_BROKEN_SEM_GETVALUE
-    PyErr_SetNone(PyExc_NotImplementedError);
-    return NULL;
-#else
-    int sval;
-    if (SEM_GETVALUE(self->handle, &sval) < 0)
-        SetException(NULL, STANDARD_ERROR);
-    return PyInt_FromLong((long)sval);
-#endif
-}
-
-static PyObject *
-SemLock_afterfork(SemLock *self)
-{
-    self->count = 0;
-    Py_RETURN_NONE;
-}
-
-/*
- * Semaphore methods
- */
-
-static PyMethodDef SemLock_methods[] = {
-    {"acquire", (PyCFunction)SemLock_acquire, METH_KEYWORDS,
-     "acquire the semaphore/lock"},
-    {"release", (PyCFunction)SemLock_release, METH_NOARGS, 
-     "release the semaphore/lock"},
-    {"__enter__", (PyCFunction)SemLock_acquire, METH_KEYWORDS, 
-     "enter the semaphore/lock"},
-    {"__exit__", (PyCFunction)SemLock_release, METH_VARARGS, 
-     "exit the semaphore/lock"},
-    {"_count", (PyCFunction)SemLock_count, METH_NOARGS, 
-     "number of `acquire()`s minus number of `release()`s for this process"},
-    {"_isMine", (PyCFunction)SemLock_ismine, METH_NOARGS, 
-     "whether the lock is owned by this thread"},
-    {"_getValue", (PyCFunction)SemLock_getvalue, METH_NOARGS, 
-     "get the value of the semaphore"}, 
-    {"_rebuild", (PyCFunction)SemLock_rebuild, METH_VARARGS | METH_CLASS, 
-     ""}, 
-    {"_afterFork", (PyCFunction)SemLock_afterfork, METH_NOARGS,
-     "rezero the net acquisition count after fork()"},
-    {NULL}
-};
-
-/*
- * Member table
- */
-
-static PyMemberDef SemLock_members[] = {
-    {"handle", T_SEM_HANDLE, offsetof(SemLock, handle), READONLY, ""},
-    {"kind", T_INT, offsetof(SemLock, kind), READONLY, ""},
-    {"maxvalue", T_INT, offsetof(SemLock, maxvalue), READONLY, ""},
-    {NULL}
-};
-
-/*
- * Semaphore type
- */
-
-PyTypeObject SemLockType = {
-    PyObject_HEAD_INIT(NULL)
-    0,                         /* ob_size */
-    "_processing.SemLock",     /* tp_name */
-    sizeof(SemLock),           /* tp_basicsize */
-    0,                         /* tp_itemsize */
-    (destructor)SemLock_dealloc,
-                               /* tp_dealloc */
-    0,                         /* tp_print */
-    0,                         /* tp_getattr */
-    0,                         /* tp_setattr */
-    0,                         /* tp_compare */
-    0,                         /* tp_repr */
-    0,                         /* tp_as_number */
-    0,                         /* tp_as_sequence */
-    0,                         /* tp_as_mapping */
-    0,                         /* tp_hash */
-    0,                         /* tp_call */
-    0,                         /* tp_str */
-    0,                         /* tp_getattro */
-    0,                         /* tp_setattro */
-    0,                         /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 
-                               /* tp_flags */
-    "Semaphore/Mutex type",    /* tp_doc */
-    0,                         /* tp_traverse */
-    0,                         /* tp_clear */
-    0,                         /* tp_richcompare */
-    0,                         /* tp_weaklistoffset */
-    0,                         /* tp_iter */
-    0,                         /* tp_iternext */
-    SemLock_methods,           /* tp_methods */
-    SemLock_members,           /* tp_members */
-    0,                         /* tp_getset */
-    0,                         /* tp_base */
-    0,                         /* tp_dict */
-    0,                         /* tp_descr_get */
-    0,                         /* tp_descr_set */
-    0,                         /* tp_dictoffset */
-    0,                         /* tp_init */
-    0,                         /* tp_alloc */
-    (newfunc)SemLock_new,      /* tp_new */
-};