diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SWI expects thread IDs to be like addresses

Browse Source
This commit is contained in:
Vitor Santos Costa 2013-03-10 16:39:54 +00:00
parent 46d447b385
commit 7f758cf103
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/dialect/swi/fli/swi.c
View File

@ -2467,7 +2467,7 @@ X_API int PL_thread_self(void)
#if THREADS #if THREADS
if (pthread_getspecific(Yap_yaamregs_key) == NULL) if (pthread_getspecific(Yap_yaamregs_key) == NULL)
return -1; return -1;
return worker_id; return (worker_id+1)<<3;
#else #else
return -2; return -2;
#endif #endif
@ -2481,9 +2481,22 @@ X_API int PL_unify_thread_id(term_t t, int i)
} }
static int
pl_thread_self(void)
{
CACHE_REGS
#if THREADS
if (pthread_getspecific(Yap_yaamregs_key) == NULL)
return -1;
return worker_id+1;
#else
return -2;
#endif
}
X_API int PL_thread_attach_engine(const PL_thread_attr_t *attr) X_API int PL_thread_attach_engine(const PL_thread_attr_t *attr)
{ {
int wid = PL_thread_self(); int wid = pl_thread_self();
if (wid < 0) { if (wid < 0) {
/* we do not have an engine */ /* we do not have an engine */
@ -2512,7 +2525,7 @@ X_API int PL_thread_attach_engine(const PL_thread_attr_t *attr)
X_API int PL_thread_destroy_engine(void) X_API int PL_thread_destroy_engine(void)
{ {
int wid = PL_thread_self(); int wid = pl_thread_self();
if (wid < 0) { if (wid < 0) {
/* we do not have an engine */ /* we do not have an engine */
@ -2570,7 +2583,7 @@ PL_set_engine(PL_engine_t engine, PL_engine_t *old)
{ {
CACHE_REGS CACHE_REGS
#if THREADS #if THREADS
int cwid = PL_thread_self(), nwid; int cwid = pl_thread_self(), nwid;
if (cwid >= 0) { if (cwid >= 0) {
if (old) *old = (PL_engine_t)(Yap_local[cwid]); if (old) *old = (PL_engine_t)(Yap_local[cwid]);
} }