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

get rid of random quicksort

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@22 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2001-05-02 17:57:42 +00:00
parent 245aeff128
commit 18ff961273
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
C/heapgc.c
View File

@ -221,19 +221,6 @@ exchange(CELL_PTR * b, UInt i, UInt j)
b[i] = t; b[i] = t;
} }
static UInt
gc_random(UInt l, UInt h)
{
#if HAVE_RANDOM
return (random () % (h-l+1))+l;
#elif HAVE_RAND
return (rand () % (h-l+1))+l;
#else
return ((h+l)/2);
#endif
}
static UInt static UInt
partition(CELL *a[], UInt p, UInt r) partition(CELL *a[], UInt p, UInt r)
{ {
@ -288,17 +275,8 @@ insort(CELL *a[], UInt p, UInt q)
} }
static int
randomised_partition(CELL *a[], UInt p, UInt r)
{
UInt m = gc_random(p,r);
exchange(a, p, m);
return partition(a, p, r);
}
static void static void
randomised_quicksort(CELL *a[], UInt p, UInt r) quicksort(CELL *a[], UInt p, UInt r)
{ {
UInt q; UInt q;
if (p < r) { if (p < r) {
@ -306,9 +284,10 @@ randomised_quicksort(CELL *a[], UInt p, UInt r)
insort(a, p, r); insort(a, p, r);
return; return;
} }
q = randomised_partition (a, p, r); exchange(a, p, (p+r)/2);
randomised_quicksort(a, p, q-1); q = partition (a, p, r);
randomised_quicksort(a, q + 1, r); quicksort(a, p, q-1);
quicksort(a, q + 1, r);
} }
} }
@ -675,8 +654,8 @@ init_dbtable(tr_fr_ptr trail_ptr) {
#ifdef DEBUG #ifdef DEBUG
#define INSTRUMENT_GC 1 /*#define INSTRUMENT_GC 1*/
/*#define CHECK_CHOICEPOINTS 1*/ #define CHECK_CHOICEPOINTS 1
#ifdef INSTRUMENT_GC #ifdef INSTRUMENT_GC
typedef enum { typedef enum {
@ -2567,12 +2546,22 @@ compaction_phase(tr_fr_ptr old_TR, CELL *current_env, yamop *curp, CELL *max)
YP_fprintf(YP_stderr,"[GC] Oops on iptop-H (%d) vs %d\n", iptop-(CELL_PTR *)H, total_marked); YP_fprintf(YP_stderr,"[GC] Oops on iptop-H (%d) vs %d\n", iptop-(CELL_PTR *)H, total_marked);
#endif #endif
if (iptop < (CELL_PTR *)ASP-1024 && 10*total_marked < H-H0) { if (iptop < (CELL_PTR *)ASP-1024 && 10*total_marked < H-H0) {
randomised_quicksort((CELL_PTR *)H, 0, (iptop-(CELL_PTR *)H)-1); #ifdef DEBUG
int effectiveness = (((H-H0)-total_marked)*100)/(H-H0);
fprintf(stderr,"using pointers (%d)\n", effectiveness);
#endif
quicksort((CELL_PTR *)H, 0, (iptop-(CELL_PTR *)H)-1);
icompact_heap(); icompact_heap();
} else } else
#endif /* HYBRID_SCHEME */ #endif /* HYBRID_SCHEME */
{
#ifdef DEBUG
int effectiveness = (((H-H0)-total_marked)*100)/(H-H0);
fprintf(stderr,"not using pointers (%d)\n", effectiveness);
#endif
compact_heap(); compact_heap();
} }
}
static Int static Int
do_gc(Int predarity, CELL *current_env, yamop *nextop) do_gc(Int predarity, CELL *current_env, yamop *nextop)
@ -2735,6 +2724,10 @@ gc(Int predarity, CELL *current_env, yamop *nextop)
gc_margin = gc_margin << 8; gc_margin = gc_margin << 8;
if (gc_on) if (gc_on)
effectiveness = do_gc(predarity, current_env, nextop); effectiveness = do_gc(predarity, current_env, nextop);
if (effectiveness > 90) {
while (gc_margin < H-H0)
gc_margin <<= 1;
}
/* expand the stak if effectiveness is less than 20 % */ /* expand the stak if effectiveness is less than 20 % */
if (ASP - H < gc_margin || !gc_on || effectiveness < 20) { if (ASP - H < gc_margin || !gc_on || effectiveness < 20) {
if (ASP-H > gc_margin) if (ASP-H > gc_margin)