Integrate thrperl 5.003->5.004.

p4raw-id: //depot/perl@24

1 files changed, 18 insertions, 13 deletions

diff --git a/run.c b/run.c
index 0ce2b9ffed..e41616019c 100644
--- a/run.c
+++ b/run.c
@@ -23,10 +23,11 @@ dEXT char *watchok;
 
 int
 runops() {
+    dTHR;
     SAVEI32(runlevel);
     runlevel++;
 
-    while ( op = (*op->op_ppaddr)() ) ;
+    while ( op = (*op->op_ppaddr)(ARGS) ) ;
 
     TAINT_NOT;
     return 0;
@@ -34,10 +35,11 @@ runops() {
 
 #else
 
-static void debprof _((OP*op));
+static void debprof _((OP*o));
 
 int
 runops() {
+    dTHR;
     if (!op) {
 	warn("NULL OP IN RUN");
 	return 0;
@@ -54,28 +56,31 @@ runops() {
 	    DEBUG_s(debstack());
 	    DEBUG_t(debop(op));
 	    DEBUG_P(debprof(op));
+#ifdef USE_THREADS
+	    DEBUG_L(YIELD());	/* shake up scheduling a bit */
+#endif /* USE_THREADS */
 	}
-    } while ( op = (*op->op_ppaddr)() );
+    } while ( op = (*op->op_ppaddr)(ARGS) );
 
     TAINT_NOT;
     return 0;
 }
 
 I32
-debop(op)
-OP *op;
+debop(o)
+OP *o;
 {
     SV *sv;
-    deb("%s", op_name[op->op_type]);
-    switch (op->op_type) {
+    deb("%s", op_name[o->op_type]);
+    switch (o->op_type) {
     case OP_CONST:
-	PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOP->op_sv));
+	PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo->op_sv));
 	break;
     case OP_GVSV:
     case OP_GV:
-	if (cGVOP->op_gv) {
+	if (cGVOPo->op_gv) {
 	    sv = NEWSV(0,0);
-	    gv_fullname3(sv, cGVOP->op_gv, Nullch);
+	    gv_fullname3(sv, cGVOPo->op_gv, Nullch);
 	    PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, na));
 	    SvREFCNT_dec(sv);
 	}
@@ -100,12 +105,12 @@ char **addr;
 }
 
 static void
-debprof(op)
-OP* op;
+debprof(o)
+OP* o;
 {
     if (!profiledata)
 	New(000, profiledata, MAXO, U32);
-    ++profiledata[op->op_type];
+    ++profiledata[o->op_type];
 }
 
 void