suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trigger GCs based on number of allocated bitmaps under Windows, not just their sizes

Browse Source 
svn: r12457
This commit is contained in:
Matthew Flatt 2008-11-15 16:51:58 +00:00
parent c0fb0086e9
commit 015503bde3
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/wxcommon/wxGC.cxx
View File

@ -374,7 +374,11 @@ char *gc::gcGetName() {
forces a GC more frequently than might otherwise happen as the forces a GC more frequently than might otherwise happen as the
total size of bitmaps grows. */ total size of bitmaps grows. */
static long total, accum = 1024 * 1024 * 5; #define INIT_ACCUM_SIZE 1024 * 1024 * 5
#define INIT_ACCUM_COUNT 1000
static long total, accum = INIT_ACCUM_SIZE;
static int total_count, accum_count = INIT_ACCUM_COUNT;
void *GC_malloc_accounting_shadow(long a) void *GC_malloc_accounting_shadow(long a)
{ {
@ -383,10 +387,24 @@ void *GC_malloc_accounting_shadow(long a)
a = sizeof(long); a = sizeof(long);
total += a; total += a;
accum -= a; accum -= a;
total_count += 1;
accum_count -= 1;
if (accum <= 0) { if (accum <= 0) {
GC_gcollect(); GC_gcollect();
accum = total >> 1; accum = total >> 1;
if (accum < INIT_ACCUM_SIZE)
accum = INIT_ACCUM_SIZE;
} }
#ifdef wx_msw
/* Under Windows, the number of bitmaps matters, even if
they're small. */
if (accum_count <= 0) {
GC_gcollect();
accum_count = total_count >> 1;
if (accum_count < INIT_ACCUM_COUNT)
accum_count = INIT_ACCUM_COUNT;
}
#endif
p = (long *)GC_malloc_atomic(a); p = (long *)GC_malloc_atomic(a);
*p = a; *p = a;
return (void *)p; return (void *)p;
@ -397,5 +415,7 @@ void GC_free_accounting_shadow(void *p)
if (p) { if (p) {
total -= *(long *)p; total -= *(long *)p;
accum += *(long *)p; accum += *(long *)p;
total_count -= 1;
accum_count += 1;
} }
} }