Changes for threads::shared to all building with g++.
[p5sagit/p5-mst-13.2.git] / ext / threads / shared / shared.xs
index 2d27951..25fdec6 100644 (file)
@@ -1,6 +1,6 @@
-/*    sharedsv.c
+/*    shared.xs
  *
- *    Copyright (c) 2001, Larry Wall
+ *    Copyright (c) 2001-2002, 2006 Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  * 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>
+ */
+
+/*
+ * Shared variables are implemented by a scheme similar to tieing.
+ * Each thread has a proxy SV with attached magic -- "private SVs" --
+ * which all point to a single SV in a separate shared interpreter
+ * (PL_sharedsv_space) -- "shared SVs".
+ *
+ * The shared SV holds the variable's true values, and its state is
+ * copied between the shared and private SVs with the usual
+ * mg_get()/mg_set() arrangement.
+ *
+ * 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 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
+ * 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.
+ *
+ * Access to aggregate elements is done the usual tied way by returning a
+ * proxy PVLV element with attached element magic.
+ *
+ * Pointers to the shared SV are squirrelled away in the mg->mg_ptr field
+ * of magic (with mg_len == 0), and in the IV2PTR(SvIV(sv)) field of tied
+ * object SVs. These pointers have to be hidden like this because they
+ * cross interpreter boundaries, and we don't want sv_clear() and friends
+ * following them.
+ *
+ * The three basic shared types look like the following:
+ *
+ * -----------------
+ *
+ * Shared scalar (my $s : shared):
+ *
+ *  SV = PVMG(0x7ba238) at 0x7387a8
+ *   FLAGS = (PADMY,GMG,SMG)
+ *   MAGIC = 0x824d88
+ *     MG_TYPE = PERL_MAGIC_shared_scalar(n)
+ *     MG_PTR = 0x810358                <<<< pointer to the shared SV
+ *
+ * -----------------
+ *
+ * Shared aggregate (my @a : shared;  my %h : shared):
+ *
+ * SV = PVAV(0x7175d0) at 0x738708
+ *   FLAGS = (PADMY,RMG)
+ *   MAGIC = 0x824e48
+ *     MG_TYPE = PERL_MAGIC_tied(P)
+ *     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
+ *         STASH = 0x80abf0 "threads::shared::tie"
+ *     MG_PTR = 0x810358 ""             <<<< another pointer to the shared AV
+ *   ARRAY = 0x0
+ *
+ * -----------------
+ *
+ * Aggregate element (my @a : shared; $a[0])
+ *
+ * SV = PVLV(0x77f628) at 0x713550
+ *   FLAGS = (GMG,SMG,RMG,pIOK)
+ *   MAGIC = 0x72bd58
+ *     MG_TYPE = PERL_MAGIC_shared_scalar(n)
+ *     MG_PTR = 0x8103c0 ""             <<<< pointer to the shared element
+ *   MAGIC = 0x72bd18
+ *     MG_TYPE = PERL_MAGIC_tiedelem(p)
+ *     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
+ *         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.
+ *
+ *
+ * Userland locks:
+ *
+ * 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 malloc'ed structure
+ * containing the necessary mutexes and condition variables.
+ *
+ * Nomenclature:
+ *
+ * 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
 
-#define SHAREDSvPTR(a)      ((a)->sv)
+#ifdef USE_ITHREADS
 
 /*
  * The shared things need an intepreter to live in ...
  */
 PerlInterpreter *PL_sharedsv_space;             /* The shared sv space */
 /* To access shared space we fake aTHX in this scope and thread's context */
-#define SHARED_CONTEXT             PERL_SET_CONTEXT((aTHX = PL_sharedsv_space))
+
+/* 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;                                       \
+    } 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      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)
@@ -60,146 +195,180 @@ recursive_lock_init(pTHX_ recursive_lock_t *lock)
 }
 
 void
+recursive_lock_destroy(pTHX_ recursive_lock_t *lock)
+{
+    MUTEX_DESTROY(&lock->mutex);
+    COND_DESTROY(&lock->cond);
+}
+
+void
 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
 
-#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
-
-/* then switch out and release access. */
-#define SHARED_RELEASE     STMT_START {        \
-                               CALLER_CONTEXT; \
-                               LEAVE_LOCK;     \
-                           } STMT_END
-                       
-
-/*
-
-  Shared SV
-
-  Shared SV is a structure for keeping the backend storage
-  of shared svs.
-
-  Shared-ness really only needs the SV * - the rest is for locks.
-  (Which suggests further space optimization ... )
-
+#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
+
+
+/* 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 {
-    SV                 *sv;             /* The actual SV - in shared space */
-    recursive_lock_t    lock;
+    recursive_lock_t    lock;           /* For user-levl locks */
     perl_cond           user_cond;      /* For user-level conditions */
-} shared_sv;
+} user_lock;
 
-/* The SV in shared-space has a back-pointer to the shared_sv
-   struct associated with it PERL_MAGIC_ext.
+/* 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.
-
  */
 
 int
-sharedsv_shared_mg_free(pTHX_ SV *sv, MAGIC *mg)
+sharedsv_userlock_free(pTHX_ SV *sv, MAGIC *mg)
 {
-    shared_sv *shared = (shared_sv *) mg->mg_ptr;
-    assert( aTHX == PL_sharedsv_space );
-    if (shared) {
-       PerlMemShared_free(shared);
-       mg->mg_ptr = NULL;
+    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;
     }
-    return 0;
+    return (0);
 }
 
-MGVTBL sharedsv_shared_vtbl = {
- 0,                            /* get */
- 0,                            /* set */
- 0,                            /* len */
- 0,                            /* clear */
- sharedsv_shared_mg_free,      /* free */
- 0,                            /* copy */
- 0,                            /* dup */
+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 */
-
-/* The sharedsv_elem_vtbl associates the element with the array/hash and
+extern MGVTBL sharedsv_scalar_vtbl; /* Scalars have this vtable */
+extern MGVTBL sharedsv_array_vtbl;  /* Hashes and arrays have this - like 'tie' */
+extern 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
  */
 
 
-/* Accessor to convert threads::shared::tie objects back shared_sv * */
-shared_sv *
-SV_to_sharedsv(pTHX_ SV *sv)
+/* Get shared aggregate SV pointed to by threads::shared::tie magic object */
+
+STATIC SV *
+S_sharedsv_from_obj(pTHX_ SV *sv)
 {
-    shared_sv *shared = 0;
-    if (SvROK(sv))
-     {
-      shared = INT2PTR(shared_sv *, SvIV(SvRV(sv)));
-     }
-    return shared;
+     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
+ */
+STATIC user_lock *
+S_get_userlock(pTHX_ SV* ssv, bool create)
+{
+    MAGIC *mg;
+    user_lock *ul = NULL;
+
+    assert(ssv);
+    /* 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_userlock_vtbl,
+               (char *)ul, 0);
+        recursive_lock_init(aTHX_ &ul->lock);
+        COND_INIT(&ul->user_cond);
+        CALLER_CONTEXT;
+    }
+    LEAVE_LOCK;
+    return (ul);
+}
+
+
 =for apidoc sharedsv_find
 
 Given a private side SV tries to find if the SV has a shared backend,
@@ -207,491 +376,671 @@ by looking for the magic.
 
 =cut
 
-shared_sv *
+SV *
 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 (shared_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 (shared_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 SV_to_sharedsv(aTHX_ sv);
+        return (S_sharedsv_from_obj(aTHX_ sv));
     }
-    return NULL;
+    return (NULL);
 }
 
-/*
- *  Almost all the pain is in this routine.
- *
- */
 
-shared_sv *
-Perl_sharedsv_associate(pTHX_ SV **psv, SV *ssv, shared_sv *data)
+/* 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)
 {
     dTHXc;
     MAGIC *mg = 0;
-    SV *sv    = (psv) ? *psv : Nullsv;
 
-    /* If we are asked for an private ops we need a thread */
+    /* If we are asked for any private ops we need a thread */
     assert ( aTHX !=  PL_sharedsv_space );
 
     /* To avoid need for recursive locks require caller to hold lock */
     assert ( PL_sharedsv_lock.owner == aTHX );
 
-    /* First try and get existing global data structure */
+    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_void(ssv);
+            SvREFCNT_dec(obj);
+        }
+        break;
 
-    /* Try shared SV as 1st choice */
-    if (!data && ssv && SvTYPE(ssv) >= SVt_PVMG) {
-       if (mg = mg_find(ssv, PERL_MAGIC_ext)) {
-           data = (shared_sv *) mg->mg_ptr;
-       }
+    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
+#ifdef MGf_LOCAL
+                                    |MGf_LOCAL
+#endif
+                            );
+            SvREFCNT_inc_void(ssv);
+        }
+        break;
     }
 
-    /* Next see if private SV is associated with something */
-    if (!data && sv) {
-       data = Perl_sharedsv_find(aTHX_ sv);
-    }
+    assert ( Perl_sharedsv_find(aTHX_ sv) == ssv );
+}
 
-    /* If neither of those then create a new one */
-    if (!data) {
-           SHARED_CONTEXT;
-           if (!ssv)
-               ssv = newSV(0);
-           data = PerlMemShared_malloc(sizeof(shared_sv));
-           Zero(data,1,shared_sv);
-           SHAREDSvPTR(data) = ssv;
-           /* Tag shared side SV with data pointer */
-           sv_magicext(ssv, ssv, PERL_MAGIC_ext, &sharedsv_shared_vtbl,
-                  (char *)data, 0);
-           recursive_lock_init(aTHX_ &data->lock);
-           COND_INIT(&data->user_cond);
-           CALLER_CONTEXT;
-    }
 
-    if (!ssv)
-       ssv = SHAREDSvPTR(data);
-    if (!SHAREDSvPTR(data))
-       SHAREDSvPTR(data) = ssv;
-
-    /* If we know type upgrade shared side SV */
-    if (sv && SvTYPE(ssv) < SvTYPE(sv)) {
-       SHARED_CONTEXT;
-       sv_upgrade(ssv, SvTYPE(*psv));
-       CALLER_CONTEXT;
-    }
+/* Given a private SV, create and return an associated shared SV.
+ * Assumes lock is held.
+ */
+STATIC SV *
+S_sharedsv_new_shared(pTHX_ SV *sv)
+{
+    dTHXc;
+    SV *ssv;
 
-    /* Now if requested allocate private SV */
-    if (psv && !sv) {
-       *psv = sv = newSV(0);
-    }
+    assert(PL_sharedsv_lock.owner == aTHX);
+    assert(aTHX !=  PL_sharedsv_space);
 
-    /* Finally if private SV exists check and add magic */
-    if (sv) {
-       MAGIC *mg = 0;
-       if (SvTYPE(sv) < SvTYPE(ssv)) {
-           sv_upgrade(sv, SvTYPE(ssv));
-       }
-       switch(SvTYPE(sv)) {
-       case SVt_PVAV:
-       case SVt_PVHV:
-           if (!(mg = mg_find(sv, PERL_MAGIC_tied))
-               || mg->mg_virtual != &sharedsv_array_vtbl
-               || (shared_sv *) mg->mg_ptr != data) {
-               SV *obj = newSV(0);
-               sv_setref_iv(obj, "threads::shared::tie",PTR2IV(data));
-               if (mg) {
-                   sv_unmagic(sv, PERL_MAGIC_tied);
-               }
-               mg = sv_magicext(sv, obj, PERL_MAGIC_tied, &sharedsv_array_vtbl,
-                               (char *) data, 0);
-               mg->mg_flags |= (MGf_COPY|MGf_DUP);
-               SvREFCNT_inc(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
-               || (shared_sv *) mg->mg_ptr != data) {
-               if (mg) {
-                   sv_unmagic(sv, PERL_MAGIC_shared_scalar);
-               }
-               mg = sv_magicext(sv, Nullsv, PERL_MAGIC_shared_scalar,
-                               &sharedsv_scalar_vtbl, (char *)data, 0);
-               mg->mg_flags |= (MGf_COPY|MGf_DUP);
-               SvREFCNT_inc(ssv);
-           }
-           break;
-       }
-       assert ( Perl_sharedsv_find(aTHX_ *psv) == data );
-    }
-    return data;
+    SHARED_CONTEXT;
+    ssv = newSV(0);
+    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);
 }
 
-void
-Perl_sharedsv_free(pTHX_ shared_sv *shared)
+
+/* Given a shared SV, create and return an associated private SV.
+ * Assumes lock is held.
+ */
+STATIC SV *
+S_sharedsv_new_private(pTHX_ SV *ssv)
 {
-    if (shared) {
-       dTHXc;
-       SHARED_EDIT;
-       SvREFCNT_dec(SHAREDSvPTR(shared));
-       SHARED_RELEASE;
+    SV *sv;
+
+    assert(PL_sharedsv_lock.owner == aTHX);
+    assert(aTHX !=  PL_sharedsv_space);
+
+    sv = newSV(0);
+    sv_upgrade(sv, SvTYPE(ssv));
+    Perl_sharedsv_associate(aTHX_ sv, ssv);
+    return (sv);
+}
+
+
+/* A threadsafe version of SvREFCNT_dec(ssv) */
+
+STATIC void
+S_sharedsv_dec(pTHX_ SV* ssv)
+{
+    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;
     }
+    LEAVE_LOCK;
 }
 
+
+/* 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;
-       Perl_sharedsv_associate(aTHX_ &sv, 0, 0);
-       LEAVE_LOCK;
-       SvSETMAGIC(sv);
-       break;
+        ENTER_LOCK;
+        (void) S_sharedsv_new_shared(aTHX_ sv);
+        LEAVE_LOCK;
+        SvSETMAGIC(sv);
+        break;
     }
 }
 
-/* MAGIC (in mg.h sense) hooks */
+
+#if defined(WIN32) || defined(OS2)
+#  define ABS2RELMILLI(abs)             \
+    do {                                \
+        abs -= (double)time(NULL);      \
+        if (abs > 0) { abs *= 1000; }   \
+        else         { abs  = 0;    }   \
+    } while (0)
+#endif /* WIN32 || OS2 */
+
+/* Do OS-specific condition timed wait */
+
+bool
+Perl_sharedsv_cond_timedwait(perl_cond *cond, perl_mutex *mut, double abs)
+{
+#if defined(NETWARE) || defined(FAKE_THREADS) || defined(I_MACH_CTHREADS)
+    Perl_croak_nocontext("cond_timedwait not supported on this platform");
+#else
+#  ifdef WIN32
+    int got_it = 0;
+
+    ABS2RELMILLI(abs);
+
+    cond->waiters++;
+    MUTEX_UNLOCK(mut);
+    /* See comments in win32/win32thread.h COND_WAIT vis-a-vis race */
+    switch (WaitForSingleObject(cond->sem, (DWORD)abs)) {
+        case WAIT_OBJECT_0:   got_it = 1; break;
+        case WAIT_TIMEOUT:                break;
+        default:
+            /* WAIT_FAILED? WAIT_ABANDONED? others? */
+            Perl_croak_nocontext("panic: cond_timedwait (%ld)",GetLastError());
+            break;
+    }
+    MUTEX_LOCK(mut);
+    cond->waiters--;
+    return (got_it);
+#  else
+#    ifdef OS2
+    int rc, got_it = 0;
+    STRLEN n_a;
+
+    ABS2RELMILLI(abs);
+
+    if ((rc = DosResetEventSem(*cond,&n_a)) && (rc != ERROR_ALREADY_RESET))
+        Perl_rc = rc, croak_with_os2error("panic: cond_timedwait-reset");
+    MUTEX_UNLOCK(mut);
+    if (CheckOSError(DosWaitEventSem(*cond,abs))
+        && (rc != ERROR_INTERRUPT))
+        croak_with_os2error("panic: cond_timedwait");
+    if (rc == ERROR_INTERRUPT) errno = EINTR;
+    MUTEX_LOCK(mut);
+    return (got_it);
+#    else         /* Hope you're I_PTHREAD! */
+    struct timespec ts;
+    int got_it = 0;
+
+    ts.tv_sec = (long)abs;
+    abs -= (NV)ts.tv_sec;
+    ts.tv_nsec = (long)(abs * 1000000000.0);
+
+    switch (pthread_cond_timedwait(cond, mut, &ts)) {
+        case 0:         got_it = 1; break;
+        case ETIMEDOUT:             break;
+#ifdef OEMVS
+        case -1:
+            if (errno == ETIMEDOUT || errno == EAGAIN)
+                break;
+#endif
+        default:
+            Perl_croak_nocontext("panic: cond_timedwait");
+            break;
+    }
+    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 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))))
+    {
+        /* 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);
+    }
+    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));
+    }
+}
+
+
+/* ------------ PERL_MAGIC_shared_scalar(n) functions -------------- */
+
+/* Get magic for PERL_MAGIC_shared_scalar(n) */
 
 int
 sharedsv_scalar_mg_get(pTHX_ SV *sv, MAGIC *mg)
 {
-    shared_sv *shared = (shared_sv *) mg->mg_ptr;
-    assert(shared);
+    SV *ssv = (SV *) mg->mg_ptr;
+    assert(ssv);
 
     ENTER_LOCK;
-    if (SHAREDSvPTR(shared)) {
-       if (SvROK(SHAREDSvPTR(shared))) {
-           SV *obj = Nullsv;
-           Perl_sharedsv_associate(aTHX_ &obj, SvRV(SHAREDSvPTR(shared)), NULL);
-           sv_setsv_nomg(sv, &PL_sv_undef);
-           SvRV(sv) = obj;
-           SvROK_on(sv);
-       }
-       else {
-           sv_setsv_nomg(sv, SHAREDSvPTR(shared));
-       }
+    if (SvROK(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.
+ */
 void
-sharedsv_scalar_store(pTHX_ SV *sv, shared_sv *shared)
+sharedsv_scalar_store(pTHX_ SV *sv, SV *ssv)
 {
     dTHXc;
     bool allowed = TRUE;
+
+    assert(PL_sharedsv_lock.owner == aTHX);
     if (SvROK(sv)) {
-       shared_sv* target = Perl_sharedsv_find(aTHX_ SvRV(sv));
-       if (target) {
-           SV *tmp;
-           SHARED_CONTEXT;
-           tmp = newRV(SHAREDSvPTR(target));
-           sv_setsv_nomg(SHAREDSvPTR(shared), tmp);
-           SvREFCNT_dec(tmp);
-           CALLER_CONTEXT;
-       }
-       else {
-           allowed = FALSE;
-       }
-    }
-    else {
-       SHARED_CONTEXT;
-       sv_setsv_nomg(SHAREDSvPTR(shared), sv);
-       CALLER_CONTEXT;
+        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(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) */
+
 int
 sharedsv_scalar_mg_set(pTHX_ SV *sv, MAGIC *mg)
 {
-    shared_sv *shared;
+    SV *ssv = (SV*)(mg->mg_ptr);
+    assert(ssv);
     ENTER_LOCK;
-    /* We call associate to potentially upgrade shared side SV */
-    shared = Perl_sharedsv_associate(aTHX_ &sv, Nullsv, (shared_sv *) mg->mg_ptr);
-    assert(shared);
-    sharedsv_scalar_store(aTHX_ sv, shared);
+    if (SvTYPE(ssv) < SvTYPE(sv)) {
+        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) */
+
 int
 sharedsv_scalar_mg_free(pTHX_ SV *sv, MAGIC *mg)
 {
-    shared_sv *shared = (shared_sv *) mg->mg_ptr;
-    assert (SvREFCNT(SHAREDSvPTR(shared)) < 1000);
-    Perl_sharedsv_free(aTHX_ shared);
-    return 0;
+    S_sharedsv_dec(aTHX_ (SV*)mg->mg_ptr);
+    return (0);
 }
 
+/*
+ * Called during cloning of PERL_MAGIC_shared_scalar(n) magic in new thread
+ */
 int
-sharedsv_scalar_mg_clear(pTHX_ SV *sv, MAGIC *mg)
+sharedsv_scalar_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param)
 {
-    shared_sv *shared = (shared_sv *) mg->mg_ptr;
-    return 0;
+    SvREFCNT_inc_void(mg->mg_ptr);
+    return (0);
 }
 
+#ifdef MGf_LOCAL
 /*
- * Called during cloning of new threads
+ * Called during local $shared
  */
 int
-sharedsv_scalar_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param)
+sharedsv_scalar_mg_local(pTHX_ SV* nsv, MAGIC *mg)
 {
-    shared_sv *shared = (shared_sv *) mg->mg_ptr;
-    if (shared) {
-       SvREFCNT_inc(SHAREDSvPTR(shared));
+    MAGIC *nmg;
+    SV *ssv = (SV *) mg->mg_ptr;
+    if (ssv) {
+        ENTER_LOCK;
+        SvREFCNT_inc_void(ssv);
+        LEAVE_LOCK;
     }
-    return 0;
+    nmg = sv_magicext(nsv, mg->mg_obj, mg->mg_type, mg->mg_virtual,
+                           mg->mg_ptr, mg->mg_len);
+    nmg->mg_flags   = mg->mg_flags;
+    nmg->mg_private = mg->mg_private;
+
+    return (0);
 }
+#endif
 
 MGVTBL sharedsv_scalar_vtbl = {
- sharedsv_scalar_mg_get,       /* get */
- sharedsv_scalar_mg_set,       /* set */
- 0,                            /* len */
- sharedsv_scalar_mg_clear,     /* clear */
- sharedsv_scalar_mg_free,      /* free */
- 0,                            /* copy */
- sharedsv_scalar_mg_dup                /* dup */
+    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
 };
 
-/* Now the arrays/hashes stuff */
+/* ------------ PERL_MAGIC_tiedelem(p) functions -------------- */
+
+/* Get magic for PERL_MAGIC_tiedelem(p) */
+
 int
 sharedsv_elem_mg_FETCH(pTHX_ SV *sv, MAGIC *mg)
 {
     dTHXc;
-    shared_sv *shared = SV_to_sharedsv(aTHX_ mg->mg_obj);
-    shared_sv *target = Perl_sharedsv_find(aTHX_ sv);
+    SV *saggregate = S_sharedsv_from_obj(aTHX_ mg->mg_obj);
     SV** svp;
 
-    assert ( shared );
-    assert ( SHAREDSvPTR(shared) );
-
     ENTER_LOCK;
-
-    if (SvTYPE(SHAREDSvPTR(shared)) == SVt_PVAV) {
-       assert ( mg->mg_ptr == 0 );
-       SHARED_CONTEXT;
-       svp = av_fetch((AV*) SHAREDSvPTR(shared), 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*) SHAREDSvPTR(shared), key, len, 0);
+    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);
     }
     CALLER_CONTEXT;
     if (svp) {
-       /* Exists in the array */
-       target = Perl_sharedsv_associate(aTHX_ &sv, *svp, target);
-       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) */
+
 int
 sharedsv_elem_mg_STORE(pTHX_ SV *sv, MAGIC *mg)
 {
     dTHXc;
-    bool allowed;
-    shared_sv *shared = SV_to_sharedsv(aTHX_ mg->mg_obj);
-    shared_sv *target;
+    SV *saggregate = S_sharedsv_from_obj(aTHX_ mg->mg_obj);
     SV **svp;
     /* Theory - SV itself is magically shared - and we have ordered the
        magic such that by the time we get here it has been stored
        to its shared counterpart
      */
     ENTER_LOCK;
-    assert(shared);
-    assert(SHAREDSvPTR(shared));
-    if (SvTYPE(SHAREDSvPTR(shared)) == SVt_PVAV) {
-       assert ( mg->mg_ptr == 0 );
-       SHARED_CONTEXT;
-       svp = av_fetch((AV*) SHAREDSvPTR(shared), 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*) SHAREDSvPTR(shared), key, len, 1);
+    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);
     }
     CALLER_CONTEXT;
-    target = Perl_sharedsv_associate(aTHX_ &sv, *svp, 0);
-    sharedsv_scalar_store(aTHX_ sv, target);
+    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) */
+
 int
 sharedsv_elem_mg_DELETE(pTHX_ SV *sv, MAGIC *mg)
 {
     dTHXc;
-    shared_sv *shared = SV_to_sharedsv(aTHX_ mg->mg_obj);
-    SV* ssv;
+    MAGIC *shmg;
+    SV *saggregate = S_sharedsv_from_obj(aTHX_ mg->mg_obj);
     ENTER_LOCK;
     sharedsv_elem_mg_FETCH(aTHX_ sv, mg);
-    if (SvTYPE(SHAREDSvPTR(shared)) == SVt_PVAV) {
-       SHARED_CONTEXT;
-       av_delete((AV*) SHAREDSvPTR(shared), 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*) SHAREDSvPTR(shared), key, len, G_DISCARD);
+    if ((shmg = mg_find(sv, PERL_MAGIC_shared_scalar)))
+        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);
     }
     CALLER_CONTEXT;
     LEAVE_LOCK;
-    return 0;
+    return (0);
 }
 
-int
-sharedsv_elem_mg_free(pTHX_ SV *sv, MAGIC *mg)
-{
-    Perl_sharedsv_free(aTHX_ SV_to_sharedsv(aTHX_ mg->mg_obj));
-    return 0;
-}
+/* Called during cloning of PERL_MAGIC_tiedelem(p) magic in new
+ * thread */
 
 int
 sharedsv_elem_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param)
 {
-    shared_sv *shared = SV_to_sharedsv(aTHX_ mg->mg_obj);
-    SvREFCNT_inc(SHAREDSvPTR(shared));
-    mg->mg_flags |= MGf_DUP;
-    return 0;
+    SvREFCNT_inc_void(S_sharedsv_from_obj(aTHX_ mg->mg_obj));
+    assert(mg->mg_flags & MGf_DUP);
+    return (0);
 }
 
 MGVTBL sharedsv_elem_vtbl = {
- sharedsv_elem_mg_FETCH,       /* get */
- sharedsv_elem_mg_STORE,       /* set */
- 0,                            /* len */
- sharedsv_elem_mg_DELETE,      /* clear */
- sharedsv_elem_mg_free,                /* free */
- 0,                            /* copy */
- sharedsv_elem_mg_dup          /* dup */
+    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) */
+
 U32
 sharedsv_array_mg_FETCHSIZE(pTHX_ SV *sv, MAGIC *mg)
 {
     dTHXc;
-    shared_sv *shared = (shared_sv *) mg->mg_ptr;
+    SV *ssv = (SV *) mg->mg_ptr;
     U32 val;
     SHARED_EDIT;
-    if (SvTYPE(SHAREDSvPTR(shared)) == SVt_PVAV) {
-       val = av_len((AV*) SHAREDSvPTR(shared));
-    }
-    else {
-       /* not actually defined by tie API but ... */
-       val = HvKEYS((HV*) SHAREDSvPTR(shared));
+    if (SvTYPE(ssv) == SVt_PVAV) {
+        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) */
+
 int
 sharedsv_array_mg_CLEAR(pTHX_ SV *sv, MAGIC *mg)
 {
     dTHXc;
-    shared_sv *shared = (shared_sv *) mg->mg_ptr;
+    SV *ssv = (SV *) mg->mg_ptr;
     SHARED_EDIT;
-    if (SvTYPE(SHAREDSvPTR(shared)) == SVt_PVAV) {
-       av_clear((AV*) SHAREDSvPTR(shared));
-    }
-    else {
-       hv_clear((HV*) SHAREDSvPTR(shared));
+    if (SvTYPE(ssv) == SVt_PVAV) {
+        av_clear((AV*) ssv);
+    } else {
+        hv_clear((HV*) ssv);
     }
     SHARED_RELEASE;
-    return 0;
+    return (0);
 }
 
+/* Free magic for PERL_MAGIC_tied(P) */
+
 int
 sharedsv_array_mg_free(pTHX_ SV *sv, MAGIC *mg)
 {
-    Perl_sharedsv_free(aTHX_ (shared_sv *) mg->mg_ptr);
-    return 0;
+    S_sharedsv_dec(aTHX_ (SV*)mg->mg_ptr);
+    return (0);
 }
 
 /*
+ * 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)
 {
-    shared_sv *shared = (shared_sv *) mg->mg_ptr;
     MAGIC *nmg = sv_magicext(nsv,mg->mg_obj,
-                           toLOWER(mg->mg_type),&sharedsv_elem_vtbl,
-                           name, namlen);
-    SvREFCNT_inc(SHAREDSvPTR(shared));
+                            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 */
+
 int
 sharedsv_array_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param)
 {
-    shared_sv *shared = (shared_sv *) mg->mg_ptr;
-    SvREFCNT_inc(SHAREDSvPTR(shared));
-    mg->mg_flags |= MGf_DUP;
-    return 0;
+    SvREFCNT_inc_void((SV*)mg->mg_ptr);
+    assert(mg->mg_flags & MGf_DUP);
+    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,                          /* 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
@@ -701,9 +1050,11 @@ Recursively unlocks a shared sv.
 =cut
 
 void
-Perl_sharedsv_unlock(pTHX_ shared_sv* ssv)
+Perl_sharedsv_unlock(pTHX_ SV *ssv)
 {
-    recursive_lock_release(aTHX_ &ssv->lock);
+    user_lock *ul = S_get_userlock(aTHX_ ssv, 0);
+    assert(ul);
+    recursive_lock_release(aTHX_ &ul->lock);
 }
 
 =for apidoc sharedsv_lock
@@ -714,284 +1065,477 @@ Locks are dynamically scoped at the level of the first lock.
 =cut
 
 void
-Perl_sharedsv_lock(pTHX_ shared_sv* ssv)
+Perl_sharedsv_lock(pTHX_ SV *ssv)
 {
-    if (!ssv)
-       return;
-    recursive_lock_acquire(aTHX_ &ssv->lock, __FILE__, __LINE__);
+    user_lock *ul;
+    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 */
+
 void
 Perl_sharedsv_locksv(pTHX_ SV *sv)
 {
-    Perl_sharedsv_lock(aTHX_ Perl_sharedsv_find(aTHX_ sv));
+    SV *ssv;
+
+    if (SvROK(sv))
+        sv = SvRV(sv);
+    ssv = Perl_sharedsv_find(aTHX_ sv);
+    if (!ssv)
+       croak("lock can only be used on shared values");
+    Perl_sharedsv_lock(aTHX_ ssv);
 }
 
 =head1 Shared SV Functions
 
 =for apidoc sharedsv_init
 
-Saves a space for keeping SVs wider than an interpreter,
-currently only stores a pointer to the first 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;
 }
 
-MODULE = threads::shared       PACKAGE = threads::shared::tie
+#endif /* USE_ITHREADS */
+
+MODULE = threads::shared        PACKAGE = threads::shared::tie
 
 PROTOTYPES: DISABLE
 
+#ifdef USE_ITHREADS
 
 void
-PUSH(shared_sv *shared, ...)
-CODE:
-       dTHXc;
-       int i;
-       for(i = 1; i < items; i++) {
-           SV* tmp = newSVsv(ST(i));
-           shared_sv *target;
-           ENTER_LOCK;
-           target = Perl_sharedsv_associate(aTHX_ &tmp, Nullsv, 0);
-           sharedsv_scalar_store(aTHX_ tmp, target);
-           SHARED_CONTEXT;
-           av_push((AV*) SHAREDSvPTR(shared), SHAREDSvPTR(target));
-           SHARED_RELEASE;
-           SvREFCNT_dec(tmp);
-       }
+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_void(stmp);
+            SHARED_RELEASE;
+            SvREFCNT_dec(tmp);
+        }
 
-void
-UNSHIFT(shared_sv *shared, ...)
-CODE:
-       dTHXc;
-       int i;
-       ENTER_LOCK;
-       SHARED_CONTEXT;
-       av_unshift((AV*)SHAREDSvPTR(shared), items - 1);
-       CALLER_CONTEXT;
-       for(i = 1; i < items; i++) {
-           SV* tmp = newSVsv(ST(i));
-           shared_sv *target = Perl_sharedsv_associate(aTHX_ &tmp, Nullsv, 0);
-           sharedsv_scalar_store(aTHX_ tmp, target);
-           SHARED_CONTEXT;
-           av_store((AV*) SHAREDSvPTR(shared), i - 1, SHAREDSvPTR(target));
-           CALLER_CONTEXT;
-           SvREFCNT_dec(tmp);
-       }
-       LEAVE_LOCK;
 
 void
-POP(shared_sv *shared)
-CODE:
-       dTHXc;
-       SV* sv;
-       ENTER_LOCK;
-       SHARED_CONTEXT;
-       sv = av_pop((AV*)SHAREDSvPTR(shared));
-       CALLER_CONTEXT;
-       ST(0) = Nullsv;
-       Perl_sharedsv_associate(aTHX_ &ST(0), sv, 0);
-       LEAVE_LOCK;
-       XSRETURN(1);
+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_void(stmp);
+            CALLER_CONTEXT;
+            SvREFCNT_dec(tmp);
+        }
+        LEAVE_LOCK;
+
 
 void
-SHIFT(shared_sv *shared)
-CODE:
-       dTHXc;
-       SV* sv;
-       ENTER_LOCK;
-       SHARED_CONTEXT;
-       sv = av_shift((AV*)SHAREDSvPTR(shared));
-       CALLER_CONTEXT;
-       ST(0) = Nullsv;
-       Perl_sharedsv_associate(aTHX_ &ST(0), sv, 0);
-       LEAVE_LOCK;
-       XSRETURN(1);
+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); - implied */
+
 
 void
-EXTEND(shared_sv *shared, IV count)
-CODE:
-       dTHXc;
-       SHARED_EDIT;
-       av_extend((AV*)SHAREDSvPTR(shared), count);
-       SHARED_RELEASE;
+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); - implied */
+
 
 void
-STORESIZE(shared_sv *shared,IV count)
-CODE:
-       dTHXc;
-       SHARED_EDIT;
-       av_fill((AV*) SHAREDSvPTR(shared), count);
-       SHARED_RELEASE;
+EXTEND(SV *obj, IV count)
+    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;
 
 
 void
-EXISTS(shared_sv *shared, SV *index)
-CODE:
-       dTHXc;
-       bool exists;
-       SHARED_EDIT;
-       if (SvTYPE(SHAREDSvPTR(shared)) == SVt_PVAV) {
-           exists = av_exists((AV*) SHAREDSvPTR(shared), SvIV(index));
-       }
-       else {
-           STRLEN len;
-           char *key = SvPV(index,len);
-           exists = hv_exists((HV*) SHAREDSvPTR(shared), key, len);
-       }
-       SHARED_RELEASE;
-       ST(0) = (exists) ? &PL_sv_yes : &PL_sv_no;
-       XSRETURN(1);
+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); - implied */
 
 
 void
-FIRSTKEY(shared_sv *shared)
-CODE:
-       dTHXc;
-       char* key = NULL;
-       I32 len = 0;
-       HE* entry;
-       ENTER_LOCK;
-       SHARED_CONTEXT;
-       hv_iterinit((HV*) SHAREDSvPTR(shared));
-       entry = hv_iternext((HV*) SHAREDSvPTR(shared));
-       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);
+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); - implied */
+
 
 void
-NEXTKEY(shared_sv *shared, SV *oldkey)
-CODE:
-       dTHXc;
-       char* key = NULL;
-       I32 len = 0;
-       HE* entry;
-       ENTER_LOCK;
-       SHARED_CONTEXT;
-       entry = hv_iternext((HV*) SHAREDSvPTR(shared));
-       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
+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); - implied */
+
+
+MODULE = threads::shared        PACKAGE = threads::shared
 
 PROTOTYPES: ENABLE
 
 void
+_id(SV *ref)
+    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:
-       shared_sv *shared;
-       if(SvROK(ref))
-           ref = SvRV(ref);
-       if (shared = Perl_sharedsv_find(aTHX_ ref)) {
-         if (SHAREDSvPTR(shared)) {
-           ST(0) = sv_2mortal(newSViv(SvREFCNT(SHAREDSvPTR(shared))));
-           XSRETURN(1);
-         }
-         else {
-            Perl_warn(aTHX_ "%_ s=%p has no shared SV",ST(0),shared);
-         }
-       }
-       else {
-            Perl_warn(aTHX_ "%_ is not shared",ST(0));
-       }
-       XSRETURN_UNDEF;
+    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))
-           ref = SvRV(ref);
-       Perl_sharedsv_share(aTHX, 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);
+        ST(0) = sv_2mortal(newRV_inc(ref));
+        /* XSRETURN(1); - implied */
+
 
 void
-lock_enabled(SV *ref)
-       PROTOTYPE: \[$@%]
-       CODE:
-       shared_sv* shared;
-       if(SvROK(ref))
-           ref = SvRV(ref);
-       shared = Perl_sharedsv_find(aTHX, ref);
-       if(!shared)
-          croak("lock can only be used on shared values");
-       Perl_sharedsv_lock(aTHX_ shared);
+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)
+            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(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
+
 
 void
-cond_wait_enabled(SV *ref)
-       PROTOTYPE: \[$@%]
-       CODE:
-       shared_sv* shared;
-       int locks;
-       if(SvROK(ref))
-           ref = SvRV(ref);
-       shared = Perl_sharedsv_find(aTHX_ ref);
-       if(!shared)
-           croak("cond_wait can only be used on shared values");
-       if(shared->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(&shared->lock.mutex);
-       shared->lock.owner = NULL;
-       locks = shared->lock.locks = 0;
-       COND_WAIT(&shared->user_cond, &shared->lock.mutex);
-       shared->lock.owner = aTHX;
-       shared->lock.locks = locks;
-       MUTEX_UNLOCK(&shared->lock.mutex);
+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)
+            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_signal_enabled(SV *ref)
-       PROTOTYPE: \[$@%]
-       CODE:
-       shared_sv* shared;
-       if(SvROK(ref))
-           ref = SvRV(ref);
-       shared = Perl_sharedsv_find(aTHX_ ref);
-       if(!shared)
-           croak("cond_signal can only be used on shared values");
-       COND_SIGNAL(&shared->user_cond);
+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)
+            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
-cond_broadcast_enabled(SV *ref)
-       PROTOTYPE: \[$@%]
-       CODE:
-       shared_sv* shared;
-       if(SvROK(ref))
-           ref = SvRV(ref);
-       shared = Perl_sharedsv_find(aTHX_ ref);
-       if(!shared)
-           croak("cond_broadcast can only be used on shared values");
-       COND_BROADCAST(&shared->user_cond);
+bless(SV* ref, ...);
+    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 */
 
 BOOT:
 {
+#ifdef USE_ITHREADS
      Perl_sharedsv_init(aTHX);
+#endif /* USE_ITHREADS */
 }