|
 |
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-5) unstable; urgency=medium
|
|
|
385abae |
.
|
|
|
385abae |
* Version_2_6_13pre4
|
|
|
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/h/page.h
|
|
|
385abae |
+++ gcl-2.6.12/h/page.h
|
|
|
385abae |
@@ -85,10 +85,8 @@ extern int sgc_enabled;
|
|
|
385abae |
|
|
|
385abae |
extern long resv_pages;
|
|
|
385abae |
extern int reserve_pages_for_signal_handler;
|
|
|
385abae |
-/* #define CONT_MARK_PAGE (((page(heap_end)-first_data_page)*(PAGESIZE/(CPTR_SIZE*CHAR_SIZE))+PAGESIZE-1)/PAGESIZE) */
|
|
|
385abae |
-/* #define available_pages ((fixnum)(real_maxpage-page(heap_end)-2*nrbpage-CONT_MARK_PAGE-resv_pages)) */
|
|
|
385abae |
|
|
|
385abae |
-extern struct pageinfo *cell_list_head,*cell_list_tail/* ,*contblock_list_head,*contblock_list_tail */;
|
|
|
385abae |
+extern struct pageinfo *cell_list_head,*cell_list_tail;
|
|
|
385abae |
extern object contblock_array;
|
|
|
385abae |
|
|
|
385abae |
#define PAGE_MAGIC 0x2e
|
|
|
385abae |
--- gcl-2.6.12.orig/o/alloc.c
|
|
|
385abae |
+++ gcl-2.6.12/o/alloc.c
|
|
|
385abae |
@@ -506,31 +506,25 @@ rebalance_maxpages(struct typemanager *m
|
|
|
385abae |
|
|
|
385abae |
if (j+d>phys_pages) {
|
|
|
385abae |
|
|
|
385abae |
- ufixnum k=0;
|
|
|
385abae |
+ ufixnum k,e=j+d-phys_pages;
|
|
|
385abae |
+ double f;
|
|
|
385abae |
|
|
|
385abae |
- for (i=t_start;i
|
|
|
385abae |
+ for (k=0,i=t_start;i
|
|
|
385abae |
if (tm_table+i!=my_tm)
|
|
|
385abae |
k+=(tm_table[i].tm_maxpage-tm_table[i].tm_npage)*(i==t_relocatable ? 2 : 1);
|
|
|
385abae |
|
|
|
385abae |
- d=d>k+phys_pages-j ? k+phys_pages-j : d;
|
|
|
385abae |
- if (d<=0)
|
|
|
385abae |
+ e=e>k ? k : e;
|
|
|
385abae |
+ if (e+phys_pages-j<=0)
|
|
|
385abae |
return 0;
|
|
|
385abae |
|
|
|
385abae |
+ f=1.0-(double)e/k;
|
|
|
385abae |
+
|
|
|
385abae |
for (i=t_start;i
|
|
|
385abae |
- if (tm_table[i].tm_npage) {
|
|
|
385abae |
- if (tm_table+i==my_tm) {
|
|
|
385abae |
- massert(set_tm_maxpage(tm_table+i,z) || !fprintf(stderr,"%lu %lu %lu %lu %lu\n",i,z,tm_table[i].tm_npage,tm_table[i].tm_maxpage,available_pages));
|
|
|
385abae |
- } else {
|
|
|
385abae |
- massert(set_tm_maxpage(tm_table+i,tm_table[i].tm_npage+(1.0-(double)(j+d-phys_pages)/k)*(tm_table[i].tm_maxpage-tm_table[i].tm_npage)));
|
|
|
385abae |
+ if (tm_table[i].tm_npage && tm_table+i!=my_tm) {
|
|
|
385abae |
+ massert(set_tm_maxpage(tm_table+i,tm_table[i].tm_npage+f*(tm_table[i].tm_maxpage-tm_table[i].tm_npage)));
|
|
|
385abae |
}
|
|
|
385abae |
- }
|
|
|
385abae |
|
|
|
385abae |
- /* for (i=t_start;i
|
|
|
385abae |
- /* if (tm_table[i].tm_npage && tm_table[i].tm_npage>((double)phys_pages/(j+d))*(tm_table+i==my_tm ? z : tm_table[i].tm_maxpage)) */
|
|
|
385abae |
- /* return 0; */
|
|
|
385abae |
- /* for (i=t_start;i
|
|
|
385abae |
- /* if (tm_table[i].tm_npage) */
|
|
|
385abae |
- /* massert(set_tm_maxpage(tm_table+i,((double)phys_pages/(j+d))*(tm_table+i==my_tm ? z : tm_table[i].tm_maxpage))); */
|
|
|
385abae |
+ massert(set_tm_maxpage(my_tm,(my_tm->tm_maxpage+(phys_pages-sum_maxpages()))/(my_tm->tm_type==t_relocatable ? 2 : 1)));
|
|
|
385abae |
|
|
|
385abae |
return 1;
|
|
|
385abae |
|