#ifdef USE_ITHREADS
+
#ifdef WIN32
#include <windows.h>
#include <win32thread.h>
-#define PERL_THREAD_SETSPECIFIC(k,v) TlsSetValue(k,v)
-#define PERL_THREAD_GETSPECIFIC(k,v) v = TlsGetValue(k)
-#define PERL_THREAD_ALLOC_SPECIFIC(k) \
-STMT_START {\
- if((k = TlsAlloc()) == TLS_OUT_OF_INDEXES) {\
- PerlIO_printf(PerlIO_stderr(),"panic threads.h: TlsAlloc");\
- exit(1);\
- }\
-} STMT_END
+#else
+#ifdef OS2
+typedef perl_os_thread pthread_t;
#else
#include <pthread.h>
+#endif
#include <thread.h>
-
#define PERL_THREAD_SETSPECIFIC(k,v) pthread_setspecific(k,v)
#ifdef OLD_PTHREADS_API
#define PERL_THREAD_DETACH(t) pthread_detach(&(t))
-#define PERL_THREAD_GETSPECIFIC(k,v) pthread_getspecific(k,&v)
-#define PERL_THREAD_ALLOC_SPECIFIC(k) STMT_START {\
- if(pthread_keycreate(&(k),0)) {\
- PerlIO_printf(PerlIO_stderr(), "panic threads.h: pthread_key_create");\
- exit(1);\
- }\
-} STMT_END
#else
#define PERL_THREAD_DETACH(t) pthread_detach((t))
-#define PERL_THREAD_GETSPECIFIC(k,v) v = pthread_getspecific(k)
-#define PERL_THREAD_ALLOC_SPECIFIC(k) STMT_START {\
- if(pthread_key_create(&(k),0)) {\
- PerlIO_printf(PerlIO_stderr(), "panic threads.h: pthread_key_create");\
- exit(1);\
- }\
-} STMT_END
-#endif
+#endif /* OLD_PTHREADS_API */
#endif
+
+
+
/* Values for 'state' member */
#define PERL_ITHR_JOINABLE 0
#define PERL_ITHR_DETACHED 1
#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 */
+ struct ithread_s *next; /* Next thread in the list */
+ struct ithread_s *prev; /* Prev thread in the list */
PerlInterpreter *interp; /* The threads interpreter */
- 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 state; /* are we detached ? */
+ 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 state; /* Are we detached ? */
int gimme; /* Context of create */
SV* init_function; /* Code to run */
- SV* params; /* args to pass function */
+ SV* params; /* Args to pass function */
#ifdef WIN32
DWORD thr; /* OS's idea if thread id */
HANDLE handle; /* OS's waitable handle */
I32 tid_counter = 0;
I32 known_threads = 0;
I32 active_threads = 0;
-perl_key self_key;
+
+
+void Perl_ithread_set (pTHX_ ithread* thread)
+{
+ SV* thread_sv = newSViv((IV)thread);
+ if(!hv_store(PL_modglobal, "threads::self", 12, thread_sv,0)) {
+ croak("%s\n","Internal error, couldn't set TLS");
+ }
+}
+
+ithread* Perl_ithread_get (pTHX) {
+ SV** thread_sv = hv_fetch(PL_modglobal, "threads::self",12,0);
+ if(!thread_sv) {
+ croak("%s\n","Internal error, couldn't get TLS");
+ }
+ return (ithread*)SvIV(*thread_sv);
+}
+
+
/*
* Clear up after thread is done with
#endif
MUTEX_UNLOCK(&create_destruct_mutex);
/* Thread is now disowned */
- if (thread->interp) {
+
+ if(thread->interp) {
dTHXa(thread->interp);
+ ithread* current_thread;
+#ifdef OEMVS
+ void *ptr;
+#endif
PERL_SET_CONTEXT(thread->interp);
+ current_thread = Perl_ithread_get(aTHX);
+ Perl_ithread_set(aTHX_ thread);
+
+
+
+
SvREFCNT_dec(thread->params);
+
+
+
thread->params = Nullsv;
perl_destruct(thread->interp);
- perl_free(thread->interp);
+ perl_free(thread->interp);
thread->interp = NULL;
}
- PERL_SET_CONTEXT(aTHX);
MUTEX_UNLOCK(&thread->mutex);
MUTEX_DESTROY(&thread->mutex);
PerlMemShared_free(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_ "A thread exited while %" IVdf " other threads were still running",
+ Perl_warn(aTHX_ "A thread exited while %" IVdf " threads were running",
(IV)active_threads);
veto_cleanup = 1;
}
ithread* thread = (ithread*) arg;
dTHXa(thread->interp);
PERL_SET_CONTEXT(thread->interp);
- PERL_THREAD_SETSPECIFIC(self_key,thread);
+ Perl_ithread_set(aTHX_ thread);
#if 0
/* Far from clear messing with ->thr child-side is a good idea */
}
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:%" SVf,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;
} 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 *
SV_to_ithread(pTHX_ SV *sv)
{
- ithread *thread;
if (SvROK(sv))
{
- thread = INT2PTR(ithread*, SvIV(SvRV(sv)));
+ return INT2PTR(ithread*, SvIV(SvRV(sv)));
}
else
{
- PERL_THREAD_GETSPECIFIC(self_key,thread);
+ return Perl_ithread_get(aTHX);
}
- return thread;
}
/*
- * iThread->create(); ( aka iThread->new() )
+ * ithread->create(); ( aka ithread->new() )
* Called in context of parent thread
*/
{
ithread* thread;
CLONE_PARAMS clone_param;
+ ithread* current_thread = Perl_ithread_get(aTHX);
+
+ SV** tmps_tmp = PL_tmps_stack;
+ I32 tmps_ix = PL_tmps_ix;
+
MUTEX_LOCK(&create_destruct_mutex);
thread = PerlMemShared_malloc(sizeof(ithread));
*/
PerlIO_flush((PerlIO*)NULL);
+ Perl_ithread_set(aTHX_ thread);
+
+ SAVEBOOL(PL_srand_called); /* Save this so it becomes the correct
+ value */
+ PL_srand_called = FALSE; /* Set it to false so we can detect
+ if it gets set during the clone */
#ifdef WIN32
thread->interp = perl_clone(aTHX, CLONEf_KEEP_PTR_TABLE | CLONEf_CLONE_HOST);
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.
*/
{
dTHXa(thread->interp);
+
/* Here we remove END blocks since they should only run
in the thread they are created
*/
if (SvREFCNT(thread->init_function) == 0) {
SvREFCNT_inc(thread->init_function);
}
+
+
thread->params = sv_dup(params, &clone_param);
SvREFCNT_inc(thread->params);
+
+
+ /* The code below checks that anything living on
+ the tmps stack and has been cloned (so it lives in the
+ ptr_table) has a refcount higher than 0
+
+ If the refcount is 0 it means that a something on the
+ stack/context was holding a reference to it and
+ since we init_stacks() in perl_clone that won't get
+ cleaned and we will get a leaked scalar.
+ The reason it was cloned was that it lived on the
+ @_ stack.
+
+ Example of this can be found in bugreport 15837
+ where calls in the parameter list end up as a temp
+
+ One could argue that this fix should be in perl_clone
+ */
+
+
+ while (tmps_ix > 0) {
+ SV* sv = (SV*)ptr_table_fetch(PL_ptr_table, tmps_tmp[tmps_ix]);
+ tmps_ix--;
+ if (sv && SvREFCNT(sv) == 0) {
+ SvREFCNT_inc(sv);
+ SvREFCNT_dec(sv);
+ }
+ }
+
+
+
SvTEMP_off(thread->init_function);
ptr_table_free(PL_ptr_table);
PL_ptr_table = NULL;
PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
}
-
+ Perl_ithread_set(aTHX_ current_thread);
PERL_SET_CONTEXT(aTHX);
/* Start the thread */
# endif
# ifdef THREAD_CREATE_NEEDS_STACK
if(pthread_attr_setstacksize(&attr, THREAD_CREATE_NEEDS_STACK))
- croak("panic: pthread_attr_setstacksize failed");
+ Perl_croak(aTHX_ "panic: pthread_attr_setstacksize failed");
# endif
#ifdef OLD_PTHREADS_API
pthread_create( &thread->thr, attr, Perl_ithread_run, (void *)thread);
#else
+# if defined(HAS_PTHREAD_ATTR_SETSCOPE) && defined(PTHREAD_SCOPE_SYSTEM)
+ pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM );
+# endif
pthread_create( &thread->thr, &attr, Perl_ithread_run, (void *)thread);
#endif
}
active_threads++;
MUTEX_UNLOCK(&create_destruct_mutex);
sv_2mortal(params);
+
return ithread_to_SV(aTHX_ obj, thread, classname, FALSE);
}
SV*
Perl_ithread_self (pTHX_ SV *obj, char* Class)
{
- ithread *thread;
- PERL_THREAD_GETSPECIFIC(self_key,thread);
- return ithread_to_SV(aTHX_ obj, thread, Class, TRUE);
+ ithread *thread = Perl_ithread_get(aTHX);
+ if (thread)
+ return ithread_to_SV(aTHX_ obj, thread, Class, TRUE);
+ else
+ Perl_croak(aTHX_ "panic: cannot find thread data");
+ return NULL; /* silence compiler warning */
}
/*
/* 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();
+ current_thread = Perl_ithread_get(aTHX);
+ Perl_ithread_set(aTHX_ thread);
+
+#if 0
+ {
+ I32 len = av_len(params)+1;
+ I32 i;
+ for(i = 0; i < len; i++) {
+ sv_dump(SvRV(AvARRAY(params)[i]));
+ }
+ }
+#endif
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_ithread_set(aTHX_ current_thread);
SvREFCNT_dec(clone_params.stashes);
SvREFCNT_inc(retparam);
ptr_table_free(PL_ptr_table);
PL_ptr_table = NULL;
}
- /* We have finished with it */
+ /* We are finished with it */
thread->state |= PERL_ITHR_JOINED;
MUTEX_UNLOCK(&thread->mutex);
- sv_unmagic(SvRV(obj),PERL_MAGIC_shared_scalar);
+
return retparam;
}
return (AV*)NULL;
ithread *curr_thread;
MUTEX_LOCK(&create_destruct_mutex);
curr_thread = threads;
- PUSHs( sv_2mortal(ithread_to_SV(aTHX_ NULL, curr_thread, classname, TRUE)));
+ if(curr_thread->tid != 0)
+ XPUSHs( 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)));
+ curr_thread->state & PERL_ITHR_JOINED)
+ continue;
+ XPUSHs( sv_2mortal(ithread_to_SV(aTHX_ NULL, curr_thread, classname, TRUE)));
}
MUTEX_UNLOCK(&create_destruct_mutex);
}
#ifdef USE_ITHREADS
ithread* thread;
PL_perl_destruct_level = 2;
- PERL_THREAD_ALLOC_SPECIFIC(self_key);
MUTEX_INIT(&create_destruct_mutex);
MUTEX_LOCK(&create_destruct_mutex);
PL_threadhook = &Perl_ithread_hook;
thread->next = thread;
thread->prev = thread;
thread->interp = aTHX;
- thread->count = 1; /* imortal */
+ thread->count = 1; /* Immortal. */
thread->tid = tid_counter++;
known_threads++;
active_threads++;
- thread->state = 1;
+ thread->state = PERL_ITHR_DETACHED;
#ifdef WIN32
thread->thr = GetCurrentThreadId();
#else
thread->thr = pthread_self();
#endif
- PERL_THREAD_SETSPECIFIC(self_key,thread);
+ Perl_ithread_set(aTHX_ thread);
MUTEX_UNLOCK(&create_destruct_mutex);
#endif /* USE_ITHREADS */
}
https://perl5.git.perl.org / perl5.git / blobdiff