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

fix excessive trail cleaning in gc tr overflow.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1853 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2007-03-21 23:23:46 +00:00
parent e27d2fa1f3
commit 51e0e2f54e
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
C/heapgc.c
View File

@ -51,6 +51,7 @@ STATIC_PROTO(void compact_heap, (void));
STATIC_PROTO(void update_relocation_chain, (CELL *, CELL *)); STATIC_PROTO(void update_relocation_chain, (CELL *, CELL *));
STATIC_PROTO(int is_gc_verbose, (void)); STATIC_PROTO(int is_gc_verbose, (void));
STATIC_PROTO(int is_gc_very_verbose, (void)); STATIC_PROTO(int is_gc_very_verbose, (void));
STATIC_PROTO(void set_conditionals, (tr_fr_ptr));
#include "heapgc.h" #include "heapgc.h"
@ -156,6 +157,7 @@ gc_growtrail(int committed, tr_fr_ptr begsTR, cont *old_cont_top0)
begsTR = newsTR; begsTR = newsTR;
sTR += 2; sTR += 2;
} }
set_conditionals(sTR);
} }
#endif #endif
/* could not find more trail */ /* could not find more trail */
@ -3602,13 +3604,10 @@ do_gc(Int predarity, CELL *current_env, yamop *nextop)
TR = OldTR; TR = OldTR;
*--ASP = (CELL)current_env; *--ASP = (CELL)current_env;
#ifdef EASY_SHUNTING
set_conditionals(sTR);
#endif
if ( if (
!Yap_growtrail(sz, FALSE) !Yap_growtrail(sz, FALSE)
) { ) {
Yap_Error(OUT_OF_TRAIL_ERROR,TermNil,"out of %lB during gc", 64*1024L); Yap_Error(OUT_OF_TRAIL_ERROR,TermNil,"out of %lB during gc", sz);
return -1; return -1;
} else { } else {
total_marked = 0; total_marked = 0;

20
C/index.c
View File

@ -11,8 +11,11 @@
* File: index.c * * File: index.c *
* comments: Indexing a Prolog predicate * * comments: Indexing a Prolog predicate *
* * * *
* Last rev: $Date: 2007-01-28 14:26:36 $,$Author: vsc $ * * Last rev: $Date: 2007-03-21 23:23:46 $,$Author: vsc $ *
* $Log: not supported by cvs2svn $ * $Log: not supported by cvs2svn $
* Revision 1.182 2007/01/28 14:26:36 vsc
* WIN32 support
*
* Revision 1.181 2007/01/08 08:27:19 vsc * Revision 1.181 2007/01/08 08:27:19 vsc
* fix restore (Trevor) * fix restore (Trevor)
* make indexing a bit faster on IDB * make indexing a bit faster on IDB
@ -7797,6 +7800,9 @@ Yap_FollowIndexingCode(PredEntry *ap, yamop *ipc, Term Terms[3], yamop *ap_pc, y
return (LogUpdClause *)static_clause(ipc->u.l.l, ap); return (LogUpdClause *)static_clause(ipc->u.l.l, ap);
break; break;
case _try_clause: case _try_clause:
#if TABLING
case _table_try:
#endif
if (b0 == NULL) if (b0 == NULL)
store_clause_choice_point(Terms[0], Terms[1], Terms[2], NEXTOP(ipc,ld), ap, ap_pc, cp_pc); store_clause_choice_point(Terms[0], Terms[1], Terms[2], NEXTOP(ipc,ld), ap, ap_pc, cp_pc);
else { else {
@ -7823,6 +7829,9 @@ Yap_FollowIndexingCode(PredEntry *ap, yamop *ipc, Term Terms[3], yamop *ap_pc, y
else else
return (LogUpdClause *)static_clause(ipc->u.l.l, ap); return (LogUpdClause *)static_clause(ipc->u.l.l, ap);
case _try_me: case _try_me:
#if TABLING
case _table_try_me:
#endif
if (b0 == NULL) if (b0 == NULL)
store_clause_choice_point(Terms[0], Terms[1], Terms[2], ipc->u.ld.d, ap, ap_pc, cp_pc); store_clause_choice_point(Terms[0], Terms[1], Terms[2], ipc->u.ld.d, ap, ap_pc, cp_pc);
else { else {
@ -7837,6 +7846,9 @@ Yap_FollowIndexingCode(PredEntry *ap, yamop *ipc, Term Terms[3], yamop *ap_pc, y
ipc = NEXTOP(ipc,p); ipc = NEXTOP(ipc,p);
break; break;
case _retry: case _retry:
#if TABLING
case _table_retry:
#endif
update_clause_choice_point(NEXTOP(ipc,ld),ap_pc); update_clause_choice_point(NEXTOP(ipc,ld),ap_pc);
if (lu_pred) if (lu_pred)
return lu_clause(ipc->u.ld.d); return lu_clause(ipc->u.ld.d);
@ -7855,6 +7867,9 @@ Yap_FollowIndexingCode(PredEntry *ap, yamop *ipc, Term Terms[3], yamop *ap_pc, y
ipc = NEXTOP(ipc,ld); ipc = NEXTOP(ipc,ld);
break; break;
case _trust: case _trust:
#if TABLING
case _table_trust:
#endif
#ifdef CUT_C #ifdef CUT_C
{ {
while (POP_CHOICE_POINT(B->cp_b)) while (POP_CHOICE_POINT(B->cp_b))
@ -7881,6 +7896,9 @@ Yap_FollowIndexingCode(PredEntry *ap, yamop *ipc, Term Terms[3], yamop *ap_pc, y
case _profiled_trust_me: case _profiled_trust_me:
case _trust_me: case _trust_me:
case _count_trust_me: case _count_trust_me:
#if TABLING
case _table_trust_me:
#endif
b0 = B; b0 = B;
#ifdef CUT_C #ifdef CUT_C
{ {