[PATCH] Syncing with Test::Simple 0.19

[p5sagit/p5-mst-13.2.git] / sharedsv.h

diff --git a/sharedsv.h b/sharedsv.h
index 16bba11..f92a94a 100644 (file)
--- a/sharedsv.h
+++ b/sharedsv.h
@@ -5,11 +5,13 @@ typedef struct {
     SV*              sv;    /* The actual data */
     perl_mutex       mutex; /* Our mutex */
     perl_cond        cond;  /* Our condition variable */
+    perl_cond        user_cond;  /* For user level conditions */
     IV               locks; /* Number of locks held */
     PerlInterpreter* owner; /* who owns the lock */
 } shared_sv;
 
 extern PerlInterpreter* sharedsv_space;
+extern perl_mutex  sharedsv_space_mutex;
 
 void Perl_sharedsv_unlock_scope(pTHX_ shared_sv* ssv);
 void Perl_sharedsv_unlock(pTHX_ shared_sv* ssv);
@@ -22,8 +24,14 @@ void Perl_sharedsv_thrcnt_dec(pTHX_ shared_sv* ssv);
 
 
 #define SHAREDSvGET(a)     (a->sv)
-#define SHAREDSvEDIT(a)    PERL_SET_CONTEXT(sharedsv_space)
-#define SHAREDSvRELEASE(a) PERL_SET_CONTEXT(my_perl)
+#define SHAREDSvEDIT(a)    { MUTEX_LOCK(&sharedsv_space_mutex);\
+SHAREDSvLOCK((a));\
+PERL_SET_CONTEXT(sharedsv_space);\
+}
+#define SHAREDSvRELEASE(a) { PERL_SET_CONTEXT((a)->owner);\
+SHAREDSvUNLOCK((a));\
+MUTEX_UNLOCK(&sharedsv_space_mutex);\
+}
 #define SHAREDSvLOCK(a)    Perl_sharedsv_lock(aTHX_ a)
 #define SHAREDSvUNLOCK(a)  Perl_sharedsv_unlock(aTHX_ a)