X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=5fd590e6667522cb8ba908d405a04697f9dc2ad5;hb=4b585c19dcd87dc3410094a2d2d7385d49200a44;hp=354040bbe1da4e6df710e0c240cf9f32ab7bf49b;hpb=854a7c8f6987e05b6aebe186f30b7e125693afaf;p=sbcl.git diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index 354040b..5fd590e 100644 --- a/src/runtime/coreparse.c +++ b/src/runtime/coreparse.c @@ -35,6 +35,13 @@ #include "validate.h" #include "gc-internal.h" +/* lutex stuff */ +#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX) +#include "genesis/sap.h" +#include "pthread-lutex.h" +#endif + + unsigned char build_id[] = #include "../../output/build-id.tmp" ; @@ -49,11 +56,47 @@ open_binary(char *filename, int mode) return open(filename, mode); } + +static struct runtime_options * +read_runtime_options(int fd) +{ + size_t optarray[RUNTIME_OPTIONS_WORDS]; + struct runtime_options *options = NULL; + + if (read(fd, optarray, RUNTIME_OPTIONS_WORDS * sizeof(size_t)) != + RUNTIME_OPTIONS_WORDS * sizeof(size_t)) { + return NULL; + } + + if ((RUNTIME_OPTIONS_MAGIC != optarray[0]) || (0 == optarray[1])) { + return NULL; + } + + options = successful_malloc(sizeof(struct runtime_options)); + + options->dynamic_space_size = optarray[2]; + options->thread_control_stack_size = optarray[3]; + + return options; +} + +void +maybe_initialize_runtime_options(int fd) +{ + off_t end_offset = sizeof(lispobj) + + sizeof(os_vm_offset_t) + + (RUNTIME_OPTIONS_WORDS * sizeof(size_t)); + + lseek(fd, -end_offset, SEEK_END); + runtime_options = read_runtime_options(fd); +} + /* Search 'filename' for an embedded core. An SBCL core has, at the - * end of the file, a trailer containing the size of the core (an - * os_vm_offset_t) and a final signature word (the lispobj - * CORE_MAGIC). If this trailer is found at the end of the file, the - * start of the core can be determined from the core size. + * end of the file, a trailer containing optional saved runtime + * options, the start of the core (an os_vm_offset_t), and a final + * signature word (the lispobj CORE_MAGIC). If this trailer is found + * at the end of the file, the start of the core can be determined + * from the core size. * * If an embedded core is present, this returns the offset into the * file to load the core from, or -1 if no core is present. */ @@ -63,7 +106,7 @@ search_for_embedded_core(char *filename) lispobj header; os_vm_offset_t lispobj_size = sizeof(lispobj); os_vm_offset_t trailer_size = lispobj_size + sizeof(os_vm_offset_t); - os_vm_offset_t core_size, pos; + os_vm_offset_t core_start, pos; int fd = -1; if ((fd = open_binary(filename, O_RDONLY)) < 0) @@ -76,10 +119,10 @@ search_for_embedded_core(char *filename) if (header == CORE_MAGIC) { if (lseek(fd, -trailer_size, SEEK_END) < 0) goto lose; - if (read(fd, &core_size, sizeof(os_vm_offset_t)) < 0) + if (read(fd, &core_start, sizeof(os_vm_offset_t)) < 0) goto lose; - if (lseek(fd, -(core_size + trailer_size), SEEK_END) < 0) + if (lseek(fd, core_start, SEEK_SET) < 0) goto lose; pos = lseek(fd, 0, SEEK_CUR); @@ -89,6 +132,8 @@ search_for_embedded_core(char *filename) if (header != CORE_MAGIC) goto lose; + maybe_initialize_runtime_options(fd); + close(fd); return pos; } @@ -101,7 +146,7 @@ lose: } static void -process_directory(int fd, u32 *ptr, int count, os_vm_offset_t file_offset) +process_directory(int fd, lispobj *ptr, int count, os_vm_offset_t file_offset) { struct ndir_entry *entry; @@ -114,7 +159,7 @@ process_directory(int fd, u32 *ptr, int count, os_vm_offset_t file_offset) os_vm_address_t addr = (os_vm_address_t) (os_vm_page_size * entry->address); lispobj *free_pointer = (lispobj *) addr + entry->nwords; - long len = os_vm_page_size * entry->page_count; + unsigned long len = os_vm_page_size * entry->page_count; if (len != 0) { os_vm_address_t real_addr; @@ -134,6 +179,13 @@ process_directory(int fd, u32 *ptr, int count, os_vm_offset_t file_offset) switch (id) { case DYNAMIC_CORE_SPACE_ID: + if (len > dynamic_space_size) { + fprintf(stderr, + "dynamic space too small for core: %ldKiB required, %ldKiB available.\n", + len >> 10, + (long)dynamic_space_size >> 10); + exit(1); + } #ifdef LISP_FEATURE_GENCGC if (addr != (os_vm_address_t)DYNAMIC_SPACE_START) { fprintf(stderr, "in core: 0x%lx; in runtime: 0x%lx \n", @@ -185,7 +237,8 @@ lispobj load_core_file(char *file, os_vm_offset_t file_offset) { lispobj *header, val, len, *ptr, remaining_len; - int fd = open_binary(file, O_RDONLY), count; + int fd = open_binary(file, O_RDONLY); + unsigned int count; lispobj initial_function = NIL; FSHOW((stderr, "/entering load_core_file(%s)\n", file)); @@ -239,7 +292,7 @@ load_core_file(char *file, os_vm_offset_t file_offset) case BUILD_ID_CORE_ENTRY_TYPE_CODE: SHOW("BUILD_ID_CORE_ENTRY_TYPE_CODE case"); { - int i; + unsigned int i; FSHOW((stderr, "build_id[]=\"%s\"\n", build_id)); FSHOW((stderr, "remaining_len = %d\n", remaining_len)); @@ -285,6 +338,41 @@ load_core_file(char *file, os_vm_offset_t file_offset) initial_function = (lispobj)*ptr; break; +#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX) + case LUTEX_TABLE_CORE_ENTRY_TYPE_CODE: + SHOW("LUTEX_TABLE_CORE_ENTRY_TYPE_CODE case"); + { + size_t n_lutexes = *ptr; + size_t fdoffset = (*(ptr + 1) + 1) * (os_vm_page_size); + size_t data_length = n_lutexes * sizeof(struct sap *); + struct lutex **lutexes_to_resurrect = malloc(data_length); + long bytes_read; + + lseek(fd, fdoffset + file_offset, SEEK_SET); + + FSHOW((stderr, "attempting to read %ld lutexes from core\n", n_lutexes)); + bytes_read = read(fd, lutexes_to_resurrect, data_length); + + /* XXX */ + if (bytes_read != data_length) { + lose("Could not read the lutex table"); + } + else { + int i; + + for (i=0; i 0) @@ -301,7 +389,16 @@ load_core_file(char *file, os_vm_offset_t file_offset) size -= bytes_read; while (bytes_read) { bytes_read -= sizeof(long); - page_table[offset++].first_object_offset = data[i++]; + /* Ignore all zeroes. The size of the page table + * core entry was rounded up to os_vm_page_size + * during the save, and might now have more + * elements than the page table. + */ + if (data[i]) { + page_table[offset].region_start_offset = data[i]; + } + i++; + offset++; } }