#include "perl.h"
#include "XSUB.h"
+#ifdef USE_ITHREADS
+
#ifdef WIN32
#include <windows.h>
#include <win32thread.h>
#endif
#endif
+/* Values for 'state' member */
+#define PERL_ITHR_JOINABLE 0
+#define PERL_ITHR_DETACHED 1
+#define PERL_ITHR_FINISHED 4
+#define PERL_ITHR_JOINED 2
+
typedef struct ithread_s {
struct ithread_s *next; /* next thread in the list */
struct ithread_s *prev; /* prev thread in the list */
I32 tid; /* threads module's thread id */
perl_mutex mutex; /* mutex for updating things in this struct */
I32 count; /* how many SVs have a reference to us */
- signed char detached; /* are we detached ? */
+ signed char state; /* are we detached ? */
+ int gimme; /* Context of create */
SV* init_function; /* Code to run */
SV* params; /* args to pass function */
#ifdef WIN32
#define ithread_detach(thread) Perl_ithread_detach(aTHX_ thread)
#define ithread_tid(thread) ((thread)->tid)
-static perl_mutex create_mutex; /* protects the creation of threads ??? */
+static perl_mutex create_destruct_mutex; /* protects the creation and destruction of threads*/
I32 tid_counter = 0;
-
+I32 known_threads = 0;
+I32 active_threads = 0;
perl_key self_key;
/*
* Clear up after thread is done with
*/
void
-Perl_ithread_destruct (pTHX_ ithread* thread)
+Perl_ithread_destruct (pTHX_ ithread* thread, const char *why)
{
MUTEX_LOCK(&thread->mutex);
- Perl_warn(aTHX_ "destruct %d with count=%d",thread->tid,thread->count);
+ if (!thread->next) {
+ Perl_croak(aTHX_ "panic: destruct destroyed thread %p (%s)",thread, why);
+ }
if (thread->count != 0) {
MUTEX_UNLOCK(&thread->mutex);
- return;
+ return;
}
- MUTEX_UNLOCK(&thread->mutex);
- MUTEX_LOCK(&create_mutex);
+ MUTEX_LOCK(&create_destruct_mutex);
/* Remove from circular list of threads */
if (thread->next == thread) {
/* last one should never get here ? */
if (threads == thread) {
threads = thread->next;
}
+ thread->next = NULL;
+ thread->prev = NULL;
}
- MUTEX_UNLOCK(&create_mutex);
+ known_threads--;
+ assert( known_threads >= 0 );
+#if 0
+ Perl_warn(aTHX_ "destruct %d @ %p by %p now %d",
+ thread->tid,thread->interp,aTHX, known_threads);
+#endif
+ 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);
thread->interp = NULL;
}
PERL_SET_CONTEXT(aTHX);
+ MUTEX_UNLOCK(&thread->mutex);
+}
+
+int
+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 %d active threads", active_threads);
+ veto_cleanup = 1;
+ }
+ MUTEX_UNLOCK(&create_destruct_mutex);
+ return veto_cleanup;
}
+void
+Perl_ithread_detach(pTHX_ ithread *thread)
+{
+ MUTEX_LOCK(&thread->mutex);
+ if (!(thread->state & (PERL_ITHR_DETACHED|PERL_ITHR_JOINED))) {
+ thread->state |= PERL_ITHR_DETACHED;
+#ifdef WIN32
+ CloseHandle(thread->handle);
+ thread->handle = 0;
+#else
+ PERL_THREAD_DETACH(thread->thr);
+#endif
+ }
+ if ((thread->state & PERL_ITHR_FINISHED) &&
+ (thread->state & PERL_ITHR_DETACHED)) {
+ MUTEX_UNLOCK(&thread->mutex);
+ Perl_ithread_destruct(aTHX_ thread, "detach");
+ }
+ else {
+ MUTEX_UNLOCK(&thread->mutex);
+ }
+}
/* MAGIC (in mg.h sense) hooks */
{
ithread *thread = (ithread *) mg->mg_ptr;
MUTEX_LOCK(&thread->mutex);
- Perl_warn(aTHX_ "Unmagic %d with count=%d",thread->tid,thread->count);
thread->count--;
- MUTEX_UNLOCK(&thread->mutex);
- /* This is safe as it re-checks count */
- Perl_ithread_destruct(aTHX_ thread);
+ 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);
+ }
+ else {
+ MUTEX_UNLOCK(&thread->mutex);
+ }
return 0;
}
{
ithread *thread = (ithread *) mg->mg_ptr;
MUTEX_LOCK(&thread->mutex);
- Perl_warn(aTHX_ "DUP %d with count=%d",thread->tid,thread->count);
thread->count++;
MUTEX_UNLOCK(&thread->mutex);
return 0;
XPUSHs(av_shift(params));
}
PUTBACK;
- call_sv(thread->init_function, G_DISCARD|G_EVAL);
+ 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);
+ }
FREETMPS;
LEAVE;
- SvREFCNT_dec(thread->params);
SvREFCNT_dec(thread->init_function);
}
PerlIO_flush((PerlIO*)NULL);
+ MUTEX_LOCK(&create_destruct_mutex);
+ active_threads--;
+ assert( active_threads >= 0 );
+ MUTEX_UNLOCK(&create_destruct_mutex);
MUTEX_LOCK(&thread->mutex);
- Perl_warn(aTHX_ "finished %d with count=%d",thread->tid,thread->count);
- if (thread->detached == 1) {
+ thread->state |= PERL_ITHR_FINISHED;
+
+ if (thread->state & PERL_ITHR_DETACHED) {
MUTEX_UNLOCK(&thread->mutex);
- Perl_ithread_destruct(aTHX_ thread);
+ SvREFCNT_dec(thread->params);
+ thread->params = Nullsv;
+ Perl_ithread_destruct(aTHX_ thread, "detached finish");
} else {
- MUTEX_UNLOCK(&thread->mutex);
- }
+ MUTEX_UNLOCK(&thread->mutex);
+ }
#ifdef WIN32
return (DWORD)0;
#else
if (inc) {
MUTEX_LOCK(&thread->mutex);
thread->count++;
- Perl_warn(aTHX_ "SV for %d with count=%d",thread->tid,thread->count);
MUTEX_UNLOCK(&thread->mutex);
}
if (!obj)
ithread* thread;
CLONE_PARAMS clone_param;
- MUTEX_LOCK(&create_mutex);
+ MUTEX_LOCK(&create_destruct_mutex);
thread = PerlMemShared_malloc(sizeof(ithread));
Zero(thread,1,ithread);
thread->next = threads;
thread->count = 1;
MUTEX_INIT(&thread->mutex);
thread->tid = tid_counter++;
- thread->detached = 0;
+ 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.
#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
+ with aTHX matching the context for the duration of
+ our work for new interpreter.
+ */
+ {
+ dTHXa(thread->interp);
+ /* Here we remove END blocks since they should only run
+ in the thread they are created
+ */
+ SvREFCNT_dec(PL_endav);
+ PL_endav = newAV();
+ clone_param.flags = 0;
+ thread->init_function = sv_dup(init_function, &clone_param);
+ if (SvREFCNT(thread->init_function) == 0) {
+ SvREFCNT_inc(thread->init_function);
+ }
+
+ thread->params = sv_dup(params, &clone_param);
+ SvREFCNT_inc(thread->params);
+ SvTEMP_off(thread->init_function);
+ ptr_table_free(PL_ptr_table);
+ PL_ptr_table = NULL;
+ }
- clone_param.flags = 0;
- thread->init_function = Perl_sv_dup(thread->interp, init_function, &clone_param);
- if (SvREFCNT(thread->init_function) == 0) {
- SvREFCNT_inc(thread->init_function);
- }
-
- thread->params = Perl_sv_dup(thread->interp,params, &clone_param);
- SvREFCNT_inc(thread->params);
- SvTEMP_off(thread->init_function);
- ptr_table_free(PL_ptr_table);
- PL_ptr_table = NULL;
-
PERL_SET_CONTEXT(aTHX);
/* Start the thread */
{
static pthread_attr_t attr;
static int attr_inited = 0;
- sigset_t fullmask, oldmask;
static int attr_joinable = PTHREAD_CREATE_JOINABLE;
if (!attr_inited) {
attr_inited = 1;
#endif
}
#endif
- MUTEX_UNLOCK(&create_mutex);
+ known_threads++;
+ active_threads++;
+ MUTEX_UNLOCK(&create_destruct_mutex);
return ithread_to_SV(aTHX_ obj, thread, classname, FALSE);
}
}
/*
- * joins the thread this code needs to take the returnvalue from the
+ * Joins the thread this code needs to take the returnvalue from the
* call_sv and send it back
*/
}
}
-void
+AV*
Perl_ithread_join(pTHX_ SV *obj)
{
ithread *thread = SV_to_ithread(aTHX_ obj);
MUTEX_LOCK(&thread->mutex);
- Perl_warn(aTHX_ "joining %d with count=%d",thread->tid,thread->count);
- if (!thread->detached) {
+ if (thread->state & PERL_ITHR_DETACHED) {
+ MUTEX_UNLOCK(&thread->mutex);
+ Perl_croak(aTHX_ "Cannot join a detached thread");
+ }
+ else if (thread->state & PERL_ITHR_JOINED) {
+ MUTEX_UNLOCK(&thread->mutex);
+ Perl_croak(aTHX_ "Thread already joined");
+ }
+ else {
+ AV* retparam;
#ifdef WIN32
DWORD waitcode;
#else
#else
pthread_join(thread->thr,&retval);
#endif
- Perl_warn(aTHX_ "joined %d with count=%d",thread->tid,thread->count);
- /* We have finished with it */
MUTEX_LOCK(&thread->mutex);
- thread->detached = 2;
+
+ /* sv_dup over the args */
+ {
+ AV* params = (AV*) SvRV(thread->params);
+ CLONE_PARAMS clone_params;
+ clone_params.stashes = newAV();
+ PL_ptr_table = ptr_table_new();
+ retparam = (AV*) sv_dup((SV*)params, &clone_params);
+ SvREFCNT_dec(clone_params.stashes);
+ SvREFCNT_inc(retparam);
+ ptr_table_free(PL_ptr_table);
+ PL_ptr_table = NULL;
+
+ }
+ /* 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");
+ return retparam;
}
- else {
- MUTEX_UNLOCK(&thread->mutex);
- Perl_croak(aTHX_ "Cannot join a detached thread");
- }
+ return (AV*)NULL;
}
void
-Perl_ithread_detach(pTHX_ ithread *thread)
-{
- MUTEX_LOCK(&thread->mutex);
- if (!thread->detached) {
- thread->detached = 1;
-#ifdef WIN32
- CloseHandle(thread->handle);
- thread->handle = 0;
-#else
- PERL_THREAD_DETACH(thread->thr);
-#endif
- }
- MUTEX_UNLOCK(&thread->mutex);
-}
-
-
-void
Perl_ithread_DESTROY(pTHX_ SV *sv)
{
ithread *thread = SV_to_ithread(aTHX_ sv);
- Perl_warn(aTHX_ "DESTROY %d with count=%d",thread->tid,thread->count);
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
void
ithread_join(SV *obj)
+PPCODE:
+{
+ AV* params = Perl_ithread_join(aTHX_ obj);
+ int i;
+ I32 len = AvFILL(params);
+ for (i = 0; i <= len; i++) {
+ XPUSHs(av_shift(params));
+ }
+ SvREFCNT_dec(params);
+}
+
void
ithread_detach(ithread *thread)
void
ithread_DESTROY(SV *thread)
-void
-ithread_CLONE(SV *sv)
+#endif /* USE_ITHREADS */
BOOT:
{
+#ifdef USE_ITHREADS
ithread* thread;
+ PL_perl_destruct_level = 2;
PERL_THREAD_ALLOC_SPECIFIC(self_key);
- MUTEX_INIT(&create_mutex);
- MUTEX_LOCK(&create_mutex);
+ MUTEX_INIT(&create_destruct_mutex);
+ MUTEX_LOCK(&create_destruct_mutex);
+ PL_threadhook = &Perl_ithread_hook;
thread = PerlMemShared_malloc(sizeof(ithread));
Zero(thread,1,ithread);
PL_perl_destruct_level = 2;
thread->interp = aTHX;
thread->count = 1; /* imortal */
thread->tid = tid_counter++;
- thread->detached = 1;
+ known_threads++;
+ active_threads++;
+ thread->state = 1;
#ifdef WIN32
thread->thr = GetCurrentThreadId();
#else
thread->thr = pthread_self();
#endif
+
PERL_THREAD_SETSPECIFIC(self_key,thread);
- MUTEX_UNLOCK(&create_mutex);
+ MUTEX_UNLOCK(&create_destruct_mutex);
+#endif /* USE_ITHREADS */
}
-