don't try doing gc if stacks have overflowed into RBIT
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@162 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
parent
16f0e4534e
commit
0258eb0aab
11
C/heapgc.c
11
C/heapgc.c
@ -2604,6 +2604,15 @@ do_gc(Int predarity, CELL *current_env, yamop *nextop)
|
|||||||
#endif
|
#endif
|
||||||
if (GetValue(AtomGcTrace) != TermNil)
|
if (GetValue(AtomGcTrace) != TermNil)
|
||||||
gc_trace = 1;
|
gc_trace = 1;
|
||||||
|
/* sanity check: can we still do garbage_collection ? */
|
||||||
|
if (TrailTop & (MBIT|RBIT)) {
|
||||||
|
/* oops, we can't */
|
||||||
|
if (gc_verbose) {
|
||||||
|
YP_fprintf(YP_stderr, "[GC] LCLO at %p clashes with gc bits: %lx\n", LCL0, (MBIT|RBIT));
|
||||||
|
YP_fprintf(YP_stderr, "[GC] garbage collection disallowed\n");
|
||||||
|
}
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
gc_calls++;
|
gc_calls++;
|
||||||
if (gc_trace) {
|
if (gc_trace) {
|
||||||
YP_fprintf(YP_stderr, "[gc]\n");
|
YP_fprintf(YP_stderr, "[gc]\n");
|
||||||
@ -2744,7 +2753,7 @@ gc(Int predarity, CELL *current_env, yamop *nextop)
|
|||||||
while (gc_margin < H-H0)
|
while (gc_margin < H-H0)
|
||||||
gc_margin <<= 1;
|
gc_margin <<= 1;
|
||||||
}
|
}
|
||||||
/* expand the stak if effectiveness is less than 20 % */
|
/* expand the stack if effectiveness is less than 20 % */
|
||||||
if (ASP - H < gc_margin || !gc_on || effectiveness < 20) {
|
if (ASP - H < gc_margin || !gc_on || effectiveness < 20) {
|
||||||
UInt gap = CalculateStackGap();
|
UInt gap = CalculateStackGap();
|
||||||
if (ASP-H > gc_margin)
|
if (ASP-H > gc_margin)
|
||||||
|
Reference in New Issue
Block a user