X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fsave.c;h=f939eec30724fcb1337c4606442d2b9d349cedd3;hb=7fb597b585fc715537ea644f7d84440eca217ca1;hp=4fd98e7c9f70ac7518b668bc42059ae57295466f;hpb=1b64697e4e8a85ff8f11f5c05de71687dc5ad2e2;p=sbcl.git diff --git a/src/runtime/save.c b/src/runtime/save.c index 4fd98e7..f939eec 100644 --- a/src/runtime/save.c +++ b/src/runtime/save.c @@ -11,12 +11,13 @@ #include #include +#include #include #include +#include "sbcl.h" #include "runtime.h" #include "os.h" -#include "sbcl.h" #include "core.h" #include "globals.h" #include "save.h" @@ -24,6 +25,16 @@ #include "lispregs.h" #include "validate.h" #include "gc-internal.h" +#include "thread.h" + +#include "genesis/static-symbols.h" +#include "genesis/symbol.h" + +static void +write_lispobj(lispobj obj, FILE *file) +{ + fwrite(&obj, sizeof(lispobj), 1, file); +} static long write_bytes(FILE *file, char *addr, long bytes) @@ -32,6 +43,13 @@ write_bytes(FILE *file, char *addr, long bytes) bytes = (bytes+os_vm_page_size-1)&~(os_vm_page_size-1); +#ifdef LISP_FEATURE_WIN32 + /* touch every single page in the space to force it to be mapped. */ + for (count = 0; count < bytes; count += 0x1000) { + volatile int temp = addr[count]; + } +#endif + fflush(file); here = ftell(file); fseek(file, 0, 2); @@ -60,9 +78,9 @@ output_space(FILE *file, int id, lispobj *addr, lispobj *end) int words, bytes, data; static char *names[] = {NULL, "dynamic", "static", "read-only"}; - putw(id, file); + write_lispobj(id, file); words = end - addr; - putw(words, file); + write_lispobj(words, file); bytes = words * sizeof(lispobj); @@ -71,94 +89,132 @@ output_space(FILE *file, int id, lispobj *addr, lispobj *end) data = write_bytes(file, (char *)addr, bytes); - putw(data, file); - putw((long)addr / os_vm_page_size, file); - putw((bytes + os_vm_page_size - 1) / os_vm_page_size, file); + write_lispobj(data, file); + write_lispobj((long)addr / os_vm_page_size, file); + write_lispobj((bytes + os_vm_page_size - 1) / os_vm_page_size, file); } -boolean -save(char *filename, lispobj init_function) +FILE * +open_core_for_saving(char *filename) { - FILE *file; - /* Open the output file. We don't actually need the file yet, but * the fopen() might fail for some reason, and we want to detect * that and back out before we do anything irreversible. */ unlink(filename); - file = fopen(filename, "w"); - if (!file) { - perror(filename); - return 1; - } + return fopen(filename, "wb"); +} + +boolean +save_to_filehandle(FILE *file, char *filename, lispobj init_function) +{ + struct thread *th; /* Smash the enclosing state. (Once we do this, there's no good * way to go back, which is a sufficient reason that this ends up * being SAVE-LISP-AND-DIE instead of SAVE-LISP-AND-GO-ON). */ printf("[undoing binding stack and other enclosing state... "); fflush(stdout); - unbind_to_here((lispobj *)BINDING_STACK_START); - SetSymbolValue(CURRENT_CATCH_BLOCK, 0); - SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0); + for_each_thread(th) { /* XXX really? */ + unbind_to_here((lispobj *)th->binding_stack_start,th); + SetSymbolValue(CURRENT_CATCH_BLOCK, 0,th); + SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0,th); + } printf("done]\n"); fflush(stdout); - - /* (Now we can actually start copying ourselves into the - * output file.) */ + + /* (Now we can actually start copying ourselves into the output file.) */ printf("[saving current Lisp image into %s:\n", filename); fflush(stdout); - putw(CORE_MAGIC, file); - - putw(VERSION_CORE_ENTRY_TYPE_CODE, file); - putw(3, file); - putw(SBCL_CORE_VERSION_INTEGER, file); - - putw(NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE, file); - putw((5*3)+2, file); + write_lispobj(CORE_MAGIC, file); + + write_lispobj(VERSION_CORE_ENTRY_TYPE_CODE, file); + write_lispobj(3, file); + write_lispobj(SBCL_CORE_VERSION_INTEGER, file); + + write_lispobj(BUILD_ID_CORE_ENTRY_TYPE_CODE, file); + write_lispobj(/* (We're writing the word count of the entry here, and the 2 + * term is one word for the leading BUILD_ID_CORE_ENTRY_TYPE_CODE + * word and one word where we store the count itself.) */ + 2 + strlen((const char *)build_id), + file); + { + unsigned char *p; + for (p = build_id; *p; ++p) + write_lispobj(*p, file); + } + write_lispobj(NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE, file); + write_lispobj(/* (word count = 3 spaces described by 5 words each, plus the + * entry type code, plus this count itself) */ + (5*3)+2, file); output_space(file, - READ_ONLY_CORE_SPACE_ID, - (lispobj *)READ_ONLY_SPACE_START, - (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); + READ_ONLY_CORE_SPACE_ID, + (lispobj *)READ_ONLY_SPACE_START, + (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER,0)); output_space(file, - STATIC_CORE_SPACE_ID, - (lispobj *)STATIC_SPACE_START, - (lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER)); + STATIC_CORE_SPACE_ID, + (lispobj *)STATIC_SPACE_START, + (lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER,0)); #ifdef reg_ALLOC output_space(file, - DYNAMIC_CORE_SPACE_ID, - (lispobj *)current_dynamic_space, - dynamic_space_free_pointer); + DYNAMIC_CORE_SPACE_ID, + (lispobj *)current_dynamic_space, + dynamic_space_free_pointer); #else #ifdef LISP_FEATURE_GENCGC - /* I don't know too much about the circumstances in which we could - * end up here. It may be that current_region_free_pointer is - * guaranteed to be relevant and we could skip these slightly - * paranoid checks. TRT would be to rid the code of - * current_region_foo completely - dan 2002.09.17 */ - if((boxed_region.free_pointer < current_region_free_pointer) && - (boxed_region.end_addr == current_region_end_addr)) - boxed_region.free_pointer = current_region_free_pointer; /* Flush the current_region, updating the tables. */ - gc_alloc_update_page_tables(0,&boxed_region); - gc_alloc_update_page_tables(1,&unboxed_region); - update_x86_dynamic_space_free_pointer(); + gc_alloc_update_all_page_tables(); + update_dynamic_space_free_pointer(); #endif output_space(file, - DYNAMIC_CORE_SPACE_ID, - (lispobj *)DYNAMIC_SPACE_START, - (lispobj *)SymbolValue(ALLOCATION_POINTER)); + DYNAMIC_CORE_SPACE_ID, + (lispobj *)DYNAMIC_SPACE_START, + (lispobj *)SymbolValue(ALLOCATION_POINTER,0)); #endif - putw(INITIAL_FUN_CORE_ENTRY_TYPE_CODE, file); - putw(3, file); - putw(init_function, file); + write_lispobj(INITIAL_FUN_CORE_ENTRY_TYPE_CODE, file); + write_lispobj(3, file); + write_lispobj(init_function, file); - putw(END_CORE_ENTRY_TYPE_CODE, file); +#ifdef LISP_FEATURE_GENCGC + { + size_t size = (last_free_page*sizeof(long)+os_vm_page_size-1) + &~(os_vm_page_size-1); + long *data = calloc(size, 1); + if (data) { + long offset; + int i; + for (i = 0; i < last_free_page; i++) { + data[i] = page_table[i].first_object_offset; + } + write_lispobj(PAGE_TABLE_CORE_ENTRY_TYPE_CODE, file); + write_lispobj(4, file); + write_lispobj(size, file); + offset = write_bytes(file, (char *) data, size); + write_lispobj(offset, file); + } + } +#endif + + write_lispobj(END_CORE_ENTRY_TYPE_CODE, file); fclose(file); printf("done]\n"); exit(0); } + +boolean +save(char *filename, lispobj init_function) +{ + FILE *file = open_core_for_saving(filename); + + if (!file) { + perror(filename); + return 1; + } + + return save_to_filehandle(file, filename, init_function); +}