X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2Fthreads%2Fthreads.xs;h=59e3597aadba329939d9a6b195d9518458b39467;hb=65575be5af9681bf691b8b72b0e5b7f432a867bf;hp=1c2c133ee1ea8b411b2701d726a253ba4abbcb28;hpb=436c6dd385a3b29cadf4fa091af1c55eed665e29;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/threads/threads.xs b/ext/threads/threads.xs
index 1c2c133..59e3597 100755
--- a/ext/threads/threads.xs
+++ b/ext/threads/threads.xs
@@ -143,7 +143,7 @@ Perl_ithread_hook(pTHX)
     int veto_cleanup = 0;
     MUTEX_LOCK(&create_destruct_mutex);
     if (aTHX == PL_curinterp && active_threads != 1) {
-	Perl_warn(aTHX_ "Cleanup skipped %" IVdf " active threads",
+	Perl_warn(aTHX_ "A thread exited while %" IVdf " other threads were still running",
 						(IV)active_threads);
 	veto_cleanup = 1;
     }
@@ -280,7 +280,7 @@ Perl_ithread_run(void * arg) {
 		}
 		PUTBACK;
 		if (SvTRUE(ERRSV)) {
-		    Perl_warn(aTHX_ "Died:%" SVf,ERRSV);
+		    Perl_warn(aTHX_ "thread failed to start: %" SVf, ERRSV);
 		}
 		FREETMPS;
 		LEAVE;
@@ -288,10 +288,6 @@ Perl_ithread_run(void * arg) {
 	}
 
 	PerlIO_flush((PerlIO*)NULL);
-	MUTEX_LOCK(&create_destruct_mutex);
-	active_threads--;
-	assert( active_threads >= 0 );
-	MUTEX_UNLOCK(&create_destruct_mutex);
 	MUTEX_LOCK(&thread->mutex);
 	thread->state |= PERL_ITHR_FINISHED;
 
@@ -301,6 +297,11 @@ Perl_ithread_run(void * arg) {
 	} else {
 		MUTEX_UNLOCK(&thread->mutex);
 	}
+	MUTEX_LOCK(&create_destruct_mutex);
+	active_threads--;
+	assert( active_threads >= 0 );
+	MUTEX_UNLOCK(&create_destruct_mutex);
+
 #ifdef WIN32
 	return (DWORD)0;
 #else
@@ -601,7 +602,12 @@ PPCODE:
 }
 
 void
-ithread_yield(ithread *thread)
+yield(...)
+CODE:
+{
+    YIELD;
+}
+	
 
 void
 ithread_detach(ithread *thread)