mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-11 06:20:23 +02:00
Code Activity

Speed up load-thunk-from-memory for page alignment

Browse source 
* libguile/loader.c (page_size): New static var.
  (alloc_aligned): Enable mmap path that was never used in the
  past (!).  Thanks to Matt Wette for the bug report!
  (load_thunk_from_memory): Use page_size instead of 4096.
  (scm_bootstrap_loader): Init page_size.
This commit is contained in:
Andy Wingo 2017-01-08 23:39:42 +01:00
parent 6ff1ec9c31
commit c391ab8c90
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libguile/loader.c
View file

@ -79,6 +79,9 @@
#define ELFDATA ELFDATA2LSB #define ELFDATA ELFDATA2LSB
#endif #endif
/* The page size. */
static size_t page_size;
static void register_elf (char *data, size_t len, char *frame_maps); static void register_elf (char *data, size_t len, char *frame_maps);
enum bytecode_kind enum bytecode_kind
@ -192,12 +195,13 @@ alloc_aligned (size_t len, unsigned alignment)
/* FIXME: Assert that we actually have an 8-byte-aligned malloc. */ /* FIXME: Assert that we actually have an 8-byte-aligned malloc. */
ret = malloc (len); ret = malloc (len);
} }
#if defined(HAVE_SYS_MMAN_H) && defined(MMAP_ANONYMOUS) #if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MAP_ANONYMOUS)
else if (alignment == SCM_PAGE_SIZE) else if (alignment == page_size)
{ {
ret = mmap (NULL, len, PROT_READ | PROT_WRITE, -1, 0); ret = mmap (NULL, len, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (ret == MAP_FAILED) if (ret == MAP_FAILED)
SCM_SYSERROR; scm_syserror ("load-thunk-from-memory");
} }
#endif #endif
else else
@ -429,7 +433,7 @@ load_thunk_from_memory (char *data, size_t len, int is_read_only)
continue; continue;
if (ph[i].p_flags == PF_R) if (ph[i].p_flags == PF_R)
continue; continue;
if (ph[i].p_align != 4096) if (ph[i].p_align != page_size)
continue; continue;
if (mprotect (data + ph[i].p_vaddr, if (mprotect (data + ph[i].p_vaddr,
@ -464,8 +468,6 @@ load_thunk_from_memory (char *data, size_t len, int is_read_only)
} }
#undef FUNC_NAME #undef FUNC_NAME
#define SCM_PAGE_SIZE 4096
static char* static char*
map_file_contents (int fd, size_t len, int *is_read_only) map_file_contents (int fd, size_t len, int *is_read_only)
#define FUNC_NAME "load-thunk-from-file" #define FUNC_NAME "load-thunk-from-file"
@ -794,6 +796,11 @@ scm_find_slot_map_unlocked (const scm_t_uint32 *ip)
void void
scm_bootstrap_loader (void) scm_bootstrap_loader (void)
{ {
page_size = getpagesize ();
/* page_size should be a power of two. */
if (page_size & (page_size - 1))
abort ();
scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
"scm_init_loader", "scm_init_loader",
(scm_t_extension_init_func)scm_init_loader, NULL); (scm_t_extension_init_func)scm_init_loader, NULL);