#include "perl.h"
#include "XSUB.h"
+#ifdef USE_ITHREADS
+
#ifdef WIN32
#include <windows.h>
#include <win32thread.h>
#define ithread_CLONE(thread) Perl_ithread_CLONE(aTHX_ thread)
#define ithread_detach(thread) Perl_ithread_detach(aTHX_ thread)
#define ithread_tid(thread) ((thread)->tid)
+#define ithread_yield(thread) (YIELD);
static perl_mutex create_destruct_mutex; /* protects the creation and destruction of threads*/
void
Perl_ithread_destruct (pTHX_ ithread* thread, const char *why)
{
+ PerlInterpreter* destroyperl = NULL;
MUTEX_LOCK(&thread->mutex);
if (!thread->next) {
Perl_croak(aTHX_ "panic: destruct destroyed thread %p (%s)",thread, why);
threads = NULL;
}
else {
- thread->next->prev = thread->prev->next;
- thread->prev->next = thread->next->prev;
+ thread->next->prev = thread->prev;
+ thread->prev->next = thread->next;
if (threads == thread) {
threads = thread->next;
}
MUTEX_UNLOCK(&create_destruct_mutex);
/* Thread is now disowned */
if (thread->interp) {
+ dTHXa(thread->interp);
PERL_SET_CONTEXT(thread->interp);
- perl_destruct(thread->interp);
- perl_free(thread->interp);
+ SvREFCNT_dec(thread->params);
+ thread->params = Nullsv;
+ 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
int veto_cleanup = 0;
MUTEX_LOCK(&create_destruct_mutex);
if (aTHX == PL_curinterp && active_threads != 1) {
- Perl_warn(aTHX_ "Cleanup skipped %d active threads", active_threads);
+ Perl_warn(aTHX_ "A thread exited while %" IVdf " other threads were still running",
+ (IV)active_threads);
veto_cleanup = 1;
}
MUTEX_UNLOCK(&create_destruct_mutex);
MUTEX_LOCK(&thread->mutex);
thread->count--;
if (thread->count == 0) {
- if (!(thread->state & (PERL_ITHR_DETACHED|PERL_ITHR_JOINED))) {
- Perl_warn(aTHX_ "Implicit detach");
- }
- MUTEX_UNLOCK(&thread->mutex);
- Perl_ithread_detach(aTHX_ thread);
+ if(thread->state & PERL_ITHR_FINISHED &&
+ (thread->state & PERL_ITHR_DETACHED ||
+ thread->state & PERL_ITHR_JOINED))
+ {
+ MUTEX_UNLOCK(&thread->mutex);
+ Perl_ithread_destruct(aTHX_ thread, "no reference");
+ }
+ else {
+ MUTEX_UNLOCK(&thread->mutex);
+ }
}
else {
MUTEX_UNLOCK(&thread->mutex);
}
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_ "Died:%_",ERRSV);
+ Perl_warn(aTHX_ "thread failed to start: %" SVf, ERRSV);
}
FREETMPS;
LEAVE;
}
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;
if (thread->state & PERL_ITHR_DETACHED) {
MUTEX_UNLOCK(&thread->mutex);
- SvREFCNT_dec(thread->params);
- thread->params = Nullsv;
Perl_ithread_destruct(aTHX_ thread, "detached finish");
} 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
{
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);
thread->next = threads;
thread->prev = threads->prev;
+ threads->prev = thread;
thread->prev->next = thread;
/* Set count to 1 immediately in case thread exits before
* we return to caller !
MUTEX_INIT(&thread->mutex);
thread->tid = tid_counter++;
thread->gimme = GIMME_V;
- thread->state = (thread->gimme == G_VOID) ? 1 : 0;
/* "Clone" our interpreter into the thread's interpreter
* This gives thread access to "static data" and code.
*/
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.
*/
SvTEMP_off(thread->init_function);
ptr_table_free(PL_ptr_table);
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 */
known_threads++;
active_threads++;
MUTEX_UNLOCK(&create_destruct_mutex);
+ sv_2mortal(params);
return ithread_to_SV(aTHX_ obj, thread, classname, FALSE);
}
}
else
{
- Perl_warn(aTHX_ "CLONE %_",obj);
+ Perl_warn(aTHX_ "CLONE %" SVf,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);
/* We have finished with it */
thread->state |= PERL_ITHR_JOINED;
MUTEX_UNLOCK(&thread->mutex);
- sv_unmagic(SvRV(obj),PERL_MAGIC_shared_scalar);
- Perl_ithread_destruct(aTHX_ thread, "joined");
+ sv_unmagic(SvRV(obj),PERL_MAGIC_shared_scalar);
return retparam;
}
return (AV*)NULL;
sv_unmagic(SvRV(sv),PERL_MAGIC_shared_scalar);
}
-
+#endif /* USE_ITHREADS */
MODULE = threads PACKAGE = threads PREFIX = ithread_
PROTOTYPES: DISABLE
+#ifdef USE_ITHREADS
+
void
ithread_new (classname, function_to_call, ...)
char * classname
if (items > 2) {
int i;
for(i = 2; i < items ; i++) {
- av_push(params, ST(i));
+ av_push(params, SvREFCNT_inc(ST(i)));
}
}
ST(0) = sv_2mortal(Perl_ithread_create(aTHX_ Nullsv, classname, function_to_call, newRV_noinc((SV*) params)));
}
void
+ithread_list(char *classname)
+PPCODE:
+{
+ ithread *curr_thread;
+ MUTEX_LOCK(&create_destruct_mutex);
+ curr_thread = threads;
+ if(curr_thread->tid != 0)
+ PUSHs( sv_2mortal(ithread_to_SV(aTHX_ NULL, curr_thread, classname, TRUE)));
+ while(curr_thread) {
+ curr_thread = curr_thread->next;
+ if(curr_thread == threads)
+ break;
+ if(curr_thread->state & PERL_ITHR_DETACHED ||
+ curr_thread->state & PERL_ITHR_JOINED)
+ continue;
+ PUSHs( sv_2mortal(ithread_to_SV(aTHX_ NULL, curr_thread, classname, TRUE)));
+ }
+ MUTEX_UNLOCK(&create_destruct_mutex);
+}
+
+
+void
ithread_self(char *classname)
CODE:
{
int i;
I32 len = AvFILL(params);
for (i = 0; i <= len; i++) {
- XPUSHs(av_shift(params));
+ SV* tmp = av_shift(params);
+ XPUSHs(tmp);
+ sv_2mortal(tmp);
}
SvREFCNT_dec(params);
}
+void
+yield(...)
+CODE:
+{
+ YIELD;
+}
+
void
ithread_detach(ithread *thread)
void
ithread_DESTROY(SV *thread)
+#endif /* USE_ITHREADS */
+
BOOT:
{
+#ifdef USE_ITHREADS
ithread* thread;
PL_perl_destruct_level = 2;
PERL_THREAD_ALLOC_SPECIFIC(self_key);
PERL_THREAD_SETSPECIFIC(self_key,thread);
MUTEX_UNLOCK(&create_destruct_mutex);
+#endif /* USE_ITHREADS */
}