#include <fcntl.h>
#include <unistd.h>
-#ifdef irix
-#include <fcntl.h>
-#endif
-
#include "sbcl.h"
#include "os.h"
#include "runtime.h"
#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"
;
+int
+open_binary(char *filename, int mode)
+{
+#ifdef LISP_FEATURE_WIN32
+ mode |= O_BINARY;
+#endif
+
+ return open(filename, mode);
+}
+
+/* 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.
+ *
+ * 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. */
+os_vm_offset_t
+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;
+ int fd = -1;
+
+ if ((fd = open_binary(filename, O_RDONLY)) < 0)
+ goto lose;
+ if (lseek(fd, -lispobj_size, SEEK_END) < 0)
+ goto lose;
+ if (read(fd, &header, (size_t)lispobj_size) < lispobj_size)
+ goto lose;
+
+ 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)
+ goto lose;
+
+ if (lseek(fd, -(core_size + trailer_size), SEEK_END) < 0)
+ goto lose;
+ pos = lseek(fd, 0, SEEK_CUR);
+
+ if (read(fd, &header, (size_t)lispobj_size) < lispobj_size)
+ goto lose;
+
+ if (header != CORE_MAGIC)
+ goto lose;
+
+ close(fd);
+ return pos;
+ }
+
+lose:
+ if (fd != -1)
+ close(fd);
+
+ return -1;
+}
+
static void
-process_directory(int fd, u32 *ptr, int count)
+process_directory(int fd, lispobj *ptr, int count, os_vm_offset_t file_offset)
{
struct ndir_entry *entry;
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));
- real_addr = os_map(fd, offset, addr, len);
+ real_addr = os_map(fd, offset + file_offset, addr, len);
if (real_addr != addr) {
lose("file mapped in wrong place! "
"(0x%08x != 0x%08lx)\n",
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",
}
lispobj
-load_core_file(char *file)
+load_core_file(char *file, os_vm_offset_t file_offset)
{
lispobj *header, val, len, *ptr, remaining_len;
-#ifndef LISP_FEATURE_WIN32
- int fd = open(file, O_RDONLY), count;
-#else
- int fd = open(file, O_RDONLY | O_BINARY), count;
-#endif
+ int fd = open_binary(file, O_RDONLY);
+ unsigned int count;
lispobj initial_function = NIL;
FSHOW((stderr, "/entering load_core_file(%s)\n", file));
exit(1);
}
+ lseek(fd, file_offset, SEEK_SET);
header = calloc(os_vm_page_size / sizeof(u32), sizeof(u32));
count = read(fd, header, os_vm_page_size);
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));
ptr,
#ifndef LISP_FEATURE_ALPHA
remaining_len / (sizeof(struct ndir_entry) /
- sizeof(long))
+ sizeof(long)),
#else
remaining_len / (sizeof(struct ndir_entry) /
- sizeof(u32))
+ sizeof(u32)),
#endif
- );
+ file_offset);
break;
case INITIAL_FUN_CORE_ENTRY_TYPE_CODE:
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<n_lutexes; ++i) {
+ struct lutex *lutex = lutexes_to_resurrect[i];
+
+ FSHOW((stderr, "re-init'ing lutex @ %p\n", lutex));
+ lutex_init((tagged_lutex_t) lutex);
+ }
+
+ free(lutexes_to_resurrect);
+ }
+ break;
+ }
+#endif
+
#ifdef LISP_FEATURE_GENCGC
case PAGE_TABLE_CORE_ENTRY_TYPE_CODE:
{
size_t offset = 0;
long bytes_read;
long data[4096];
- lseek(fd, fdoffset, SEEK_SET);
+ lseek(fd, fdoffset + file_offset, SEEK_SET);
while ((bytes_read = read(fd, data, (size < 4096 ? size : 4096 )))
> 0)
{
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].first_object_offset = data[i];
+ }
+ i++;
+ offset++;
}
}
SHOW("returning from load_core_file(..)");
return initial_function;
}
+
projects / sbcl.git / blobdiff