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

fix memory leaks

Browse Source
This commit is contained in:
Vitor Santos Costa 2014-03-20 13:33:17 +00:00
parent 8dd1ddbca3
commit 41e1980f83
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1001,7 +1001,8 @@ X_API int PL_throw(term_t exception)
{ {
CACHE_REGS CACHE_REGS
YAP_Throw(Yap_GetFromSlot(exception PASS_REGS)); YAP_Throw(Yap_GetFromSlot(exception PASS_REGS));
longjmp(LOCAL_execution->q_env, 0); if (LOCAL_execution)
longjmp(LOCAL_execution->q_env, 0);
return 0; return 0;
} }
@ -2235,6 +2236,7 @@ X_API qid_t PL_open_query(module_t ctx, int flags, predicate_t p, term_t t0)
/* ignore flags and module for now */ /* ignore flags and module for now */
qid_t new = (qid_t)Yap_AllocCodeSpace(sizeof(struct open_query_struct)); qid_t new = (qid_t)Yap_AllocCodeSpace(sizeof(struct open_query_struct));
new->oq = LOCAL_execution;
LOCAL_execution = new; LOCAL_execution = new;
new->q_open=1; new->q_open=1;
new->q_state=0; new->q_state=0;
@ -2268,9 +2270,12 @@ X_API int PL_next_solution(qid_t qi)
X_API void PL_cut_query(qid_t qi) X_API void PL_cut_query(qid_t qi)
{ {
CACHE_REGS
if (qi->q_open != 1 || qi->q_state == 0) return; if (qi->q_open != 1 || qi->q_state == 0) return;
YAP_LeaveGoal(FALSE, &qi->q_h); YAP_LeaveGoal(FALSE, &qi->q_h);
qi->q_open = 0; qi->q_open = 0;
LOCAL_execution = qi->oq;
Yap_FreeCodeSpace( (char *)qi ); Yap_FreeCodeSpace( (char *)qi );
} }
@ -2287,6 +2292,7 @@ X_API void PL_close_query(qid_t qi)
} }
YAP_LeaveGoal(FALSE, &qi->q_h); YAP_LeaveGoal(FALSE, &qi->q_h);
qi->q_open = 0; qi->q_open = 0;
LOCAL_execution = qi->oq;
Yap_FreeCodeSpace( (char *)qi ); Yap_FreeCodeSpace( (char *)qi );
} }
@ -2611,9 +2617,9 @@ PL_set_engine(PL_engine_t engine, PL_engine_t *old)
nwid = ((struct worker_local *)engine)->ThreadHandle_.id; nwid = ((struct worker_local *)engine)->ThreadHandle_.id;
} }
pthread_mutex_lock(&(REMOTE_ThreadHandle(nwid).tlock)); MUTEX_LOCK(&(REMOTE_ThreadHandle(nwid).tlock));
if (REMOTE_ThreadHandle(nwid).ref_count) { if (REMOTE_ThreadHandle(nwid).ref_count) {
pthread_mutex_unlock(&(REMOTE_ThreadHandle(nwid).tlock)); MUTEX_UNLOCK(&(REMOTE_ThreadHandle(nwid).tlock));
if (cwid != nwid) { if (cwid != nwid) {
return PL_ENGINE_INUSE; return PL_ENGINE_INUSE;
} }

1
library/dialect/swi/fli/swi.h
View File

@ -10,6 +10,7 @@ typedef struct open_query_struct {
jmp_buf q_env; jmp_buf q_env;
int q_flags; int q_flags;
YAP_dogoalinfo q_h; YAP_dogoalinfo q_h;
struct open_query_struct *oq;
} open_query; } open_query;
#define addr_hash(V) (((CELL) (V)) >> 4 & (N_SWI_HASH-1)) #define addr_hash(V) (((CELL) (V)) >> 4 & (N_SWI_HASH-1))