Integrate from maintperl:

[p5sagit/p5-mst-13.2.git] / ext / threads / threads.xs

diff --git a/ext/threads/threads.xs b/ext/threads/threads.xs
index 4173299..205c889 100755 (executable)
--- a/ext/threads/threads.xs
+++ b/ext/threads/threads.xs
@@ -131,14 +131,19 @@ Perl_ithread_destruct (pTHX_ ithread* thread, const char *why)
            destroyperl = thread->interp;
            thread->interp = NULL;
        }
-       PERL_SET_CONTEXT(aTHX);
        MUTEX_UNLOCK(&thread->mutex);
        MUTEX_DESTROY(&thread->mutex);
         PerlMemShared_free(thread);
        if(destroyperl) {
+           ithread*        current_thread;
+           PERL_THREAD_GETSPECIFIC(self_key,current_thread);
+           PERL_THREAD_SETSPECIFIC(self_key,thread);
            perl_destruct(destroyperl);
             perl_free(destroyperl);
+           PERL_THREAD_SETSPECIFIC(self_key,current_thread);
+
        }
+       PERL_SET_CONTEXT(aTHX);
 }
 
 int
@@ -277,12 +282,12 @@ Perl_ithread_run(void * arg) {
                }
                PUTBACK;
                len = call_sv(thread->init_function, thread->gimme|G_EVAL);
+
                SPAGAIN;
                for (i=len-1; i >= 0; i--) {
                  SV *sv = POPs;
                  av_store(params, i, SvREFCNT_inc(sv));
                }
-               PUTBACK;
                if (SvTRUE(ERRSV)) {
                    Perl_warn(aTHX_ "thread failed to start: %" SVf, ERRSV);
                }
@@ -358,7 +363,8 @@ Perl_ithread_create(pTHX_ SV *obj, char* classname, SV* init_function, SV* param
 {
        ithread*        thread;
        CLONE_PARAMS    clone_param;
-
+       ithread*        current_thread;
+       PERL_THREAD_GETSPECIFIC(self_key,current_thread);
        MUTEX_LOCK(&create_destruct_mutex);
        thread = PerlMemShared_malloc(sizeof(ithread));
        Zero(thread,1,ithread);
@@ -379,14 +385,14 @@ Perl_ithread_create(pTHX_ SV *obj, char* classname, SV* init_function, SV* param
         */
 
        PerlIO_flush((PerlIO*)NULL);
-
+       PERL_THREAD_SETSPECIFIC(self_key,thread);
 #ifdef WIN32
        thread->interp = perl_clone(aTHX, CLONEf_KEEP_PTR_TABLE | CLONEf_CLONE_HOST);
 #else
        thread->interp = perl_clone(aTHX, CLONEf_KEEP_PTR_TABLE);
 #endif
        /* perl_clone leaves us in new interpreter's context.
-          As it is tricky to spot implcit aTHX create a new scope
+          As it is tricky to spot an implicit aTHX, create a new scope
           with aTHX matching the context for the duration of
           our work for new interpreter.
         */
@@ -410,7 +416,7 @@ Perl_ithread_create(pTHX_ SV *obj, char* classname, SV* init_function, SV* param
            PL_ptr_table = NULL;
            PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
        }
-
+       PERL_THREAD_SETSPECIFIC(self_key,current_thread);
        PERL_SET_CONTEXT(aTHX);
 
        /* Start the thread */
@@ -507,11 +513,34 @@ Perl_ithread_join(pTHX_ SV *obj)
        
        /* sv_dup over the args */
        {
+         ithread*        current_thread;
          AV* params = (AV*) SvRV(thread->params);      
          CLONE_PARAMS clone_params;
          clone_params.stashes = newAV();
+         clone_params.flags |= CLONEf_JOIN_IN;
          PL_ptr_table = ptr_table_new();
+         PERL_THREAD_GETSPECIFIC(self_key,current_thread);
+         PERL_THREAD_SETSPECIFIC(self_key,thread);
+
+         {
+           I32 len = av_len(params)+1;
+           I32 i;
+           for(i = 0; i < len; i++) {
+             //              sv_dump(SvRV(AvARRAY(params)[i]));
+           }
+         }
+
          retparam = (AV*) sv_dup((SV*)params, &clone_params);
+#if 0
+         {
+           I32 len = av_len(retparam)+1;
+           I32 i;
+           for(i = 0; i < len; i++) {
+               sv_dump(SvRV(AvARRAY(retparam)[i]));
+           }
+         }
+#endif
+         PERL_THREAD_SETSPECIFIC(self_key,current_thread);
          SvREFCNT_dec(clone_params.stashes);
          SvREFCNT_inc(retparam);
          ptr_table_free(PL_ptr_table);