Upgrade to threads-shared-1.03

p4raw-id: //depot/perl@28923

1 files changed, 801 insertions, 776 deletions

diff --git a/ext/threads/shared/shared.xs b/ext/threads/shared/shared.xs
index 1bdbb08a45..955874a487 100644
--- a/ext/threads/shared/shared.xs
+++ b/ext/threads/shared/shared.xs
@@ -9,8 +9,10 @@
  * opposite directions."
  *                         --Sourcery
  *
- * Contributed by Arthur Bergman arthur@contiller.se
- * pulled in the (an)other direction by Nick Ing-Simmons nick@ing-simmons.net
+ * Contributed by Artur Bergman <sky AT crucially DOT net>
+ * Pulled in the (an)other direction by Nick Ing-Simmons
+ *      <nick AT ing-simmons DOT net>
+ * CPAN version produced by Jerry D. Hedden <jdhedden AT cpan DOT org>
  */
 
 /*
@@ -25,11 +27,11 @@
  *
  * Aggregates (AVs and HVs) are implemented using tie magic, except that
  * the vtable used is one defined in this file rather than the standard one.
- * This means that where a tie function like is FETCH is normally invoked by
+ * This means that where a tie function like FETCH is normally invoked by
  * the tie magic's mg_get() function, we completely bypass the calling of a
  * perl-level function, and directly call C-level code to handle it. On
- * the other hand. calls to functions like PUSH are done directly by code
- * in av.c etc, which we can't bypass. So the best we can do is to provide
+ * the other hand, calls to functions like PUSH are done directly by code
+ * in av.c, etc., which we can't bypass. So the best we can do is to provide
  * XS versions of these functions. We also have to attach a tie object,
  * blessed into the class threads::shared::tie, to keep the method-calling
  * code happy.
@@ -53,7 +55,7 @@
  *   FLAGS = (PADMY,GMG,SMG)
  *   MAGIC = 0x824d88
  *     MG_TYPE = PERL_MAGIC_shared_scalar(n)
- *     MG_PTR = 0x810358		<<<< pointer to the shared SV
+ *     MG_PTR = 0x810358                <<<< pointer to the shared SV
  *
  * -----------------
  *
@@ -63,14 +65,14 @@
  *   FLAGS = (PADMY,RMG)
  *   MAGIC = 0x824e48
  *     MG_TYPE = PERL_MAGIC_tied(P)
- *     MG_OBJ = 0x7136e0		<<<< ref to the tied object
+ *     MG_OBJ = 0x7136e0                <<<< ref to the tied object
  *     SV = RV(0x7136f0) at 0x7136e0
  *       RV = 0x738640
  *       SV = PVMG(0x7ba238) at 0x738640 <<<< the tied object
  *         FLAGS = (OBJECT,IOK,pIOK)
- *         IV = 8455000			<<<< pointer to the shared AV
+ *         IV = 8455000                 <<<< pointer to the shared AV
  *         STASH = 0x80abf0 "threads::shared::tie"
- *     MG_PTR = 0x810358 ""		<<<< another pointer to the shared AV
+ *     MG_PTR = 0x810358 ""             <<<< another pointer to the shared AV
  *   ARRAY = 0x0
  *
  * -----------------
@@ -81,42 +83,60 @@
  *   FLAGS = (GMG,SMG,RMG,pIOK)
  *   MAGIC = 0x72bd58
  *     MG_TYPE = PERL_MAGIC_shared_scalar(n)
- *     MG_PTR = 0x8103c0 ""		<<<< pointer to the shared element
+ *     MG_PTR = 0x8103c0 ""             <<<< pointer to the shared element
  *   MAGIC = 0x72bd18
  *     MG_TYPE = PERL_MAGIC_tiedelem(p)
- *     MG_OBJ = 0x7136e0		<<<< ref to the tied object
+ *     MG_OBJ = 0x7136e0                <<<< ref to the tied object
  *     SV = RV(0x7136f0) at 0x7136e0
  *       RV = 0x738660
  *       SV = PVMG(0x7ba278) at 0x738660 <<<< the tied object
  *         FLAGS = (OBJECT,IOK,pIOK)
- *         IV = 8455064			<<<< pointer to the shared AV
+ *         IV = 8455064                 <<<< pointer to the shared AV
  *         STASH = 0x80ac30 "threads::shared::tie"
  *   TYPE = t
  *
  * Note that PERL_MAGIC_tiedelem(p) magic doesn't have a pointer to a
  * shared SV in mg_ptr; instead this is used to store the hash key,
  * if any, like normal tied elements. Note also that element SVs may have
- * pointers to both the shared aggregate and the shared element
+ * pointers to both the shared aggregate and the shared element.
  *
  *
  * Userland locks:
  *
- * if a shared variable is used as a perl-level lock or condition
+ * If a shared variable is used as a perl-level lock or condition
  * variable, then PERL_MAGIC_ext magic is attached to the associated
- * *shared* SV, whose mg_ptr field points to a malloced structure
+ * *shared* SV, whose mg_ptr field points to a malloc'ed structure
  * containing the necessary mutexes and condition variables.
  *
  * Nomenclature:
  *
- * In this file, any variable name prefixed with 's', eg ssv, stmp or sobj,
- * usually represents a shared SV which correspondis to a private SV named
- * without the prefix, eg sv, tmp or obj.
+ * In this file, any variable name prefixed with 's' (e.g., ssv, stmp or sobj)
+ * usually represents a shared SV which corresponds to a private SV named
+ * without the prefix (e.g., sv, tmp or obj).
+ */
+
+/* Patch status:
+ *
+ * Perl 5.8.8 contains threads::shared patches up to 26626 (equivalent to
+ * blead patches 26350+26351).
+ *
+ * The CPAN version of threads::shared contains the following blead patches:
+ *      26569 (applicable to 5.9.3 only)
+ *      26684
+ *      26693
+ *      26695
  */
 
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
+#ifdef HAS_PPPORT_H
+#define NEED_vnewSVpvf
+#define NEED_warner
+#  include "ppport.h"
+#  include "shared.h"
+#endif
 
 #ifdef USE_ITHREADS
 
@@ -126,46 +146,45 @@
 PerlInterpreter *PL_sharedsv_space;             /* The shared sv space */
 /* To access shared space we fake aTHX in this scope and thread's context */
 
-/* bug #24255: we include ENTER+SAVETMPS/FREETMPS+LEAVE with
- * SHARED_CONTEXT/CALLER_CONTEXT macros, so that any mortals etc created
+/* Bug #24255: We include ENTER+SAVETMPS/FREETMPS+LEAVE with
+ * SHARED_CONTEXT/CALLER_CONTEXT macros, so that any mortals, etc. created
  * while in the shared interpreter context don't languish */
 
-#define SHARED_CONTEXT \
-    STMT_START {					\
-	PERL_SET_CONTEXT((aTHX = PL_sharedsv_space));	\
-	ENTER;						\
-	SAVETMPS;					\
+#define SHARED_CONTEXT                                  \
+    STMT_START {                                        \
+        PERL_SET_CONTEXT((aTHX = PL_sharedsv_space));   \
+        ENTER;                                          \
+        SAVETMPS;                                       \
     } STMT_END
 
 /* So we need a way to switch back to the caller's context... */
 /* So we declare _another_ copy of the aTHX variable ... */
 #define dTHXc PerlInterpreter *caller_perl = aTHX
 
-/* and use it to switch back */
-#define CALLER_CONTEXT					\
-    STMT_START {					\
-    	FREETMPS;					\
-	LEAVE;						\
-	PERL_SET_CONTEXT((aTHX = caller_perl));		\
+/* ... and use it to switch back */
+#define CALLER_CONTEXT                                  \
+    STMT_START {                                        \
+        FREETMPS;                                       \
+        LEAVE;                                          \
+        PERL_SET_CONTEXT((aTHX = caller_perl));         \
     } STMT_END
 
 /*
  * Only one thread at a time is allowed to mess with shared space.
  */
 
-typedef struct
-{
- perl_mutex		 mutex;
- PerlInterpreter	*owner;
- I32			 locks;
- perl_cond		 cond;
+typedef struct {
+    perl_mutex          mutex;
+    PerlInterpreter    *owner;
+    I32                 locks;
+    perl_cond           cond;
 #ifdef DEBUG_LOCKS
- char *			 file;
- int			 line;
+    char *              file;
+    int                 line;
 #endif
 } recursive_lock_t;
 
-recursive_lock_t PL_sharedsv_lock;       /* Mutex protecting the shared sv space */
+recursive_lock_t PL_sharedsv_lock;   /* Mutex protecting the shared sv space */
 
 void
 recursive_lock_init(pTHX_ recursive_lock_t *lock)
@@ -187,77 +206,76 @@ recursive_lock_release(pTHX_ recursive_lock_t *lock)
 {
     MUTEX_LOCK(&lock->mutex);
     if (lock->owner != aTHX) {
-	MUTEX_UNLOCK(&lock->mutex);
-    }
-    else {
-	if (--lock->locks == 0) {
-	    lock->owner = NULL;
-	    COND_SIGNAL(&lock->cond);
-	}
+        MUTEX_UNLOCK(&lock->mutex);
+    } else if (--lock->locks == 0) {
+        lock->owner = NULL;
+        COND_SIGNAL(&lock->cond);
     }
     MUTEX_UNLOCK(&lock->mutex);
 }
 
 void
-recursive_lock_acquire(pTHX_ recursive_lock_t *lock,char *file,int line)
+recursive_lock_acquire(pTHX_ recursive_lock_t *lock, char *file, int line)
 {
     assert(aTHX);
     MUTEX_LOCK(&lock->mutex);
     if (lock->owner == aTHX) {
-	lock->locks++;
-    }
-    else {
-	while (lock->owner) {
+        lock->locks++;
+    } else {
+        while (lock->owner) {
 #ifdef DEBUG_LOCKS
-	    Perl_warn(aTHX_ " %p waiting - owned by %p %s:%d\n",
-		      aTHX, lock->owner, lock->file, lock->line);
+            Perl_warn(aTHX_ " %p waiting - owned by %p %s:%d\n",
+                      aTHX, lock->owner, lock->file, lock->line);
 #endif
-	    COND_WAIT(&lock->cond,&lock->mutex);
+            COND_WAIT(&lock->cond,&lock->mutex);
         }
-	lock->locks = 1;
-	lock->owner = aTHX;
+        lock->locks = 1;
+        lock->owner = aTHX;
 #ifdef DEBUG_LOCKS
-	lock->file  = file;
-	lock->line  = line;
+        lock->file  = file;
+        lock->line  = line;
 #endif
     }
     MUTEX_UNLOCK(&lock->mutex);
     SAVEDESTRUCTOR_X(recursive_lock_release,lock);
 }
 
-#define ENTER_LOCK         STMT_START { \
-			      ENTER; \
-			      recursive_lock_acquire(aTHX_ &PL_sharedsv_lock, __FILE__, __LINE__);   \
-                            } STMT_END
+#define ENTER_LOCK                                                          \
+    STMT_START {                                                            \
+        ENTER;                                                              \
+        recursive_lock_acquire(aTHX_ &PL_sharedsv_lock, __FILE__, __LINE__);\
+    } STMT_END
 
-/* the unlocking is done automatically at scope exit */
-#define LEAVE_LOCK       LEAVE
+/* The unlocking is done automatically at scope exit */
+#define LEAVE_LOCK      LEAVE
 
 
 /* A common idiom is to acquire access and switch in ... */
-#define SHARED_EDIT	    STMT_START {	\
-				ENTER_LOCK;	\
-				SHARED_CONTEXT;	\
-			    } STMT_END
+#define SHARED_EDIT     \
+    STMT_START {        \
+        ENTER_LOCK;     \
+        SHARED_CONTEXT; \
+    } STMT_END
 
-/* then switch out and release access. */
-#define SHARED_RELEASE     STMT_START {	\
-		                CALLER_CONTEXT;	\
-				LEAVE_LOCK;	\
-			    } STMT_END
+/* ... then switch out and release access. */
+#define SHARED_RELEASE  \
+    STMT_START {        \
+        CALLER_CONTEXT; \
+        LEAVE_LOCK;     \
+    } STMT_END
 
 
-/* user-level locks:
+/* User-level locks:
    This structure is attached (using ext magic) to any shared SV that
    is used by user-level locking or condition code
 */
 
 typedef struct {
-    recursive_lock_t    lock;		/* for user-levl locks */
+    recursive_lock_t    lock;           /* For user-levl locks */
     perl_cond           user_cond;      /* For user-level conditions */
 } user_lock;
 
-/* magic used for attaching user_lock structs to shared SVs
+/* Magic used for attaching user_lock structs to shared SVs
 
    The vtable used has just one entry - when the SV goes away
    we free the memory for the above.
@@ -269,53 +287,58 @@ sharedsv_userlock_free(pTHX_ SV *sv, MAGIC *mg)
     user_lock *ul = (user_lock *) mg->mg_ptr;
     assert(aTHX == PL_sharedsv_space);
     if (ul) {
-	recursive_lock_destroy(aTHX_ &ul->lock);
-	COND_DESTROY(&ul->user_cond);
-	PerlMemShared_free(ul);
-	mg->mg_ptr = NULL;
+        recursive_lock_destroy(aTHX_ &ul->lock);
+        COND_DESTROY(&ul->user_cond);
+        PerlMemShared_free(ul);
+        mg->mg_ptr = NULL;
     }
-    return 0;
+    return (0);
 }
 
-MGVTBL sharedsv_uesrlock_vtbl = {
- 0,				/* get */
- 0,				/* set */
- 0,				/* len */
- 0,				/* clear */
- sharedsv_userlock_free,	/* free */
- 0,				/* copy */
- 0,				/* dup */
- 0				/* local */
+MGVTBL sharedsv_userlock_vtbl = {
+    0,                          /* get */
+    0,                          /* set */
+    0,                          /* len */
+    0,                          /* clear */
+    sharedsv_userlock_free,     /* free */
+    0,                          /* copy */
+    0,                          /* dup */
+#ifdef MGf_LOCAL
+    0,                          /* local */
+#endif
 };
 
-/* Access to shared things is heavily based on MAGIC - in mg.h/mg.c/sv.c sense */
+/*
+ * Access to shared things is heavily based on MAGIC
+ *      - in mg.h/mg.c/sv.c sense
+ */
 
 /* In any thread that has access to a shared thing there is a "proxy"
    for it in its own space which has 'MAGIC' associated which accesses
    the shared thing.
  */
 
-MGVTBL sharedsv_scalar_vtbl;    /* scalars have this vtable */
-MGVTBL sharedsv_array_vtbl;     /* hashes and arrays have this - like 'tie' */
-MGVTBL sharedsv_elem_vtbl;      /* elements of hashes and arrays have this
-				   _AS WELL AS_ the scalar magic:
+MGVTBL sharedsv_scalar_vtbl;    /* Scalars have this vtable */
+MGVTBL sharedsv_array_vtbl;     /* Hashes and arrays have this - like 'tie' */
+MGVTBL sharedsv_elem_vtbl;      /* Elements of hashes and arrays have this
+                                   _AS WELL AS_ the scalar magic:
    The sharedsv_elem_vtbl associates the element with the array/hash and
    the sharedsv_scalar_vtbl associates it with the value
  */
 
 
-/* get shared aggregate SV pointed to by threads::shared::tie magic object */
+/* Get shared aggregate SV pointed to by threads::shared::tie magic object */
 
 STATIC SV *
 S_sharedsv_from_obj(pTHX_ SV *sv)
 {
-     return SvROK(sv) ? INT2PTR(SV *, SvIV(SvRV(sv))) : NULL;
+     return ((SvROK(sv)) ? INT2PTR(SV *, SvIV(SvRV(sv))) : NULL);
 }
 
 
 /* Return the user_lock structure (if any) associated with a shared SV.
- * If create is true, create one if it doesn't exist */
-
+ * If create is true, create one if it doesn't exist
+ */
 STATIC user_lock *
 S_get_userlock(pTHX_ SV* ssv, bool create)
 {
@@ -323,26 +346,26 @@ S_get_userlock(pTHX_ SV* ssv, bool create)
     user_lock *ul = NULL;
 
     assert(ssv);
-    /* XXX redsign the storage of user locks so we dont need a global
+    /* XXX Redesign the storage of user locks so we don't need a global
      * lock to access them ???? DAPM */
     ENTER_LOCK;
     mg = mg_find(ssv, PERL_MAGIC_ext);
-    if (mg)
-	ul = (user_lock*)(mg->mg_ptr);
-    else if (create) {
-	dTHXc;
-	SHARED_CONTEXT;
-	ul = (user_lock *) PerlMemShared_malloc(sizeof(user_lock));
-	Zero(ul, 1, user_lock);
-	/* attach to shared SV using ext magic */
-	sv_magicext(ssv, NULL, PERL_MAGIC_ext, &sharedsv_uesrlock_vtbl,
-	       (char *)ul, 0);
-	recursive_lock_init(aTHX_ &ul->lock);
-	COND_INIT(&ul->user_cond);
-	CALLER_CONTEXT;
+    if (mg) {
+        ul = (user_lock*)(mg->mg_ptr);
+    } else if (create) {
+        dTHXc;
+        SHARED_CONTEXT;
+        ul = (user_lock *) PerlMemShared_malloc(sizeof(user_lock));
+        Zero(ul, 1, user_lock);
+        /* Attach to shared SV using ext magic */
+        sv_magicext(ssv, NULL, PERL_MAGIC_ext, &sharedsv_userlock_vtbl,
+               (char *)ul, 0);
+        recursive_lock_init(aTHX_ &ul->lock);
+        COND_INIT(&ul->user_cond);
+        CALLER_CONTEXT;
     }
     LEAVE_LOCK;
-    return ul;
+    return (ul);
 }
 
 
@@ -358,36 +381,37 @@ Perl_sharedsv_find(pTHX_ SV *sv)
 {
     MAGIC *mg;
     if (SvTYPE(sv) >= SVt_PVMG) {
-	switch(SvTYPE(sv)) {
-	case SVt_PVAV:
-	case SVt_PVHV:
-	    if ((mg = mg_find(sv, PERL_MAGIC_tied))
-		&& mg->mg_virtual == &sharedsv_array_vtbl) {
-		return (SV *) mg->mg_ptr;
-	    }
-	    break;
-	default:
-	    /* This should work for elements as well as they
-	     * have scalar magic as well as their element magic
-	     */
-	    if ((mg = mg_find(sv, PERL_MAGIC_shared_scalar))
-		&& mg->mg_virtual == &sharedsv_scalar_vtbl) {
-		return (SV *) mg->mg_ptr;
-	    }
-	    break;
-	}
+        switch(SvTYPE(sv)) {
+        case SVt_PVAV:
+        case SVt_PVHV:
+            if ((mg = mg_find(sv, PERL_MAGIC_tied))
+                && mg->mg_virtual == &sharedsv_array_vtbl) {
+                return ((SV *)mg->mg_ptr);
+            }
+            break;
+        default:
+            /* This should work for elements as well as they
+             * have scalar magic as well as their element magic
+             */
+            if ((mg = mg_find(sv, PERL_MAGIC_shared_scalar))
+                && mg->mg_virtual == &sharedsv_scalar_vtbl) {
+                return ((SV *)mg->mg_ptr);
+            }
+            break;
+        }
     }
     /* Just for tidyness of API also handle tie objects */
     if (SvROK(sv) && sv_derived_from(sv, "threads::shared::tie")) {
-	return S_sharedsv_from_obj(aTHX_ sv);
+        return (S_sharedsv_from_obj(aTHX_ sv));
     }
-    return NULL;
+    return (NULL);
 }
 
 
-/* associate a private SV  with a shared SV by pointing the appropriate
- * magics at it.  Assumes lock is held */
-
+/* Associate a private SV  with a shared SV by pointing the appropriate
+ * magics at it.
+ * Assumes lock is held.
+ */
 void
 Perl_sharedsv_associate(pTHX_ SV *sv, SV *ssv)
 {
@@ -403,46 +427,51 @@ Perl_sharedsv_associate(pTHX_ SV *sv, SV *ssv)
     switch(SvTYPE(sv)) {
     case SVt_PVAV:
     case SVt_PVHV:
-	if (!(mg = mg_find(sv, PERL_MAGIC_tied))
-	    || mg->mg_virtual != &sharedsv_array_vtbl
-	    || (SV*) mg->mg_ptr != ssv)
-	{
-	    SV *obj = newSV(0);
-	    sv_setref_iv(obj, "threads::shared::tie",PTR2IV(ssv));
-	    if (mg) {
-		sv_unmagic(sv, PERL_MAGIC_tied);
-	    }
-	    mg = sv_magicext(sv, obj, PERL_MAGIC_tied, &sharedsv_array_vtbl,
-			    (char *) ssv, 0);
-	    mg->mg_flags |= (MGf_COPY|MGf_DUP);
-	    SvREFCNT_inc(ssv);
-	    SvREFCNT_dec(obj);
-	}
-	break;
+        if (!(mg = mg_find(sv, PERL_MAGIC_tied))
+            || mg->mg_virtual != &sharedsv_array_vtbl
+            || (SV*) mg->mg_ptr != ssv)
+        {
+            SV *obj = newSV(0);
+            sv_setref_iv(obj, "threads::shared::tie", PTR2IV(ssv));
+            if (mg) {
+                sv_unmagic(sv, PERL_MAGIC_tied);
+            }
+            mg = sv_magicext(sv, obj, PERL_MAGIC_tied, &sharedsv_array_vtbl,
+                            (char *)ssv, 0);
+            mg->mg_flags |= (MGf_COPY|MGf_DUP);
+            SvREFCNT_inc_void(ssv);
+            SvREFCNT_dec(obj);
+        }
+        break;
 
     default:
-	if ((SvTYPE(sv) < SVt_PVMG)
-	    || !(mg = mg_find(sv, PERL_MAGIC_shared_scalar))
-	    || mg->mg_virtual != &sharedsv_scalar_vtbl
-	    || (SV*) mg->mg_ptr != ssv)
-	{
-	    if (mg) {
-		sv_unmagic(sv, PERL_MAGIC_shared_scalar);
-	    }
-	    mg = sv_magicext(sv, Nullsv, PERL_MAGIC_shared_scalar,
-			    &sharedsv_scalar_vtbl, (char *)ssv, 0);
-	    mg->mg_flags |= (MGf_DUP|MGf_LOCAL);
-	    SvREFCNT_inc(ssv);
-	}
-	break;
+        if ((SvTYPE(sv) < SVt_PVMG)
+            || !(mg = mg_find(sv, PERL_MAGIC_shared_scalar))
+            || mg->mg_virtual != &sharedsv_scalar_vtbl
+            || (SV*) mg->mg_ptr != ssv)
+        {
+            if (mg) {
+                sv_unmagic(sv, PERL_MAGIC_shared_scalar);
+            }
+            mg = sv_magicext(sv, Nullsv, PERL_MAGIC_shared_scalar,
+                            &sharedsv_scalar_vtbl, (char *)ssv, 0);
+            mg->mg_flags |= (MGf_DUP
+#ifdef MGf_LOCAL
+                                    |MGf_LOCAL
+#endif
+                            );
+            SvREFCNT_inc_void(ssv);
+        }
+        break;
     }
+
     assert ( Perl_sharedsv_find(aTHX_ sv) == ssv );
 }
 
 
 /* Given a private SV, create and return an associated shared SV.
- * Assumes lock is held */
-
+ * Assumes lock is held.
+ */
 STATIC SV *
 S_sharedsv_new_shared(pTHX_ SV *sv)
 {
@@ -454,17 +483,17 @@ S_sharedsv_new_shared(pTHX_ SV *sv)
 
     SHARED_CONTEXT;
     ssv = newSV(0);
-    SvREFCNT(ssv) = 0; /* will be upped to 1 by Perl_sharedsv_associate */
+    SvREFCNT(ssv) = 0; /* Will be upped to 1 by Perl_sharedsv_associate */
     sv_upgrade(ssv, SvTYPE(sv));
     CALLER_CONTEXT;
     Perl_sharedsv_associate(aTHX_ sv, ssv);
-    return ssv;
+    return (ssv);
 }
 
 
 /* Given a shared SV, create and return an associated private SV.
- * Assumes lock is held */
-
+ * Assumes lock is held.
+ */
 STATIC SV *
 S_sharedsv_new_private(pTHX_ SV *ssv)
 {
@@ -476,56 +505,57 @@ S_sharedsv_new_private(pTHX_ SV *ssv)
     sv = newSV(0);
     sv_upgrade(sv, SvTYPE(ssv));
     Perl_sharedsv_associate(aTHX_ sv, ssv);
-    return sv;
+    return (sv);
 }
 
 
-/* a threadsafe version of SvREFCNT_dec(ssv) */
+/* A threadsafe version of SvREFCNT_dec(ssv) */
 
 STATIC void
 S_sharedsv_dec(pTHX_ SV* ssv)
 {
-    if (!ssv)
-	return;
+    if (! ssv)
+        return;
     ENTER_LOCK;
     if (SvREFCNT(ssv) > 1) {
-	/* no side effects, so can do it lightweight */
-	SvREFCNT_dec(ssv);
-    }
-    else {
-	dTHXc;
-	SHARED_CONTEXT;
-	SvREFCNT_dec(ssv);
-	CALLER_CONTEXT;
+        /* No side effects, so can do it lightweight */
+        SvREFCNT_dec(ssv);
+    } else {
+        dTHXc;
+        SHARED_CONTEXT;
+        SvREFCNT_dec(ssv);
+        CALLER_CONTEXT;
     }
     LEAVE_LOCK;
 }
 
-/* implements Perl-level share() and :shared */
+
+/* Implements Perl-level share() and :shared */
 
 void
 Perl_sharedsv_share(pTHX_ SV *sv)
 {
     switch(SvTYPE(sv)) {
     case SVt_PVGV:
-	Perl_croak(aTHX_ "Cannot share globs yet");
-	break;
+        Perl_croak(aTHX_ "Cannot share globs yet");
+        break;
 
     case SVt_PVCV:
-	Perl_croak(aTHX_ "Cannot share subs yet");
-	break;
+        Perl_croak(aTHX_ "Cannot share subs yet");
+        break;
 
     default:
-	ENTER_LOCK;
-	(void) S_sharedsv_new_shared(aTHX_ sv);
-	LEAVE_LOCK;
-	SvSETMAGIC(sv);
-	break;
+        ENTER_LOCK;
+        (void) S_sharedsv_new_shared(aTHX_ sv);
+        LEAVE_LOCK;
+        SvSETMAGIC(sv);
+        break;
     }
 }
 
+
 #if defined(WIN32) || defined(OS2)
-#  define ABS2RELMILLI(abs)        \
+#  define ABS2RELMILLI(abs)             \
     do {                                \
         abs -= (double)time(NULL);      \
         if (abs > 0) { abs *= 1000; }   \
@@ -533,7 +563,7 @@ Perl_sharedsv_share(pTHX_ SV *sv)
     } while (0)
 #endif /* WIN32 || OS2 */
 
-/* do OS-specific condition timed wait */
+/* Do OS-specific condition timed wait */
 
 bool
 Perl_sharedsv_cond_timedwait(perl_cond *cond, perl_mutex *mut, double abs)
@@ -559,7 +589,7 @@ Perl_sharedsv_cond_timedwait(perl_cond *cond, perl_mutex *mut, double abs)
     }
     MUTEX_LOCK(mut);
     cond->waiters--;
-    return got_it;
+    return (got_it);
 #  else
 #    ifdef OS2
     int rc, got_it = 0;
@@ -575,8 +605,8 @@ Perl_sharedsv_cond_timedwait(perl_cond *cond, perl_mutex *mut, double abs)
         croak_with_os2error("panic: cond_timedwait");
     if (rc == ERROR_INTERRUPT) errno = EINTR;
     MUTEX_LOCK(mut);
-    return got_it;
-#    else         /* hope you're I_PTHREAD! */
+    return (got_it);
+#    else         /* Hope you're I_PTHREAD! */
     struct timespec ts;
     int got_it = 0;
 
@@ -589,69 +619,65 @@ Perl_sharedsv_cond_timedwait(perl_cond *cond, perl_mutex *mut, double abs)
         case ETIMEDOUT:             break;
 #ifdef OEMVS
         case -1:
-	  if (errno == ETIMEDOUT || errno == EAGAIN)
-	    break;
+            if (errno == ETIMEDOUT || errno == EAGAIN)
+                break;
 #endif
         default:
             Perl_croak_nocontext("panic: cond_timedwait");
             break;
     }
-    return got_it;
+    return (got_it);
 #    endif /* OS2 */
 #  endif /* WIN32 */
 #endif /* NETWARE || FAKE_THREADS || I_MACH_CTHREADS */
 }
 
 
-/* given a shared RV, copy it's value to a private RV, also coping the
+/* Given a shared RV, copy it's value to a private RV, also copying the
  * object status of the referent.
  * If the private side is already an appropriate RV->SV combination, keep
  * it if possible.
  */
-
 STATIC void
 S_get_RV(pTHX_ SV *sv, SV *ssv) {
     SV *sobj = SvRV(ssv);
     SV *obj;
-    if ( ! (   SvROK(sv)
-	    && ((obj = SvRV(sv)))
-	    && (Perl_sharedsv_find(aTHX_ obj) == sobj)
-	    && (SvTYPE(obj) == SvTYPE(sobj))
-	    )
-	)
+    if (! (SvROK(sv) &&
+           ((obj = SvRV(sv))) &&
+           (Perl_sharedsv_find(aTHX_ obj) == sobj) &&
+           (SvTYPE(obj) == SvTYPE(sobj))))
     {
-    	/* can't reuse obj */
-	if (SvROK(sv))  {
-	    SvREFCNT_dec(SvRV(sv));
-	}
-	else {
-	    assert(SvTYPE(sv) >= SVt_RV);
-	    sv_setsv_nomg(sv, &PL_sv_undef);
-	    SvROK_on(sv);
-	}
-	obj = S_sharedsv_new_private(aTHX_ SvRV(ssv));
-	SvRV_set(sv, obj);
+        /* Can't reuse obj */
+        if (SvROK(sv)) {
+            SvREFCNT_dec(SvRV(sv));
+        } else {
+            assert(SvTYPE(sv) >= SVt_RV);
+            sv_setsv_nomg(sv, &PL_sv_undef);
+            SvROK_on(sv);
+        }
+        obj = S_sharedsv_new_private(aTHX_ SvRV(ssv));
+        SvRV_set(sv, obj);
     }
 
     if (SvOBJECT(obj)) {
-	/* remove any old blessing */
-	SvREFCNT_dec(SvSTASH(obj));
-	SvOBJECT_off(obj);
+        /* Remove any old blessing */
+        SvREFCNT_dec(SvSTASH(obj));
+        SvOBJECT_off(obj);
     }
     if (SvOBJECT(sobj)) {
-	/* add any new old blessing */
-	STRLEN len;
-	char* stash_ptr = SvPV((SV*) SvSTASH(sobj), len);
-	HV* stash = gv_stashpvn(stash_ptr, len, TRUE);
-	SvOBJECT_on(obj);
-	SvSTASH_set(obj, (HV*)SvREFCNT_inc(stash));
+        /* Add any new old blessing */
+        STRLEN len;
+        char* stash_ptr = SvPV((SV*) SvSTASH(sobj), len);
+        HV* stash = gv_stashpvn(stash_ptr, len, TRUE);
+        SvOBJECT_on(obj);
+        SvSTASH_set(obj, (HV*)SvREFCNT_inc(stash));
     }
 }
 
 
 /* ------------ PERL_MAGIC_shared_scalar(n) functions -------------- */
 
-/* get magic for PERL_MAGIC_shared_scalar(n) */
+/* Get magic for PERL_MAGIC_shared_scalar(n) */
 
 int
 sharedsv_scalar_mg_get(pTHX_ SV *sv, MAGIC *mg)
@@ -661,19 +687,18 @@ sharedsv_scalar_mg_get(pTHX_ SV *sv, MAGIC *mg)
 
     ENTER_LOCK;
     if (SvROK(ssv)) {
-	S_get_RV(aTHX_ sv, ssv);
-    }
-    else {
-	sv_setsv_nomg(sv, ssv);
+        S_get_RV(aTHX_ sv, ssv);
+    } else {
+        sv_setsv_nomg(sv, ssv);
     }
     LEAVE_LOCK;
-    return 0;
+    return (0);
 }
 
-/* copy the contents of a private SV to a shared SV:
- * used by various mg_set()-type functions.
- * Assumes lock is held */
-
+/* Copy the contents of a private SV to a shared SV.
+ * Used by various mg_set()-type functions.
+ * Assumes lock is held.
+ */
 void
 sharedsv_scalar_store(pTHX_ SV *sv, SV *ssv)
 {
@@ -682,43 +707,51 @@ sharedsv_scalar_store(pTHX_ SV *sv, SV *ssv)
 
     assert(PL_sharedsv_lock.owner == aTHX);
     if (SvROK(sv)) {
-	SV *obj = SvRV(sv);
-	SV *sobj = Perl_sharedsv_find(aTHX_ obj);
-	if (sobj) {
-	    SHARED_CONTEXT;
-	    SvUPGRADE(ssv, SVt_RV);
-	    sv_setsv_nomg(ssv, &PL_sv_undef);
-	    
-	    SvRV_set(ssv, SvREFCNT_inc(sobj));
-	    SvROK_on(ssv);
-	    if(SvOBJECT(obj)) {
-	      SV* fake_stash = newSVpv(HvNAME_get(SvSTASH(obj)),0);
-	      SvOBJECT_on(sobj);
-	      SvSTASH_set(sobj, (HV*)fake_stash);
-	    }
-	    CALLER_CONTEXT;
-	}
-	else {
-	    allowed = FALSE;
-	}
-    }
-    else {
+        SV *obj = SvRV(sv);
+        SV *sobj = Perl_sharedsv_find(aTHX_ obj);
+        if (sobj) {
+            SHARED_CONTEXT;
+            SvUPGRADE(ssv, SVt_RV);
+            sv_setsv_nomg(ssv, &PL_sv_undef);
+
+            SvRV_set(ssv, SvREFCNT_inc(sobj));
+            SvROK_on(ssv);
+            if (SvOBJECT(sobj)) {
+                /* Remove any old blessing */
+                SvREFCNT_dec(SvSTASH(sobj));
+                SvOBJECT_off(sobj);
+            }
+            if (SvOBJECT(obj)) {
+              SV* fake_stash = newSVpv(HvNAME_get(SvSTASH(obj)),0);
+              SvOBJECT_on(sobj);
+              SvSTASH_set(sobj, (HV*)fake_stash);
+            }
+            CALLER_CONTEXT;
+        } else {
+            allowed = FALSE;
+        }
+    } else {
         SvTEMP_off(sv);
-	SHARED_CONTEXT;
-	sv_setsv_nomg(ssv, sv);
-	if(SvOBJECT(sv)) {
-	  SV* fake_stash = newSVpv(HvNAME_get(SvSTASH(sv)),0);
-	  SvOBJECT_on(ssv);
-	  SvSTASH_set(ssv, (HV*)fake_stash);
-	}
-	CALLER_CONTEXT;
+        SHARED_CONTEXT;
+        sv_setsv_nomg(ssv, sv);
+        if (SvOBJECT(ssv)) {
+            /* Remove any old blessing */
+            SvREFCNT_dec(SvSTASH(ssv));
+            SvOBJECT_off(ssv);
+        }
+        if (SvOBJECT(sv)) {
+          SV* fake_stash = newSVpv(HvNAME_get(SvSTASH(sv)),0);
+          SvOBJECT_on(ssv);
+          SvSTASH_set(ssv, (HV*)fake_stash);
+        }
+        CALLER_CONTEXT;
     }
     if (!allowed) {
-	Perl_croak(aTHX_ "Invalid value for shared scalar");
+        Perl_croak(aTHX_ "Invalid value for shared scalar");
     }
 }
 
-/* set magic for PERL_MAGIC_shared_scalar(n) */
+/* Set magic for PERL_MAGIC_shared_scalar(n) */
 
 int
 sharedsv_scalar_mg_set(pTHX_ SV *sv, MAGIC *mg)
@@ -727,23 +760,23 @@ sharedsv_scalar_mg_set(pTHX_ SV *sv, MAGIC *mg)
     assert(ssv);
     ENTER_LOCK;
     if (SvTYPE(ssv) < SvTYPE(sv)) {
-	dTHXc;
-	SHARED_CONTEXT;
-	sv_upgrade(ssv, SvTYPE(sv));
-	CALLER_CONTEXT;
+        dTHXc;
+        SHARED_CONTEXT;
+        sv_upgrade(ssv, SvTYPE(sv));
+        CALLER_CONTEXT;
     }
     sharedsv_scalar_store(aTHX_ sv, ssv);
     LEAVE_LOCK;
-    return 0;
+    return (0);
 }
 
-/* free magic for PERL_MAGIC_shared_scalar(n) */
+/* Free magic for PERL_MAGIC_shared_scalar(n) */
 
 int
 sharedsv_scalar_mg_free(pTHX_ SV *sv, MAGIC *mg)
 {
     S_sharedsv_dec(aTHX_ (SV*)mg->mg_ptr);
-    return 0;
+    return (0);
 }
 
 /*
@@ -752,10 +785,11 @@ sharedsv_scalar_mg_free(pTHX_ SV *sv, MAGIC *mg)
 int
 sharedsv_scalar_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param)
 {
-    SvREFCNT_inc(mg->mg_ptr);
-    return 0;
+    SvREFCNT_inc_void(mg->mg_ptr);
+    return (0);
 }
 
+#ifdef MGf_LOCAL
 /*
  * Called during local $shared
  */
@@ -765,32 +799,35 @@ sharedsv_scalar_mg_local(pTHX_ SV* nsv, MAGIC *mg)
     MAGIC *nmg;
     SV *ssv = (SV *) mg->mg_ptr;
     if (ssv) {
-	ENTER_LOCK;
-	SvREFCNT_inc(ssv);
-	LEAVE_LOCK;
+        ENTER_LOCK;
+        SvREFCNT_inc_void(ssv);
+        LEAVE_LOCK;
     }
     nmg = sv_magicext(nsv, mg->mg_obj, mg->mg_type, mg->mg_virtual,
-			    mg->mg_ptr, mg->mg_len);
+                           mg->mg_ptr, mg->mg_len);
     nmg->mg_flags   = mg->mg_flags;
     nmg->mg_private = mg->mg_private;
 
-    return 0;
+    return (0);
 }
+#endif
 
 MGVTBL sharedsv_scalar_vtbl = {
- sharedsv_scalar_mg_get,	/* get */
- sharedsv_scalar_mg_set,	/* set */
- 0,				/* len */
- 0,				/* clear */
- sharedsv_scalar_mg_free,	/* free */
- 0,				/* copy */
- sharedsv_scalar_mg_dup,	/* dup */
- sharedsv_scalar_mg_local	/* local */
+    sharedsv_scalar_mg_get,     /* get */
+    sharedsv_scalar_mg_set,     /* set */
+    0,                          /* len */
+    0,                          /* clear */
+    sharedsv_scalar_mg_free,    /* free */
+    0,                          /* copy */
+    sharedsv_scalar_mg_dup,     /* dup */
+#ifdef MGf_LOCAL
+    sharedsv_scalar_mg_local,   /* local */
+#endif
 };
 
 /* ------------ PERL_MAGIC_tiedelem(p) functions -------------- */
 
-/* get magic for PERL_MAGIC_tiedelem(p) */
+/* Get magic for PERL_MAGIC_tiedelem(p) */
 
 int
 sharedsv_elem_mg_FETCH(pTHX_ SV *sv, MAGIC *mg)
@@ -801,42 +838,39 @@ sharedsv_elem_mg_FETCH(pTHX_ SV *sv, MAGIC *mg)
 
     ENTER_LOCK;
     if (SvTYPE(saggregate) == SVt_PVAV) {
-	assert ( mg->mg_ptr == 0 );
-	SHARED_CONTEXT;
-	svp = av_fetch((AV*) saggregate, mg->mg_len, 0);
-    }
-    else {
-	char *key = mg->mg_ptr;
-	STRLEN len = mg->mg_len;
-	assert ( mg->mg_ptr != 0 );
-	if (mg->mg_len == HEf_SVKEY) {
-	   key = SvPV((SV *) mg->mg_ptr, len);
-	}
-	SHARED_CONTEXT;
-	svp = hv_fetch((HV*) saggregate, key, len, 0);
+        assert ( mg->mg_ptr == 0 );
+        SHARED_CONTEXT;
+        svp = av_fetch((AV*) saggregate, mg->mg_len, 0);
+    } else {
+        char *key = mg->mg_ptr;
+        STRLEN len = mg->mg_len;
+        assert ( mg->mg_ptr != 0 );
+        if (mg->mg_len == HEf_SVKEY) {
+           key = SvPV((SV *) mg->mg_ptr, len);
+        }
+        SHARED_CONTEXT;
+        svp = hv_fetch((HV*) saggregate, key, len, 0);
     }
     CALLER_CONTEXT;
     if (svp) {
-	/* Exists in the array */
-	if (SvROK(*svp)) {
-	    S_get_RV(aTHX_ sv, *svp);
-	}
-	else {
-	    /* XXX can this branch ever happen? DAPM */
-	    /* XXX assert("no such branch"); */
-	    Perl_sharedsv_associate(aTHX_ sv, *svp);
-	    sv_setsv(sv, *svp);
-	}
-    }
-    else {
-	/* Not in the array */
-	sv_setsv(sv, &PL_sv_undef);
+        /* Exists in the array */
+        if (SvROK(*svp)) {
+            S_get_RV(aTHX_ sv, *svp);
+        } else {
+            /* XXX Can this branch ever happen? DAPM */
+            /* XXX assert("no such branch"); */
+            Perl_sharedsv_associate(aTHX_ sv, *svp);
+            sv_setsv(sv, *svp);
+        }
+    } else {
+        /* Not in the array */
+        sv_setsv(sv, &PL_sv_undef);
     }
     LEAVE_LOCK;
-    return 0;
+    return (0);
 }
 
-/* set magic for PERL_MAGIC_tiedelem(p) */
+/* Set magic for PERL_MAGIC_tiedelem(p) */
 
 int
 sharedsv_elem_mg_STORE(pTHX_ SV *sv, MAGIC *mg)
@@ -851,27 +885,26 @@ sharedsv_elem_mg_STORE(pTHX_ SV *sv, MAGIC *mg)
     ENTER_LOCK;
     assert(saggregate);
     if (SvTYPE(saggregate) == SVt_PVAV) {
-	assert ( mg->mg_ptr == 0 );
-	SHARED_CONTEXT;
-	svp = av_fetch((AV*) saggregate, mg->mg_len, 1);
-    }
-    else {
-	char *key = mg->mg_ptr;
-	STRLEN len = mg->mg_len;
-	assert ( mg->mg_ptr != 0 );
-	if (mg->mg_len == HEf_SVKEY)
-	   key = SvPV((SV *) mg->mg_ptr, len);
-	SHARED_CONTEXT;
-	svp = hv_fetch((HV*) saggregate, key, len, 1);
+        assert ( mg->mg_ptr == 0 );
+        SHARED_CONTEXT;
+        svp = av_fetch((AV*) saggregate, mg->mg_len, 1);
+    } else {
+        char *key = mg->mg_ptr;
+        STRLEN len = mg->mg_len;
+        assert ( mg->mg_ptr != 0 );
+        if (mg->mg_len == HEf_SVKEY)
+           key = SvPV((SV *) mg->mg_ptr, len);
+        SHARED_CONTEXT;
+        svp = hv_fetch((HV*) saggregate, key, len, 1);
     }
     CALLER_CONTEXT;
     Perl_sharedsv_associate(aTHX_ sv, *svp);
     sharedsv_scalar_store(aTHX_ sv, *svp);
     LEAVE_LOCK;
-    return 0;
+    return (0);
 }
 
-/* clear magic for PERL_MAGIC_tiedelem(p) */
+/* Clear magic for PERL_MAGIC_tiedelem(p) */
 
 int
 sharedsv_elem_mg_DELETE(pTHX_ SV *sv, MAGIC *mg)
@@ -882,23 +915,22 @@ sharedsv_elem_mg_DELETE(pTHX_ SV *sv, MAGIC *mg)
     ENTER_LOCK;
     sharedsv_elem_mg_FETCH(aTHX_ sv, mg);
     if ((shmg = mg_find(sv, PERL_MAGIC_shared_scalar)))
-	sharedsv_scalar_mg_get(aTHX_ sv, shmg);
+        sharedsv_scalar_mg_get(aTHX_ sv, shmg);
     if (SvTYPE(saggregate) == SVt_PVAV) {
-	SHARED_CONTEXT;
-	av_delete((AV*) saggregate, mg->mg_len, G_DISCARD);
-    }
-    else {
-	char *key = mg->mg_ptr;
-	STRLEN len = mg->mg_len;
-	assert ( mg->mg_ptr != 0 );
-	if (mg->mg_len == HEf_SVKEY)
-	   key = SvPV((SV *) mg->mg_ptr, len);
-	SHARED_CONTEXT;
-	hv_delete((HV*) saggregate, key, len, G_DISCARD);
+        SHARED_CONTEXT;
+        av_delete((AV*) saggregate, mg->mg_len, G_DISCARD);
+    } else {
+        char *key = mg->mg_ptr;
+        STRLEN len = mg->mg_len;
+        assert ( mg->mg_ptr != 0 );
+        if (mg->mg_len == HEf_SVKEY)
+           key = SvPV((SV *) mg->mg_ptr, len);
+        SHARED_CONTEXT;
+        hv_delete((HV*) saggregate, key, len, G_DISCARD);
     }
     CALLER_CONTEXT;
     LEAVE_LOCK;
-    return 0;
+    return (0);
 }
 
 /* Called during cloning of PERL_MAGIC_tiedelem(p) magic in new
@@ -907,25 +939,27 @@ sharedsv_elem_mg_DELETE(pTHX_ SV *sv, MAGIC *mg)
 int
 sharedsv_elem_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param)
 {
-    SvREFCNT_inc(S_sharedsv_from_obj(aTHX_ mg->mg_obj));
+    SvREFCNT_inc_void(S_sharedsv_from_obj(aTHX_ mg->mg_obj));
     assert(mg->mg_flags & MGf_DUP);
-    return 0;
+    return (0);
 }
 
 MGVTBL sharedsv_elem_vtbl = {
- sharedsv_elem_mg_FETCH,	/* get */
- sharedsv_elem_mg_STORE,	/* set */
- 0,				/* len */
- sharedsv_elem_mg_DELETE,	/* clear */
- 0,				/* free */
- 0,				/* copy */
- sharedsv_elem_mg_dup,		/* dup */
- 0				/* local */
+    sharedsv_elem_mg_FETCH,     /* get */
+    sharedsv_elem_mg_STORE,     /* set */
+    0,                          /* len */
+    sharedsv_elem_mg_DELETE,    /* clear */
+    0,                          /* free */
+    0,                          /* copy */
+    sharedsv_elem_mg_dup,       /* dup */
+#ifdef MGf_LOCAL
+    0,                          /* local */
+#endif
 };
 
 /* ------------ PERL_MAGIC_tied(P) functions -------------- */
 
-/* len magic for PERL_MAGIC_tied(P) */
+/* Len magic for PERL_MAGIC_tied(P) */
 
 U32
 sharedsv_array_mg_FETCHSIZE(pTHX_ SV *sv, MAGIC *mg)
@@ -935,17 +969,16 @@ sharedsv_array_mg_FETCHSIZE(pTHX_ SV *sv, MAGIC *mg)
     U32 val;
     SHARED_EDIT;
     if (SvTYPE(ssv) == SVt_PVAV) {
-	val = av_len((AV*) ssv);
-    }
-    else {
-	/* not actually defined by tie API but ... */
-	val = HvKEYS((HV*) ssv);
+        val = av_len((AV*) ssv);
+    } else {
+        /* Not actually defined by tie API but ... */
+        val = HvKEYS((HV*) ssv);
     }
     SHARED_RELEASE;
-    return val;
+    return (val);
 }
 
-/* clear magic for PERL_MAGIC_tied(P) */
+/* Clear magic for PERL_MAGIC_tied(P) */
 
 int
 sharedsv_array_mg_CLEAR(pTHX_ SV *sv, MAGIC *mg)
@@ -954,38 +987,37 @@ sharedsv_array_mg_CLEAR(pTHX_ SV *sv, MAGIC *mg)
     SV *ssv = (SV *) mg->mg_ptr;
     SHARED_EDIT;
     if (SvTYPE(ssv) == SVt_PVAV) {
-	av_clear((AV*) ssv);
-    }
-    else {
-	hv_clear((HV*) ssv);
+        av_clear((AV*) ssv);
+    } else {
+        hv_clear((HV*) ssv);
     }
     SHARED_RELEASE;
-    return 0;
+    return (0);
 }
 
-/* free magic for PERL_MAGIC_tied(P) */
+/* Free magic for PERL_MAGIC_tied(P) */
 
 int
 sharedsv_array_mg_free(pTHX_ SV *sv, MAGIC *mg)
 {
     S_sharedsv_dec(aTHX_ (SV*)mg->mg_ptr);
-    return 0;
+    return (0);
 }
 
 /*
- * copy magic for PERL_MAGIC_tied(P)
+ * Copy magic for PERL_MAGIC_tied(P)
  * This is called when perl is about to access an element of
  * the array -
  */
 int
 sharedsv_array_mg_copy(pTHX_ SV *sv, MAGIC* mg,
-		       SV *nsv, const char *name, int namlen)
+                       SV *nsv, const char *name, int namlen)
 {
     MAGIC *nmg = sv_magicext(nsv,mg->mg_obj,
-			    toLOWER(mg->mg_type),&sharedsv_elem_vtbl,
-			    name, namlen);
+                            toLOWER(mg->mg_type),&sharedsv_elem_vtbl,
+                            name, namlen);
     nmg->mg_flags |= MGf_DUP;
-    return 1;
+    return (1);
 }
 
 /* Called during cloning of PERL_MAGIC_tied(P) magic in new thread */
@@ -993,20 +1025,22 @@ sharedsv_array_mg_copy(pTHX_ SV *sv, MAGIC* mg,
 int
 sharedsv_array_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param)
 {
-    SvREFCNT_inc((SV*)mg->mg_ptr);
+    SvREFCNT_inc_void((SV*)mg->mg_ptr);
     assert(mg->mg_flags & MGf_DUP);
-    return 0;
+    return (0);
 }
 
 MGVTBL sharedsv_array_vtbl = {
- 0,				/* get */
- 0,				/* set */
- sharedsv_array_mg_FETCHSIZE,	/* len */
- sharedsv_array_mg_CLEAR,	/* clear */
- sharedsv_array_mg_free,	/* free */
- sharedsv_array_mg_copy,	/* copy */
- sharedsv_array_mg_dup,		/* dup */
- 0				/* local */
+    0,                          /* get */
+    0,                          /* set */
+    sharedsv_array_mg_FETCHSIZE,/* len */
+    sharedsv_array_mg_CLEAR,    /* clear */
+    sharedsv_array_mg_free,     /* free */
+    sharedsv_array_mg_copy,     /* copy */
+    sharedsv_array_mg_dup,      /* dup */
+#ifdef MGf_LOCAL
+    0,                          /* local */
+#endif
 };
 
 =for apidoc sharedsv_unlock
@@ -1034,23 +1068,23 @@ void
 Perl_sharedsv_lock(pTHX_ SV *ssv)
 {
     user_lock *ul;
-    if (!ssv)
-	return;
+    if (! ssv)
+        return;
     ul = S_get_userlock(aTHX_ ssv, 1);
     recursive_lock_acquire(aTHX_ &ul->lock, __FILE__, __LINE__);
 }
 
-/* handles calls from lock() builtin via PL_lockhook */
+/* Handles calls from lock() builtin via PL_lockhook */
 
 void
 Perl_sharedsv_locksv(pTHX_ SV *sv)
 {
     SV *ssv;
 
-    if(SvROK(sv))
-	sv = SvRV(sv);
+    if (SvROK(sv))
+        sv = SvRV(sv);
     ssv = Perl_sharedsv_find(aTHX_ sv);
-    if(!ssv)
+    if (!ssv)
        croak("lock can only be used on shared values");
     Perl_sharedsv_lock(aTHX_ ssv);
 }
@@ -1059,26 +1093,26 @@ Perl_sharedsv_locksv(pTHX_ SV *sv)
 
 =for apidoc sharedsv_init
 
-Saves a space for keeping SVs wider than an interpreter,
+Saves a space for keeping SVs wider than an interpreter.
 
 =cut
 
 void
 Perl_sharedsv_init(pTHX)
 {
-  dTHXc;
-  /* This pair leaves us in shared context ... */
-  PL_sharedsv_space = perl_alloc();
-  perl_construct(PL_sharedsv_space);
-  CALLER_CONTEXT;
-  recursive_lock_init(aTHX_ &PL_sharedsv_lock);
-  PL_lockhook = &Perl_sharedsv_locksv;
-  PL_sharehook = &Perl_sharedsv_share;
+    dTHXc;
+    /* This pair leaves us in shared context ... */
+    PL_sharedsv_space = perl_alloc();
+    perl_construct(PL_sharedsv_space);
+    CALLER_CONTEXT;
+    recursive_lock_init(aTHX_ &PL_sharedsv_lock);
+    PL_lockhook = &Perl_sharedsv_locksv;
+    PL_sharehook = &Perl_sharedsv_share;
 }
 
 #endif /* USE_ITHREADS */
 
-MODULE = threads::shared	PACKAGE = threads::shared::tie
+MODULE = threads::shared        PACKAGE = threads::shared::tie
 
 PROTOTYPES: DISABLE
 
@@ -1086,425 +1120,416 @@ PROTOTYPES: DISABLE
 
 void
 PUSH(SV *obj, ...)
-CODE:
-	dTHXc;
-	SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
-	int i;
-	for(i = 1; i < items; i++) {
-	    SV* tmp = newSVsv(ST(i));
-	    SV *stmp;
-	    ENTER_LOCK;
-	    stmp = S_sharedsv_new_shared(aTHX_ tmp);
-	    sharedsv_scalar_store(aTHX_ tmp, stmp);
-	    SHARED_CONTEXT;
-	    av_push((AV*) sobj, stmp);
-	    SvREFCNT_inc(stmp);
-	    SHARED_RELEASE;
-	    SvREFCNT_dec(tmp);
-	}
+    CODE:
+        dTHXc;
+        SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
+        int i;
+        for (i = 1; i < items; i++) {
+            SV* tmp = newSVsv(ST(i));
+            SV *stmp;
+            ENTER_LOCK;
+            stmp = S_sharedsv_new_shared(aTHX_ tmp);
+            sharedsv_scalar_store(aTHX_ tmp, stmp);
+            SHARED_CONTEXT;
+            av_push((AV*) sobj, stmp);
+            SvREFCNT_inc_void(stmp);
+            SHARED_RELEASE;
+            SvREFCNT_dec(tmp);
+        }
+
 
 void
 UNSHIFT(SV *obj, ...)
-CODE:
-	dTHXc;
-	SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
-	int i;
-	ENTER_LOCK;
-	SHARED_CONTEXT;
-	av_unshift((AV*)sobj, items - 1);
-	CALLER_CONTEXT;
-	for(i = 1; i < items; i++) {
-	    SV *tmp = newSVsv(ST(i));
-	    SV *stmp = S_sharedsv_new_shared(aTHX_ tmp);
-	    sharedsv_scalar_store(aTHX_ tmp, stmp);
-	    SHARED_CONTEXT;
-	    av_store((AV*) sobj, i - 1, stmp);
-	    SvREFCNT_inc(stmp);
-	    CALLER_CONTEXT;
-	    SvREFCNT_dec(tmp);
-	}
-	LEAVE_LOCK;
+    CODE:
+        dTHXc;
+        SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
+        int i;
+        ENTER_LOCK;
+        SHARED_CONTEXT;
+        av_unshift((AV*)sobj, items - 1);
+        CALLER_CONTEXT;
+        for (i = 1; i < items; i++) {
+            SV *tmp = newSVsv(ST(i));
+            SV *stmp = S_sharedsv_new_shared(aTHX_ tmp);
+            sharedsv_scalar_store(aTHX_ tmp, stmp);
+            SHARED_CONTEXT;
+            av_store((AV*) sobj, i - 1, stmp);
+            SvREFCNT_inc_void(stmp);
+            CALLER_CONTEXT;
+            SvREFCNT_dec(tmp);
+        }
+        LEAVE_LOCK;
+
 
 void
 POP(SV *obj)
-CODE:
-	dTHXc;
-	SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
-	SV* ssv;
-	ENTER_LOCK;
-	SHARED_CONTEXT;
-	ssv = av_pop((AV*)sobj);
-	CALLER_CONTEXT;
-	ST(0) = sv_newmortal();
-	Perl_sharedsv_associate(aTHX_ ST(0), ssv);
-	SvREFCNT_dec(ssv);
-	LEAVE_LOCK;
-	XSRETURN(1);
+    CODE:
+        dTHXc;
+        SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
+        SV* ssv;
+        ENTER_LOCK;
+        SHARED_CONTEXT;
+        ssv = av_pop((AV*)sobj);
+        CALLER_CONTEXT;
+        ST(0) = sv_newmortal();
+        Perl_sharedsv_associate(aTHX_ ST(0), ssv);
+        SvREFCNT_dec(ssv);
+        LEAVE_LOCK;
+        /* XSRETURN(1); - implied */
+
 
 void
 SHIFT(SV *obj)
-CODE:
-	dTHXc;
-	SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
-	SV* ssv;
-	ENTER_LOCK;
-	SHARED_CONTEXT;
-	ssv = av_shift((AV*)sobj);
-	CALLER_CONTEXT;
-	ST(0) = sv_newmortal();
-	Perl_sharedsv_associate(aTHX_ ST(0), ssv);
-	SvREFCNT_dec(ssv);
-	LEAVE_LOCK;
-	XSRETURN(1);
+    CODE:
+        dTHXc;
+        SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
+        SV* ssv;
+        ENTER_LOCK;
+        SHARED_CONTEXT;
+        ssv = av_shift((AV*)sobj);
+        CALLER_CONTEXT;
+        ST(0) = sv_newmortal();
+        Perl_sharedsv_associate(aTHX_ ST(0), ssv);
+        SvREFCNT_dec(ssv);
+        LEAVE_LOCK;
+        /* XSRETURN(1); - implied */
+
 
 void
 EXTEND(SV *obj, IV count)
-CODE:
-	dTHXc;
-	SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
-	SHARED_EDIT;
-	av_extend((AV*)sobj, count);
-	SHARED_RELEASE;
+    CODE:
+        dTHXc;
+        SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
+        SHARED_EDIT;
+        av_extend((AV*)sobj, count);
+        SHARED_RELEASE;
+
 
 void
 STORESIZE(SV *obj,IV count)
-CODE:
-	dTHXc;
-	SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
-	SHARED_EDIT;
-	av_fill((AV*) sobj, count);
-	SHARED_RELEASE;
-
-
+    CODE:
+        dTHXc;
+        SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
+        SHARED_EDIT;
+        av_fill((AV*) sobj, count);
+        SHARED_RELEASE;
 
 
 void
 EXISTS(SV *obj, SV *index)
-CODE:
-	dTHXc;
-	SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
-	bool exists;
-	if (SvTYPE(sobj) == SVt_PVAV) {
-	    SHARED_EDIT;
-	    exists = av_exists((AV*) sobj, SvIV(index));
-	}
-	else {
-	    STRLEN len;
-	    char *key = SvPV(index,len);
-	    SHARED_EDIT;
-	    exists = hv_exists((HV*) sobj, key, len);
-	}
-	SHARED_RELEASE;
-	ST(0) = (exists) ? &PL_sv_yes : &PL_sv_no;
-	XSRETURN(1);
+    CODE:
+        dTHXc;
+        SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
+        bool exists;
+        if (SvTYPE(sobj) == SVt_PVAV) {
+            SHARED_EDIT;
+            exists = av_exists((AV*) sobj, SvIV(index));
+        } else {
+            STRLEN len;
+            char *key = SvPV(index,len);
+            SHARED_EDIT;
+            exists = hv_exists((HV*) sobj, key, len);
+        }
+        SHARED_RELEASE;
+        ST(0) = (exists) ? &PL_sv_yes : &PL_sv_no;
+        /* XSRETURN(1); - implied */
 
 
 void
 FIRSTKEY(SV *obj)
-CODE:
-	dTHXc;
-	SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
-	char* key = NULL;
-	I32 len = 0;
-	HE* entry;
-	ENTER_LOCK;
-	SHARED_CONTEXT;
-	hv_iterinit((HV*) sobj);
-	entry = hv_iternext((HV*) sobj);
-	if (entry) {
-		key = hv_iterkey(entry,&len);
-		CALLER_CONTEXT;
-		ST(0) = sv_2mortal(newSVpv(key, len));
-	} else {
-	     CALLER_CONTEXT;
-	     ST(0) = &PL_sv_undef;
-	}
-	LEAVE_LOCK;
-	XSRETURN(1);
+    CODE:
+        dTHXc;
+        SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
+        char* key = NULL;
+        I32 len = 0;
+        HE* entry;
+        ENTER_LOCK;
+        SHARED_CONTEXT;
+        hv_iterinit((HV*) sobj);
+        entry = hv_iternext((HV*) sobj);
+        if (entry) {
+            key = hv_iterkey(entry,&len);
+            CALLER_CONTEXT;
+            ST(0) = sv_2mortal(newSVpv(key, len));
+        } else {
+            CALLER_CONTEXT;
+            ST(0) = &PL_sv_undef;
+        }
+        LEAVE_LOCK;
+        /* XSRETURN(1); - implied */
+
 
 void
 NEXTKEY(SV *obj, SV *oldkey)
-CODE:
-	dTHXc;
-	SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
-	char* key = NULL;
-	I32 len = 0;
-	HE* entry;
-	ENTER_LOCK;
-	SHARED_CONTEXT;
-	entry = hv_iternext((HV*) sobj);
-	if (entry) {
-		key = hv_iterkey(entry,&len);
-		CALLER_CONTEXT;
-		ST(0) = sv_2mortal(newSVpv(key, len));
-	} else {
-	     CALLER_CONTEXT;
-	     ST(0) = &PL_sv_undef;
-	}
-	LEAVE_LOCK;
-	XSRETURN(1);
-
-MODULE = threads::shared                PACKAGE = threads::shared
+    CODE:
+        dTHXc;
+        SV *sobj = S_sharedsv_from_obj(aTHX_ obj);
+        char* key = NULL;
+        I32 len = 0;
+        HE* entry;
+        ENTER_LOCK;
+        SHARED_CONTEXT;
+        entry = hv_iternext((HV*) sobj);
+        if (entry) {
+            key = hv_iterkey(entry,&len);
+            CALLER_CONTEXT;
+            ST(0) = sv_2mortal(newSVpv(key, len));
+        } else {
+            CALLER_CONTEXT;
+            ST(0) = &PL_sv_undef;
+        }
+        LEAVE_LOCK;
+        /* XSRETURN(1); - implied */
+
+
+MODULE = threads::shared        PACKAGE = threads::shared
 
 PROTOTYPES: ENABLE
 
 void
 _id(SV *ref)
-	PROTOTYPE: \[$@%]
-CODE:
-	SV *ssv;
-	ref = SvRV(ref);
-	if(SvROK(ref))
-	    ref = SvRV(ref);
-	if( (ssv = Perl_sharedsv_find(aTHX_ ref)) ){
-	    ST(0) = sv_2mortal(newSViv(PTR2IV(ssv)));
-	    XSRETURN(1);
-	}
-	XSRETURN_UNDEF;
+    PROTOTYPE: \[$@%]
+    PREINIT:
+        SV *ssv;
+    CODE:
+        ref = SvRV(ref);
+        if (SvROK(ref))
+            ref = SvRV(ref);
+        ssv = Perl_sharedsv_find(aTHX_ ref);
+        if (! ssv)
+            XSRETURN_UNDEF;
+        ST(0) = sv_2mortal(newSVuv(PTR2UV(ssv)));
+        /* XSRETURN(1); - implied */
 
 
 void
 _refcnt(SV *ref)
-	PROTOTYPE: \[$@%]
-CODE:
-	SV *ssv;
-	ref = SvRV(ref);
-	if(SvROK(ref))
-	    ref = SvRV(ref);
-	if( (ssv = Perl_sharedsv_find(aTHX_ ref)) ) {
-	    ST(0) = sv_2mortal(newSViv(SvREFCNT(ssv)));
-	    XSRETURN(1);
-	}
-	else {
-	     Perl_warn(aTHX_ "%" SVf " is not shared",ST(0));
-	}
-	XSRETURN_UNDEF;
-
-SV*
+    PROTOTYPE: \[$@%]
+    PREINIT:
+        SV *ssv;
+    CODE:
+        ref = SvRV(ref);
+        if (SvROK(ref))
+            ref = SvRV(ref);
+        ssv = Perl_sharedsv_find(aTHX_ ref);
+        if (! ssv) {
+            Perl_warn(aTHX_ "%" SVf " is not shared", ST(0));
+            XSRETURN_UNDEF;
+        }
+        ST(0) = sv_2mortal(newSViv(SvREFCNT(ssv)));
+        /* XSRETURN(1); - implied */
+
+
+void
 share(SV *ref)
-	PROTOTYPE: \[$@%]
-	CODE:
-	if(!SvROK(ref))
+    PROTOTYPE: \[$@%]
+    CODE:
+        if (! SvROK(ref))
             Perl_croak(aTHX_ "Argument to share needs to be passed as ref");
-	ref = SvRV(ref);
-	if(SvROK(ref))
-	    ref = SvRV(ref);
-	Perl_sharedsv_share(aTHX_ ref);
-	RETVAL = newRV(ref);
-    	OUTPUT:
-	RETVAL
+        ref = SvRV(ref);
+        if (SvROK(ref))
+            ref = SvRV(ref);
+        Perl_sharedsv_share(aTHX_ ref);
+        ST(0) = sv_2mortal(newRV_inc(ref));
+        /* XSRETURN(1); - implied */
 
-void
-lock_enabled(SV *ref)
-	PROTOTYPE: \[$@%]
-	CODE:
-	SV *ssv;
-	if(!SvROK(ref))
-            Perl_croak(aTHX_ "Argument to lock needs to be passed as ref");
-	ref = SvRV(ref);
-	if(SvROK(ref))
-	    ref = SvRV(ref);
-	ssv = Perl_sharedsv_find(aTHX_ ref);
-	if(!ssv)
-	   croak("lock can only be used on shared values");
-	Perl_sharedsv_lock(aTHX_ ssv);
 
 void
-cond_wait_enabled(SV *ref_cond, SV *ref_lock = 0)
-	PROTOTYPE: \[$@%];\[$@%]
-	PREINIT:
-	SV *ssv;
-	perl_cond* user_condition;
-	int locks;
-	int same = 0;
-	user_lock *ul;
-
-	CODE:
-	if (!ref_lock || ref_lock == ref_cond) same = 1;
-
-	if(!SvROK(ref_cond))
+cond_wait(SV *ref_cond, SV *ref_lock = 0)
+    PROTOTYPE: \[$@%];\[$@%]
+    PREINIT:
+        SV *ssv;
+        perl_cond* user_condition;
+        int locks;
+        user_lock *ul;
+    CODE:
+        if (!SvROK(ref_cond))
             Perl_croak(aTHX_ "Argument to cond_wait needs to be passed as ref");
-	ref_cond = SvRV(ref_cond);
-	if(SvROK(ref_cond))
-	    ref_cond = SvRV(ref_cond);
-	ssv = Perl_sharedsv_find(aTHX_ ref_cond);
-	if(!ssv)
-	    croak("cond_wait can only be used on shared values");
-	ul = S_get_userlock(aTHX_ ssv, 1);
-
-	user_condition = &ul->user_cond;
-	if (! same) {
-	    if (!SvROK(ref_lock))
-	        Perl_croak(aTHX_ "cond_wait lock needs to be passed as ref");
-	    ref_lock = SvRV(ref_lock);
-	    if (SvROK(ref_lock)) ref_lock = SvRV(ref_lock);
-	    ssv = Perl_sharedsv_find(aTHX_ ref_lock);
-	    if (!ssv)
-	        croak("cond_wait lock must be a shared value");
-	    ul = S_get_userlock(aTHX_ ssv, 1);
-	}
-	if(ul->lock.owner != aTHX)
-	    croak("You need a lock before you can cond_wait");
-	/* Stealing the members of the lock object worries me - NI-S */
-	MUTEX_LOCK(&ul->lock.mutex);
-	ul->lock.owner = NULL;
-	locks = ul->lock.locks;
-	ul->lock.locks = 0;
-
-	/* since we are releasing the lock here we need to tell other
-	people that is ok to go ahead and use it */
-	COND_SIGNAL(&ul->lock.cond);
-	COND_WAIT(user_condition, &ul->lock.mutex);
-	while(ul->lock.owner != NULL) {
-	    /* OK -- must reacquire the lock */
-	    COND_WAIT(&ul->lock.cond, &ul->lock.mutex);
-	}
-	ul->lock.owner = aTHX;
-	ul->lock.locks = locks;
-	MUTEX_UNLOCK(&ul->lock.mutex);
+        ref_cond = SvRV(ref_cond);
+        if (SvROK(ref_cond))
+            ref_cond = SvRV(ref_cond);
+        ssv = Perl_sharedsv_find(aTHX_ ref_cond);
+        if (! ssv)
+            Perl_croak(aTHX_ "cond_wait can only be used on shared values");
+        ul = S_get_userlock(aTHX_ ssv, 1);
+
+        user_condition = &ul->user_cond;
+        if (ref_lock && (ref_cond != ref_lock)) {
+            if (!SvROK(ref_lock))
+                Perl_croak(aTHX_ "cond_wait lock needs to be passed as ref");
+            ref_lock = SvRV(ref_lock);
+            if (SvROK(ref_lock)) ref_lock = SvRV(ref_lock);
+            ssv = Perl_sharedsv_find(aTHX_ ref_lock);
+            if (! ssv)
+                Perl_croak(aTHX_ "cond_wait lock must be a shared value");
+            ul = S_get_userlock(aTHX_ ssv, 1);
+        }
+        if (ul->lock.owner != aTHX)
+            croak("You need a lock before you can cond_wait");
+        /* Stealing the members of the lock object worries me - NI-S */
+        MUTEX_LOCK(&ul->lock.mutex);
+        ul->lock.owner = NULL;
+        locks = ul->lock.locks;
+        ul->lock.locks = 0;
+
+        /* Since we are releasing the lock here we need to tell other
+         * people that is ok to go ahead and use it */
+        COND_SIGNAL(&ul->lock.cond);
+        COND_WAIT(user_condition, &ul->lock.mutex);
+        while(ul->lock.owner != NULL) {
+            /* OK -- must reacquire the lock */
+            COND_WAIT(&ul->lock.cond, &ul->lock.mutex);
+        }
+        ul->lock.owner = aTHX;
+        ul->lock.locks = locks;
+        MUTEX_UNLOCK(&ul->lock.mutex);
+
 
 int
-cond_timedwait_enabled(SV *ref_cond, double abs, SV *ref_lock = 0)
-	PROTOTYPE: \[$@%]$;\[$@%]
-	PREINIT:
-	SV *ssv;
-	perl_cond* user_condition;
-	int locks;
-	int same = 0;
-	user_lock *ul;
-
-	CODE:
-	if (!ref_lock || ref_cond == ref_lock) same = 1;
-
-	if(!SvROK(ref_cond))
-	    Perl_croak(aTHX_ "Argument to cond_timedwait needs to be passed as ref");
-	ref_cond = SvRV(ref_cond);
-	if(SvROK(ref_cond))
-	    ref_cond = SvRV(ref_cond);
-	ssv = Perl_sharedsv_find(aTHX_ ref_cond);
-	if(!ssv)
-	    croak("cond_timedwait can only be used on shared values");
-	ul = S_get_userlock(aTHX_ ssv, 1);
-    
-	user_condition = &ul->user_cond;
-	if (! same) {
-	    if (!SvROK(ref_lock))
-	        Perl_croak(aTHX_ "cond_timedwait lock needs to be passed as ref");
-	    ref_lock = SvRV(ref_lock);
-	    if (SvROK(ref_lock)) ref_lock = SvRV(ref_lock);
-	    ssv = Perl_sharedsv_find(aTHX_ ref_lock);
-	    if (!ssv)
-	        croak("cond_timedwait lock must be a shared value");
-	    ul = S_get_userlock(aTHX_ ssv, 1);
-	}
-	if(ul->lock.owner != aTHX)
-	    croak("You need a lock before you can cond_wait");
-
-	MUTEX_LOCK(&ul->lock.mutex);
-	ul->lock.owner = NULL;
-	locks = ul->lock.locks;
-	ul->lock.locks = 0;
-	/* since we are releasing the lock here we need to tell other
-	people that is ok to go ahead and use it */
-	COND_SIGNAL(&ul->lock.cond);
-	RETVAL = Perl_sharedsv_cond_timedwait(user_condition, &ul->lock.mutex, abs);
-	while (ul->lock.owner != NULL) {
-	    /* OK -- must reacquire the lock... */
-	    COND_WAIT(&ul->lock.cond, &ul->lock.mutex);
-	}
-	ul->lock.owner = aTHX;
-	ul->lock.locks = locks;
-	MUTEX_UNLOCK(&ul->lock.mutex);
-
-	if (RETVAL == 0)
+cond_timedwait(SV *ref_cond, double abs, SV *ref_lock = 0)
+    PROTOTYPE: \[$@%]$;\[$@%]
+    PREINIT:
+        SV *ssv;
+        perl_cond* user_condition;
+        int locks;
+        user_lock *ul;
+    CODE:
+        if (! SvROK(ref_cond))
+            Perl_croak(aTHX_ "Argument to cond_timedwait needs to be passed as ref");
+        ref_cond = SvRV(ref_cond);
+        if (SvROK(ref_cond))
+            ref_cond = SvRV(ref_cond);
+        ssv = Perl_sharedsv_find(aTHX_ ref_cond);
+        if (! ssv)
+            Perl_croak(aTHX_ "cond_timedwait can only be used on shared values");
+        ul = S_get_userlock(aTHX_ ssv, 1);
+
+        user_condition = &ul->user_cond;
+        if (ref_lock && (ref_cond != ref_lock)) {
+            if (! SvROK(ref_lock))
+                Perl_croak(aTHX_ "cond_timedwait lock needs to be passed as ref");
+            ref_lock = SvRV(ref_lock);
+            if (SvROK(ref_lock)) ref_lock = SvRV(ref_lock);
+            ssv = Perl_sharedsv_find(aTHX_ ref_lock);
+            if (! ssv)
+                Perl_croak(aTHX_ "cond_timedwait lock must be a shared value");
+            ul = S_get_userlock(aTHX_ ssv, 1);
+        }
+        if (ul->lock.owner != aTHX)
+            Perl_croak(aTHX_ "You need a lock before you can cond_wait");
+
+        MUTEX_LOCK(&ul->lock.mutex);
+        ul->lock.owner = NULL;
+        locks = ul->lock.locks;
+        ul->lock.locks = 0;
+        /* Since we are releasing the lock here we need to tell other
+         * people that is ok to go ahead and use it */
+        COND_SIGNAL(&ul->lock.cond);
+        RETVAL = Perl_sharedsv_cond_timedwait(user_condition, &ul->lock.mutex, abs);
+        while (ul->lock.owner != NULL) {
+            /* OK -- must reacquire the lock... */
+            COND_WAIT(&ul->lock.cond, &ul->lock.mutex);
+        }
+        ul->lock.owner = aTHX;
+        ul->lock.locks = locks;
+        MUTEX_UNLOCK(&ul->lock.mutex);
+
+        if (RETVAL == 0)
             XSRETURN_UNDEF;
-	OUTPUT:
-	RETVAL
+    OUTPUT:
+        RETVAL
 
-void
-cond_signal_enabled(SV *ref)
-	PROTOTYPE: \[$@%]
-	CODE:
-	SV *ssv;
-	user_lock *ul;
 
-	if(!SvROK(ref))
+void
+cond_signal(SV *ref)
+    PROTOTYPE: \[$@%]
+    PREINIT:
+        SV *ssv;
+        user_lock *ul;
+    CODE:
+        if (! SvROK(ref))
             Perl_croak(aTHX_ "Argument to cond_signal needs to be passed as ref");
-	ref = SvRV(ref);
-	if(SvROK(ref))
-	    ref = SvRV(ref);
-	ssv = Perl_sharedsv_find(aTHX_ ref);
-	if(!ssv)
-	    croak("cond_signal can only be used on shared values");
-	ul = S_get_userlock(aTHX_ ssv, 1);
-	if (ckWARN(WARN_THREADS) && ul->lock.owner != aTHX)
-	    Perl_warner(aTHX_ packWARN(WARN_THREADS),
-			    "cond_signal() called on unlocked variable");
-	COND_SIGNAL(&ul->user_cond);
+        ref = SvRV(ref);
+        if (SvROK(ref))
+            ref = SvRV(ref);
+        ssv = Perl_sharedsv_find(aTHX_ ref);
+        if (! ssv)
+            Perl_croak(aTHX_ "cond_signal can only be used on shared values");
+        ul = S_get_userlock(aTHX_ ssv, 1);
+        if (ckWARN(WARN_THREADS) && ul->lock.owner != aTHX) {
+            Perl_warner(aTHX_ packWARN(WARN_THREADS),
+                            "cond_signal() called on unlocked variable");
+        }
+        COND_SIGNAL(&ul->user_cond);
 
-void
-cond_broadcast_enabled(SV *ref)
-	PROTOTYPE: \[$@%]
-	CODE:
-	SV *ssv;
-	user_lock *ul;
 
-	if(!SvROK(ref))
+void
+cond_broadcast(SV *ref)
+    PROTOTYPE: \[$@%]
+    PREINIT:
+        SV *ssv;
+        user_lock *ul;
+    CODE:
+        if (! SvROK(ref))
             Perl_croak(aTHX_ "Argument to cond_broadcast needs to be passed as ref");
-	ref = SvRV(ref);
-	if(SvROK(ref))
-	    ref = SvRV(ref);
-	ssv = Perl_sharedsv_find(aTHX_ ref);
-	if(!ssv)
-	    croak("cond_broadcast can only be used on shared values");
-	ul = S_get_userlock(aTHX_ ssv, 1);
-	if (ckWARN(WARN_THREADS) && ul->lock.owner != aTHX)
-	    Perl_warner(aTHX_ packWARN(WARN_THREADS),
-			    "cond_broadcast() called on unlocked variable");
-	COND_BROADCAST(&ul->user_cond);
-
-
-SV*
+        ref = SvRV(ref);
+        if (SvROK(ref))
+            ref = SvRV(ref);
+        ssv = Perl_sharedsv_find(aTHX_ ref);
+        if (! ssv)
+            Perl_croak(aTHX_ "cond_broadcast can only be used on shared values");
+        ul = S_get_userlock(aTHX_ ssv, 1);
+        if (ckWARN(WARN_THREADS) && ul->lock.owner != aTHX) {
+            Perl_warner(aTHX_ packWARN(WARN_THREADS),
+                            "cond_broadcast() called on unlocked variable");
+        }
+        COND_BROADCAST(&ul->user_cond);
+
+
+void
 bless(SV* ref, ...);
-	PROTOTYPE: $;$
-	CODE:
-        {
-	  HV* stash;
-	  SV *ssv;
-	  if (items == 1)
-	    stash = CopSTASH(PL_curcop);
-	  else {
-	    SV* classname = ST(1);
-	    STRLEN len;
-	    char *ptr;
-	    
-	    if (classname && !SvGMAGICAL(classname) &&
-			!SvAMAGIC(classname) && SvROK(classname))
-	      Perl_croak(aTHX_ "Attempt to bless into a reference");
-	    ptr = SvPV(classname,len);
-	    if (ckWARN(WARN_MISC) && len == 0)
-	      Perl_warner(aTHX_ packWARN(WARN_MISC),
-			  "Explicit blessing to '' (assuming package main)");
-	    stash = gv_stashpvn(ptr, len, TRUE);
-	  }
-	  SvREFCNT_inc(ref);
-	  (void)sv_bless(ref, stash);
-	  RETVAL = ref;
-	  ssv = Perl_sharedsv_find(aTHX_ ref);
-	  if(ssv) {
-	    dTHXc;
-	    ENTER_LOCK;
-	    SHARED_CONTEXT;
-	    {
-	      SV* fake_stash = newSVpv(HvNAME_get(stash),0);
-	      (void)sv_bless(ssv,(HV*)fake_stash);
-	    }
-	    CALLER_CONTEXT;
-	    LEAVE_LOCK;
-	  }
-	}
-    	OUTPUT:
-	RETVAL		
+    PROTOTYPE: $;$
+    PREINIT:
+        HV* stash;
+        SV *ssv;
+    CODE:
+        if (items == 1) {
+            stash = CopSTASH(PL_curcop);
+        } else {
+            SV* classname = ST(1);
+            STRLEN len;
+            char *ptr;
+
+            if (classname &&
+                ! SvGMAGICAL(classname) &&
+                ! SvAMAGIC(classname) &&
+                SvROK(classname))
+            {
+                Perl_croak(aTHX_ "Attempt to bless into a reference");
+            }
+            ptr = SvPV(classname, len);
+            if (ckWARN(WARN_MISC) && len == 0) {
+                Perl_warner(aTHX_ packWARN(WARN_MISC),
+                        "Explicit blessing to '' (assuming package main)");
+            }
+            stash = gv_stashpvn(ptr, len, TRUE);
+        }
+        SvREFCNT_inc_void(ref);
+        (void)sv_bless(ref, stash);
+        ST(0) = sv_2mortal(ref);
+        ssv = Perl_sharedsv_find(aTHX_ ref);
+        if (ssv) {
+            dTHXc;
+            ENTER_LOCK;
+            SHARED_CONTEXT;
+            {
+                SV* fake_stash = newSVpv(HvNAME_get(stash), 0);
+                (void)sv_bless(ssv, (HV*)fake_stash);
+            }
+            CALLER_CONTEXT;
+            LEAVE_LOCK;
+        }
+        /* XSRETURN(1); - implied */
 
 #endif /* USE_ITHREADS */