conservatory
/
ikarus
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* The fasl loader has reduced the startup mmap frenzy for code 

objects from 5242 pages (almost one page per code object) down
  to 785 pages.  Special thanks to Michael Adams for counting the
  the number of pages that were used and touched at startup; without
  his help, I wouldn't have optimized it in about 10 minutes of
  coding time.
This commit is contained in:
Abdulaziz Ghuloum 2007-11-17 13:26:27 -05:00
parent 499115a226
commit 90759047b3
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.in
View File

@ -484,7 +484,7 @@ bootfileloc.h: Makefile
scheme-script: scheme-script:
echo "#!/bin/sh" > scheme-script echo "#!/bin/sh" > scheme-script
echo "$(bindir)/ikarus --r6rs-script \$$@" >> scheme-script echo "exec $(bindir)/ikarus --r6rs-script \$$@" >> scheme-script
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

35
src/ikarus-fasl.c
View File

@ -45,6 +45,8 @@ typedef struct {
char* membase; char* membase;
char* memp; char* memp;
char* memq; char* memq;
ikp code_ap;
ikp code_ep;
#endif #endif
ikp* marks; ikp* marks;
int marks_size; int marks_size;
@ -66,6 +68,8 @@ void ik_fasl_load(ikpcb* pcb, char* fasl_file){
p.marks_size = 0; p.marks_size = 0;
ikp v = ik_fasl_read(pcb, &p); ikp v = ik_fasl_read(pcb, &p);
while(v){ while(v){
p.code_ap = 0;
p.code_ep = 0;
if(p.marks){ if(p.marks){
bzero(p.marks, p.marks_size * sizeof(ikp*)); bzero(p.marks, p.marks_size * sizeof(ikp*));
} }
@ -153,12 +157,31 @@ void ik_fasl_load(ikpcb* pcb, char* fasl_file){
} }
#endif #endif
static ikp static ikp
alloc_code(int size, ikpcb* pcb){ alloc_code(int size, ikpcb* pcb, fasl_port* p){
int required_memory = align_to_next_page(size); int asize = align(size);
ikp mem = ik_mmap_code(required_memory, 0, pcb); ikp ap = p->code_ap;
return (ikp)mem; ikp nap = ap + asize;
if(nap <= p->code_ep){
p->code_ap = nap;
return ap;
} else if (asize < pagesize){
ikp mem = ik_mmap_code(pagesize, 0, pcb);
int bytes_remaining = pagesize - asize;
int previous_bytes =
((unsigned int)p->code_ep) - ((unsigned int)ap);
if(bytes_remaining <= previous_bytes){
return mem;
} else {
p->code_ap = mem+asize;
p->code_ep = mem+pagesize;
return mem;
}
} else {
int asize = align_to_next_page(size);
ikp mem = ik_mmap_code(asize, 0, pcb);
return mem;
}
} }
@ -305,7 +328,7 @@ static ikp do_read(ikpcb* pcb, fasl_port* p){
fasl_read_buf(p, &code_size, sizeof(int)); fasl_read_buf(p, &code_size, sizeof(int));
fasl_read_buf(p, &freevars, sizeof(ikp)); fasl_read_buf(p, &freevars, sizeof(ikp));
ikp annotation = do_read(pcb, p); ikp annotation = do_read(pcb, p);
ikp code = alloc_code(align(code_size+disp_code_data), pcb); ikp code = alloc_code(align(code_size+disp_code_data), pcb, p);
ref(code, 0) = code_tag; ref(code, 0) = code_tag;
ref(code, disp_code_code_size) = fix(code_size); ref(code, disp_code_code_size) = fix(code_size);
ref(code, disp_code_freevars) = freevars; ref(code, disp_code_freevars) = freevars;