#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 */
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);
+ if (!thread->next) {
+ Perl_croak(aTHX_ "panic: destruct destroyed thread %p (%s)",thread, why);
+ }
if (thread->count != 0) {
MUTEX_UNLOCK(&thread->mutex);
return;
if (threads == thread) {
threads = thread->next;
}
+ thread->next = NULL;
+ thread->prev = NULL;
}
- active_threads--;
- MUTEX_UNLOCK(&create_destruct_mutex);
- /* Thread is now disowned */
+ known_threads--;
+ assert( known_threads >= 0 );
#if 0
- Perl_warn(aTHX_ "destruct %d @ %p by %p",
- thread->tid,thread->interp,aTHX);
+ 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);
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);
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;
}
}
PerlIO_flush((PerlIO*)NULL);
+ MUTEX_LOCK(&create_destruct_mutex);
+ active_threads--;
+ assert( active_threads >= 0 );
+ MUTEX_UNLOCK(&create_destruct_mutex);
MUTEX_LOCK(&thread->mutex);
- if (thread->detached & 1) {
+ 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);
+ Perl_ithread_destruct(aTHX_ thread, "detached finish");
} else {
- thread->detached |= 4;
- MUTEX_UNLOCK(&thread->mutex);
- }
+ MUTEX_UNLOCK(&thread->mutex);
+ }
#ifdef WIN32
return (DWORD)0;
#else
MUTEX_INIT(&thread->mutex);
thread->tid = tid_counter++;
thread->gimme = GIMME_V;
- thread->detached = (thread->gimme == G_VOID) ? 1 : 0;
+ 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.
{
dTHXa(thread->interp);
/* Here we remove END blocks since they should only run
- in the thread they are created
+ in the thread they are created
*/
SvREFCNT_dec(PL_endav);
PL_endav = newAV();
#endif
}
#endif
+ known_threads++;
active_threads++;
MUTEX_UNLOCK(&create_destruct_mutex);
return ithread_to_SV(aTHX_ obj, thread, classname, FALSE);
}
}
-AV*
+AV*
Perl_ithread_join(pTHX_ SV *obj)
{
ithread *thread = SV_to_ithread(aTHX_ obj);
MUTEX_LOCK(&thread->mutex);
- if (thread->detached & 1) {
+ if (thread->state & PERL_ITHR_DETACHED) {
MUTEX_UNLOCK(&thread->mutex);
Perl_croak(aTHX_ "Cannot join a detached thread");
}
- else if (thread->detached & 2) {
+ else if (thread->state & PERL_ITHR_JOINED) {
MUTEX_UNLOCK(&thread->mutex);
Perl_croak(aTHX_ "Thread already joined");
}
#endif
MUTEX_LOCK(&thread->mutex);
+ /* sv_dup over the args */
{
- AV* params = (AV*) SvRV(thread->params);
+ AV* params = (AV*) SvRV(thread->params);
CLONE_PARAMS clone_params;
clone_params.stashes = newAV();
PL_ptr_table = ptr_table_new();
PL_ptr_table = NULL;
}
- /* sv_dup over the args */
/* We have finished with it */
- thread->detached |= 2;
+ thread->state |= PERL_ITHR_JOINED;
MUTEX_UNLOCK(&thread->mutex);
sv_unmagic(SvRV(obj),PERL_MAGIC_shared_scalar);
- Perl_ithread_destruct(aTHX_ thread);
+ Perl_ithread_destruct(aTHX_ thread, "joined");
return retparam;
}
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_THREAD_ALLOC_SPECIFIC(self_key);
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++;
+ known_threads++;
active_threads++;
- thread->detached = 1;
+ thread->state = 1;
#ifdef WIN32
thread->thr = GetCurrentThreadId();
#else
thread->thr = pthread_self();
#endif
+
PERL_THREAD_SETSPECIFIC(self_key,thread);
MUTEX_UNLOCK(&create_destruct_mutex);
}
}
/*
+=for apidoc nothreadhook
+
+Stub that provides thread hook for perl_destruct when there are
+no threads.
+
+=cut
+*/
+
+int
+Perl_nothreadhook(pTHXx)
+{
+ return 0;
+}
+
+/*
=for apidoc perl_destruct
Shuts down a Perl interpreter. See L<perlembed>.
LEAVE;
FREETMPS;
+ if (CALL_FPTR(PL_threadhook)(aTHX)) {
+ /* Threads hook has vetoed further cleanup */
+ return STATUS_NATIVE_EXPORT;;
+ }
+
/* We must account for everything. */
/* Destroy the main CV and syntax tree */
/* This strips off Perl comments which might interfere with
- the C pre-processor, including #!. #line directives are
- deliberately stripped to avoid confusion with Perl's version
+ the C pre-processor, including #!. #line directives are
+ deliberately stripped to avoid confusion with Perl's version
of #line. FWP played some golf with it so it will fit
into VMS's 255 character buffer.
*/
Perl_sv_setpvf(aTHX_ cmd, "\
%s -ne%s%s%s %s | %"SVf" %s %"SVf" %s",
- perl, quote, code, quote, scriptname, cpp,
+ perl, quote, code, quote, scriptname, cpp,
cpp_discard_flag, sv, CPPMINUS);
PL_doextract = FALSE;
}
# endif /* IAMSUID */
- DEBUG_P(PerlIO_printf(Perl_debug_log,
- "PL_preprocess: cmd=\"%s\"\n",
+ DEBUG_P(PerlIO_printf(Perl_debug_log,
+ "PL_preprocess: cmd=\"%s\"\n",
SvPVX(cmd)));
PL_rsfp = PerlProc_popen(SvPVX(cmd), "r");
PL_statbuf.st_mode & (S_ISUID|S_ISGID))
{
/* try again */
- PerlProc_execv(Perl_form(aTHX_ "%s/sperl"PERL_FS_VER_FMT,
- BIN_EXP, (int)PERL_REVISION,
+ PerlProc_execv(Perl_form(aTHX_ "%s/sperl"PERL_FS_VER_FMT,
+ BIN_EXP, (int)PERL_REVISION,
(int)PERL_VERSION,
(int)PERL_SUBVERSION), PL_origargv);
Perl_croak(aTHX_ "Can't do setuid\n");
projects / p5sagit/p5-mst-13.2.git / commitdiff