X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=17574443c010e9a24c3b44c5a60f85ec2b8c5a2f;hb=c179ad4d7bef50a974e8907adb079d47c8bea37e;hp=0ed38c5e716be862a2f2b141f47bd37b87649a63;hpb=402958f92506b9d3de852601b8c1ccb99b5ee558;p=sbcl.git diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index 0ed38c5..1757444 100644 --- a/src/runtime/coreparse.c +++ b/src/runtime/coreparse.c @@ -38,6 +38,7 @@ /* lutex stuff */ #if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX) #include "genesis/sap.h" +#include "pthread-lutex.h" #endif @@ -55,11 +56,51 @@ 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) +{ + struct runtime_options *new_runtime_options; + off_t end_offset = sizeof(lispobj) + + sizeof(os_vm_offset_t) + + (RUNTIME_OPTIONS_WORDS * sizeof(size_t)); + + lseek(fd, -end_offset, SEEK_END); + + if (new_runtime_options = read_runtime_options(fd)) { + runtime_options = new_runtime_options; + } +} + /* 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. */ @@ -69,7 +110,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) @@ -82,10 +123,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); @@ -95,6 +136,8 @@ search_for_embedded_core(char *filename) if (header != CORE_MAGIC) goto lose; + maybe_initialize_runtime_options(fd); + close(fd); return pos; } @@ -106,8 +149,43 @@ lose: return -1; } +/* If more platforms doesn't support overlapping mmap rename this + * def to something like ifdef nommapoverlap */ +/* currently hpux only */ +#ifdef LISP_FEATURE_HPUX +os_vm_address_t copy_core_bytes(int fd, os_vm_offset_t offset, + os_vm_address_t addr, int len) +{ + unsigned char buf[4096]; + int c,x; + int old_fd = lseek(fd, 0, SEEK_CUR); + + if(len & (4096-1)){ + fprintf(stderr, "cant copy a slice of core because slice-length is not of page size(4096)\n"); + exit(-1); + } + if(old_fd < 0){ + fprintf(stderr, "cant perform lseek() on corefile\n"); + } + lseek(fd, offset, SEEK_SET); + if(fd < 0){ + fprintf(stderr, "cant perform lseek(%u,%lu,SEEK_SET) on corefile\n", fd, offset); + } + for(x = 0; x < len; x += 4096){ + c = read(fd, buf, 4096); + if(c != 4096){ + fprintf(stderr, "cant read memory area from corefile at position %lu, got %d\n", offset + x, c); + exit(-1); + } + memcpy(addr+x, buf, 4096); + } + os_flush_icache(addr, len); + return addr; +} +#endif + 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; @@ -120,13 +198,16 @@ 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; FSHOW((stderr, "/mapping %ld(0x%lx) bytes at 0x%lx\n", (long)len, (long)len, (unsigned long)addr)); +#ifdef LISP_FEATURE_HPUX + real_addr = copy_core_bytes(fd, offset + file_offset, addr, len); +#else real_addr = os_map(fd, offset + file_offset, addr, len); +#endif if (real_addr != addr) { lose("file mapped in wrong place! " "(0x%08x != 0x%08lx)\n", @@ -140,6 +221,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", @@ -191,7 +279,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)); @@ -245,7 +334,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)); @@ -317,7 +406,7 @@ load_core_file(char *file, os_vm_offset_t file_offset) struct lutex *lutex = lutexes_to_resurrect[i]; FSHOW((stderr, "re-init'ing lutex @ %p\n", lutex)); - lutex_init(lutex); + lutex_init((tagged_lutex_t) lutex); } free(lutexes_to_resurrect); @@ -333,7 +422,8 @@ load_core_file(char *file, os_vm_offset_t file_offset) size_t fdoffset = (*(ptr+1) + 1) * (os_vm_page_size); size_t offset = 0; long bytes_read; - long data[4096]; + unsigned long data[4096]; + unsigned long word; lseek(fd, fdoffset + file_offset, SEEK_SET); while ((bytes_read = read(fd, data, (size < 4096 ? size : 4096 ))) > 0) @@ -342,7 +432,19 @@ 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. + * + * The low bits of each word are allocation flags. + */ + if (word=data[i]) { + page_table[offset].region_start_offset = word & ~0x03; + page_table[offset].allocated = word & 0x03; + } + i++; + offset++; } }