|
 |
385abae |
Description: <short summary of the patch>
|
|
|
385abae |
TODO: Put a short summary on the line above and replace this paragraph
|
|
|
385abae |
with a longer explanation of this change. Complete the meta-information
|
|
|
385abae |
with other relevant fields (see below for details). To make it easier, the
|
|
|
385abae |
information below has been extracted from the changelog. Adjust it or drop
|
|
|
385abae |
it.
|
|
|
385abae |
.
|
|
|
385abae |
gcl (2.6.12-13) unstable; urgency=medium
|
|
|
385abae |
.
|
|
|
385abae |
* Version_2_6_13pre16
|
|
|
385abae |
Author: Camm Maguire <camm@debian.org>
|
|
|
385abae |
|
|
|
385abae |
---
|
|
|
385abae |
The information above should follow the Patch Tagging Guidelines, please
|
|
|
385abae |
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
|
|
|
385abae |
are templates for supplementary fields that you might want to add:
|
|
|
385abae |
|
|
|
385abae |
Origin: <vendor|upstream|other>, <url of original patch>
|
|
|
385abae |
Bug: <url in upstream bugtracker>
|
|
|
385abae |
Bug-Debian: https://bugs.debian.org/<bugnumber>
|
|
|
385abae |
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
|
|
|
385abae |
Forwarded: <no|not-needed|url proving that it has been forwarded>
|
|
|
385abae |
Reviewed-By: <name and email of someone who approved the patch>
|
|
|
385abae |
Last-Update: <YYYY-MM-DD>
|
|
|
385abae |
|
|
|
385abae |
--- gcl-2.6.12.orig/o/alloc.c
|
|
|
385abae |
+++ gcl-2.6.12/o/alloc.c
|
|
|
385abae |
@@ -749,11 +749,15 @@ alloc_from_freelist(struct typemanager *
|
|
|
385abae |
static inline void
|
|
|
385abae |
grow_linear1(struct typemanager *tm) {
|
|
|
385abae |
|
|
|
385abae |
- fixnum maxgro=resv_pages ? available_pages : 0;
|
|
|
385abae |
+ if (!sSAoptimize_maximum_pagesA || sSAoptimize_maximum_pagesA->s.s_dbind==Cnil) {
|
|
|
385abae |
|
|
|
385abae |
- if (tm->tm_type==t_relocatable) maxgro>>=1;
|
|
|
385abae |
+ fixnum maxgro=resv_pages ? available_pages : 0;
|
|
|
385abae |
|
|
|
385abae |
- set_tm_maxpage(tm,grow_linear(tm->tm_npage,tm->tm_growth_percent,tm->tm_min_grow, tm->tm_max_grow,maxgro));
|
|
|
385abae |
+ if (tm->tm_type==t_relocatable) maxgro>>=1;
|
|
|
385abae |
+
|
|
|
385abae |
+ set_tm_maxpage(tm,grow_linear(tm->tm_npage,tm->tm_growth_percent,tm->tm_min_grow, tm->tm_max_grow,maxgro));
|
|
|
385abae |
+
|
|
|
385abae |
+ }
|
|
|
385abae |
|
|
|
385abae |
}
|
|
|
385abae |
|
|
|
385abae |
@@ -802,7 +806,8 @@ do_gc_p(struct typemanager *tm,fixnum n)
|
|
|
385abae |
|
|
|
385abae |
pp=gc_page_max*phys_pages;
|
|
|
385abae |
|
|
|
385abae |
- return page(recent_allocation)>(1.0+gc_alloc_min-(double)ufmin(cpool,pp)/pp)*data_pages();
|
|
|
385abae |
+ return page(recent_allocation)>(1.0+gc_alloc_min-(double)ufmin(cpool,pp)/pp)*data_pages() ||
|
|
|
385abae |
+ 2*tpage(tm,n)>available_pages;
|
|
|
385abae |
|
|
|
385abae |
}
|
|
|
385abae |
|
|
|
385abae |
--- gcl-2.6.12.orig/o/main.c
|
|
|
385abae |
+++ gcl-2.6.12/o/main.c
|
|
|
385abae |
@@ -236,7 +236,7 @@ get_gc_environ(void) {
|
|
|
385abae |
massert(mem_multiple>=0.0);
|
|
|
385abae |
}
|
|
|
385abae |
|
|
|
385abae |
- gc_alloc_min=0.1;
|
|
|
385abae |
+ gc_alloc_min=0.05;
|
|
|
385abae |
if ((e=getenv("GCL_GC_ALLOC_MIN"))) {
|
|
|
385abae |
massert(sscanf(e,"%lf",&gc_alloc_min)==1);
|
|
|
385abae |
massert(gc_alloc_min>=0.0);
|
|
|
385abae |
@@ -280,7 +280,7 @@ setup_maxpages(double scale) {
|
|
|
385abae |
resv_pages=available_pages=0;
|
|
|
385abae |
available_pages=check_avail_pages();
|
|
|
385abae |
|
|
|
385abae |
- resv_pages=40
|
|
|
385abae |
+ resv_pages=available_pages/100;
|
|
|
385abae |
available_pages-=resv_pages;
|
|
|
385abae |
|
|
|
385abae |
recent_allocation=0;
|