X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=util.c;h=df6bbf5f33a65b66e2b13057f0104f78fcd6db28;hb=544f31531e7cbe3b4e7571d94c56f36d53f647fa;hp=4f55376209b279e40185b8d571d227a99f51b2f8;hpb=6c85703cf9eae156b03f18186f39b571bd208c32;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/util.c b/util.c
index 4f55376..df6bbf5 100644
--- a/util.c
+++ b/util.c
@@ -2402,9 +2402,9 @@ Perl_my_popen(pTHX_ char *cmd, char *mode)
 	PerlLIO_close(p[This]);
 	p[This] = p[that];
     }
-    FDPID_LOCK();
+    LOCK_FDPID_MUTEX;
     sv = *av_fetch(PL_fdpid,p[This],TRUE);
-    FDPID_UNLOCK();
+    UNLOCK_FDPID_MUTEX;
     (void)SvUPGRADE(sv,SVt_IV);
     SvIVX(sv) = pid;
     PL_forkprocess = pid;
@@ -2622,9 +2622,9 @@ Perl_my_pclose(pTHX_ PerlIO *ptr)
     int saved_win32_errno;
 #endif
 
-    FDPID_LOCK();
+    LOCK_FDPID_MUTEX;
     svp = av_fetch(PL_fdpid,PerlIO_fileno(ptr),TRUE);
-    FDPID_UNLOCK();
+    UNLOCK_FDPID_MUTEX;
     pid = SvIVX(*svp);
     SvREFCNT_dec(*svp);
     *svp = &PL_sv_undef;
@@ -3497,35 +3497,32 @@ Perl_condpair_magic(pTHX_ SV *sv)
 }
 
 SV *
-Perl_lock(pTHX_ SV *osv)
+Perl_sv_lock(pTHX_ SV *osv)
 {
-#ifdef USE_THREADS
     MAGIC *mg;
     SV *sv = osv;
 
-    SvLOCK(osv);
+    LOCK_SV_LOCK_MUTEX;
     if (SvROK(sv)) {
 	sv = SvRV(sv);
-	SvUNLOCK(osv);
-	SvLOCK(sv);
     }
 
     mg = condpair_magic(sv);
     MUTEX_LOCK(MgMUTEXP(mg));
     if (MgOWNER(mg) == thr)
 	MUTEX_UNLOCK(MgMUTEXP(mg));
-     else {
+    else {
 	while (MgOWNER(mg))
 	    COND_WAIT(MgOWNERCONDP(mg), MgMUTEXP(mg));
 	MgOWNER(mg) = thr;
-	DEBUG_S(PerlIO_printf(Perl_debug_log, "0x%"UVxf": pp_lock lock 0x%"UVxf"\n",
+	DEBUG_S(PerlIO_printf(Perl_debug_log,
+			      "0x%"UVxf": Perl_lock lock 0x%"UVxf"\n",
 			      PTR2UV(thr), PTR2UV(sv));)
 	MUTEX_UNLOCK(MgMUTEXP(mg));
 	SAVEDESTRUCTOR_X(Perl_unlock_condpair, sv);
     }
-#endif
-  SvUNLOCK(sv);
-  return sv;
+    UNLOCK_SV_LOCK_MUTEX;
+    return sv;
 }
 
 /*