Re-introduce the changes from change 68 (runops becomes a

[p5sagit/p5-mst-13.2.git] / mg.c

diff --git a/mg.c b/mg.c
index cf2d71f..b931065 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -454,11 +454,14 @@ MAGIC *mg;
 #endif
        break;
     case '?':
-       sv_setiv(sv, (IV)STATUS_CURRENT);
+       {
+           dTHR;
+           sv_setiv(sv, (IV)STATUS_CURRENT);
 #ifdef COMPLEX_STATUS
-       LvTARGOFF(sv) = statusvalue;
-       LvTARGLEN(sv) = statusvalue_vms;
+           LvTARGOFF(sv) = statusvalue;
+           LvTARGLEN(sv) = statusvalue_vms;
 #endif
+       }
        break;
     case '^':
        s = IoTOP_NAME(GvIOp(defoutgv));
@@ -491,7 +494,7 @@ MAGIC *mg;
     case '/':
        break;
     case '[':
-       sv_setiv(sv, (IV)curcop->cop_arybase);
+       WITH_THR(sv_setiv(sv, (IV)curcop->cop_arybase));
        break;
     case '|':
        sv_setiv(sv, (IV)(IoFLAGS(GvIOp(defoutgv)) & IOf_FLUSH) != 0 );
@@ -665,6 +668,7 @@ MAGIC* mg;
        if(psig_ptr[i])
            sv_setsv(sv,psig_ptr[i]);
        else {
+           dTHR;               /* just for SvREFCNT_inc */
            Sighandler_t sigstate = rsignal_state(i);
 
            /* cache state so we don't fetch it again */
@@ -966,6 +970,7 @@ magic_getarylen(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
+    dTHR;
     sv_setiv(sv, AvFILL((AV*)mg->mg_obj) + curcop->cop_arybase);
     return 0;
 }
@@ -975,6 +980,7 @@ magic_setarylen(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
+    dTHR;
     av_fill((AV*)mg->mg_obj, SvIV(sv) - curcop->cop_arybase);
     return 0;
 }
@@ -989,6 +995,7 @@ MAGIC* mg;
     if (SvTYPE(lsv) >= SVt_PVMG && SvMAGIC(lsv)) {
        mg = mg_find(lsv, 'g');
        if (mg && mg->mg_len >= 0) {
+           dTHR;
            sv_setiv(sv, mg->mg_len + curcop->cop_arybase);
            return 0;
        }
@@ -1022,7 +1029,7 @@ MAGIC* mg;
     }
     len = SvPOK(lsv) ? SvCUR(lsv) : sv_len(lsv);
 
-    pos = SvIV(sv) - curcop->cop_arybase;
+    WITH_THR(pos = SvIV(sv) - curcop->cop_arybase);
     if (pos < 0) {
        pos += len;
        if (pos < 0)
@@ -1141,6 +1148,7 @@ MAGIC* mg;
                targ = AvARRAY(av)[LvTARGOFF(sv)];
        }
        if (targ && targ != &sv_undef) {
+           dTHR;               /* just for SvREFCNT_dec */
            /* somebody else defined it for us */
            SvREFCNT_dec(LvTARG(sv));
            LvTARG(sv) = SvREFCNT_inc(targ);
@@ -1183,6 +1191,7 @@ void
 vivify_defelem(sv)
 SV* sv;
 {
+    dTHR;                      /* just for SvREFCNT_inc and SvREFCNT_dec*/
     MAGIC* mg;
     SV* value;
 
@@ -1620,6 +1629,8 @@ SV *sv;
 MAGIC *mg;
 {
     dTHR;
+    DEBUG_L(PerlIO_printf(PerlIO_stderr(), "0x%lx: magic_mutexfree 0x%lx\n",
+                         (unsigned long)thr, (unsigned long)sv);)
     if (MgOWNER(mg))
        croak("panic: magic_mutexfree");
     MUTEX_DESTROY(MgMUTEXP(mg));