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

emulate SWI MT interface correctly

Browse Source
This commit is contained in:
Vítor Santos Costa 2010-07-25 11:19:07 +01:00
parent f3b9811ef7
commit 7dd2714263
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
library/yap2swi/yap2swi.c
View File

@ -2848,6 +2848,7 @@ PL_thread_at_exit(void (*function)(void *), void *closure, int global)
X_API PL_engine_t X_API PL_engine_t
PL_create_engine(const PL_thread_attr_t *attr) PL_create_engine(const PL_thread_attr_t *attr)
{ {
#if THREADS
if (attr) { if (attr) {
YAP_thread_attr yapt; YAP_thread_attr yapt;
@ -2859,37 +2860,63 @@ PL_create_engine(const PL_thread_attr_t *attr)
} else { } else {
return Yap_WLocal+YAP_ThreadCreateEngine(NULL); return Yap_WLocal+YAP_ThreadCreateEngine(NULL);
} }
#else
return NULL;
#endif
} }
X_API int X_API int
PL_destroy_engine(PL_engine_t e) PL_destroy_engine(PL_engine_t e)
{ {
#if THREADS
return YAP_ThreadDestroyEngine((struct worker_local *)e-Yap_WLocal); return YAP_ThreadDestroyEngine((struct worker_local *)e-Yap_WLocal);
#else
return FALSE;
#endif
} }
X_API int X_API int
PL_set_engine(PL_engine_t engine, PL_engine_t *old) PL_set_engine(PL_engine_t engine, PL_engine_t *old)
{ {
#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_WLocal+cwid); if (old) *old = (PL_engine_t)(Yap_WLocal+cwid);
} }
if (!engine) {
if (cwid < 0)
return PL_ENGINE_INVAL;
if (!YAP_ThreadDetachEngine(worker_id)) {
return PL_ENGINE_INVAL;
}
return PL_ENGINE_SET;
}
if (engine == PL_ENGINE_MAIN) { if (engine == PL_ENGINE_MAIN) {
nwid = 0; nwid = 0;
} else if (engine == PL_ENGINE_CURRENT) { } else if (engine == PL_ENGINE_CURRENT) {
if (cwid < 0) if (cwid < 0) {
if (old) *old = NULL;
return PL_ENGINE_INVAL; return PL_ENGINE_INVAL;
}
return PL_ENGINE_SET; return PL_ENGINE_SET;
} else {
nwid = (struct worker_local *)engine-Yap_WLocal;
} }
pthread_mutex_lock(&(FOREIGN_ThreadHandle(nwid).tlock));
if (FOREIGN_ThreadHandle(nwid).pthread_handle) { if (FOREIGN_ThreadHandle(nwid).pthread_handle) {
if (cwid != nwid) pthread_mutex_unlock(&(FOREIGN_ThreadHandle(nwid).tlock));
if (cwid != nwid) {
return PL_ENGINE_INUSE; return PL_ENGINE_INUSE;
}
return PL_ENGINE_SET; return PL_ENGINE_SET;
} }
if (cwid) { if (cwid >= 0) {
if (!YAP_ThreadDetachEngine(nwid)) { if (!YAP_ThreadDetachEngine(cwid)) {
*old = NULL;
pthread_mutex_unlock(&(FOREIGN_ThreadHandle(nwid).tlock));
return PL_ENGINE_INVAL; return PL_ENGINE_INVAL;
} }
} }
@ -2897,6 +2924,9 @@ PL_set_engine(PL_engine_t engine, PL_engine_t *old)
return PL_ENGINE_INVAL; return PL_ENGINE_INVAL;
} }
return PL_ENGINE_SET; return PL_ENGINE_SET;
#else
return FALSE;
#endif
} }