diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-08-17 23:39:56 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-08-18 00:06:45 +0200 |
commit | fbb857a472eb4e69c1cba05e86646b7004f32df6 (patch) | |
tree | ff23e64de5a558b575ed812349d8af6e64d8ceb4 /libguile/load.c | |
parent | 49c9839eae84f7f3cd10db45f389fa1ea1050659 (diff) | |
parent | e33a910dd0f430f34c32fe6846899aee33fc2cf6 (diff) | |
download | guile-fbb857a472eb4e69c1cba05e86646b7004f32df6.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
lib/Makefile.am
libguile/Makefile.am
libguile/frames.c
libguile/gc-card.c
libguile/gc-freelist.c
libguile/gc-mark.c
libguile/gc-segment.c
libguile/gc_os_dep.c
libguile/load.c
libguile/macros.c
libguile/objcodes.c
libguile/programs.c
libguile/strings.c
libguile/vm.c
m4/gnulib-cache.m4
m4/gnulib-comp.m4
m4/inline.m4
Diffstat (limited to 'libguile/load.c')
-rw-r--r-- | libguile/load.c | 281 |
1 files changed, 238 insertions, 43 deletions
diff --git a/libguile/load.c b/libguile/load.c index 1a2994f40..505678932 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -1,18 +1,19 @@ -/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2004, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2004, 2006, 2008, 2009 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 3 of + * the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA */ @@ -53,6 +54,10 @@ #include <unistd.h> #endif /* HAVE_UNISTD_H */ +#ifdef HAVE_PWD_H +#include <pwd.h> +#endif /* HAVE_PWD_H */ + #ifndef R_OK #define R_OK 4 #endif @@ -174,9 +179,15 @@ static SCM *scm_loc_load_path; /* List of extensions we try adding to the filenames. */ static SCM *scm_loc_load_extensions; -/* Like %load-extensions, but for compiled files. */ +/* Like %load-path and %load-extensions, but for compiled files. */ +static SCM *scm_loc_load_compiled_path; static SCM *scm_loc_load_compiled_extensions; +/* Whether we should try to auto-compile. */ +static SCM *scm_loc_load_should_autocompile; + +/* The fallback path for autocompilation */ +static SCM *scm_loc_compile_fallback_path; SCM_DEFINE (scm_parse_path, "parse-path", 1, 1, 0, (SCM path, SCM tail), @@ -209,6 +220,7 @@ scm_init_load_path () { char *env; SCM path = SCM_EOL; + SCM cpath = SCM_EOL; #ifdef SCM_LIBRARY_DIR env = getenv ("GUILE_SYSTEM_PATH"); @@ -222,13 +234,54 @@ scm_init_load_path () path = scm_list_3 (scm_from_locale_string (SCM_SITE_DIR), scm_from_locale_string (SCM_LIBRARY_DIR), scm_from_locale_string (SCM_PKGDATA_DIR)); + + env = getenv ("GUILE_SYSTEM_COMPILED_PATH"); + if (env && strcmp (env, "") == 0) + /* like above */ + ; + else if (env) + cpath = scm_parse_path (scm_from_locale_string (env), cpath); + else + cpath = scm_cons (scm_from_locale_string (SCM_CCACHE_DIR), cpath); + #endif /* SCM_LIBRARY_DIR */ + { + char cachedir[1024]; + char *e; +#ifdef HAVE_GETPWENT + struct passwd *pwd; +#endif + +#define FALLBACK_DIR \ + "guile/ccache/" SCM_EFFECTIVE_VERSION "-" SCM_OBJCODE_MACHINE_VERSION_STRING + + if ((e = getenv ("XDG_CACHE_HOME"))) + snprintf (cachedir, sizeof(cachedir), "%s" FALLBACK_DIR, e); + else if ((e = getenv ("HOME"))) + snprintf (cachedir, sizeof(cachedir), "%s/.cache/" FALLBACK_DIR, e); +#ifdef HAVE_GETPWENT + else if ((pwd = getpwuid (getuid ())) && pwd->pw_dir) + snprintf (cachedir, sizeof(cachedir), "%s/.cache/" FALLBACK_DIR, + pwd->pw_dir); +#endif /* HAVE_GETPWENT */ + else + cachedir[0] = 0; + + if (cachedir[0]) + *scm_loc_compile_fallback_path = scm_from_locale_string (cachedir); + } + env = getenv ("GUILE_LOAD_PATH"); if (env) path = scm_parse_path (scm_from_locale_string (env), path); + env = getenv ("GUILE_LOAD_COMPILED_PATH"); + if (env) + cpath = scm_parse_path (scm_from_locale_string (env), cpath); + *scm_loc_load_path = path; + *scm_loc_load_compiled_path = cpath; } SCM scm_listofnullstr; @@ -508,58 +561,191 @@ SCM_DEFINE (scm_sys_search_load_path, "%search-load-path", 1, 0, 0, #undef FUNC_NAME -SCM_DEFINE (scm_primitive_load_path, "primitive-load-path", 1, 0, 0, - (SCM filename), +static int +compiled_is_fresh (SCM full_filename, SCM compiled_filename) +{ + char *source, *compiled; + struct stat stat_source, stat_compiled; + int res; + + source = scm_to_locale_string (full_filename); + compiled = scm_to_locale_string (compiled_filename); + + if (stat (source, &stat_source) == 0 + && stat (compiled, &stat_compiled) == 0 + && stat_source.st_mtime == stat_compiled.st_mtime) + { + res = 1; + } + else + { + scm_puts (";;; note: source file ", scm_current_error_port ()); + scm_puts (source, scm_current_error_port ()); + scm_puts ("\n;;; newer than compiled ", scm_current_error_port ()); + scm_puts (compiled, scm_current_error_port ()); + scm_puts ("\n", scm_current_error_port ()); + res = 0; + } + + free (source); + free (compiled); + return res; +} + +static SCM +do_try_autocompile (void *data) +{ + SCM source = PTR2SCM (data); + SCM comp_mod, compile_file; + + scm_puts (";;; compiling ", scm_current_error_port ()); + scm_display (source, scm_current_error_port ()); + scm_newline (scm_current_error_port ()); + + comp_mod = scm_c_resolve_module ("system base compile"); + compile_file = scm_module_variable + (comp_mod, scm_from_locale_symbol ("compile-file")); + + if (scm_is_true (compile_file)) + { + SCM res = scm_call_1 (scm_variable_ref (compile_file), source); + scm_puts (";;; compiled ", scm_current_error_port ()); + scm_display (res, scm_current_error_port ()); + scm_newline (scm_current_error_port ()); + return res; + } + else + { + scm_puts (";;; it seems ", scm_current_error_port ()); + scm_display (source, scm_current_error_port ()); + scm_puts ("\n;;; is part of the compiler; skipping autocompilation\n", + scm_current_error_port ()); + return SCM_BOOL_F; + } +} + +static SCM +autocompile_catch_handler (void *data, SCM tag, SCM throw_args) +{ + SCM source = PTR2SCM (data); + scm_puts (";;; WARNING: compilation of ", scm_current_error_port ()); + scm_display (source, scm_current_error_port ()); + scm_puts (" failed:\n", scm_current_error_port ()); + scm_puts (";;; key ", scm_current_error_port ()); + scm_write (tag, scm_current_error_port ()); + scm_puts (", throw args ", scm_current_error_port ()); + scm_write (throw_args, scm_current_error_port ()); + scm_newline (scm_current_error_port ()); + return SCM_BOOL_F; +} + +static SCM +scm_try_autocompile (SCM source) +{ + static int message_shown = 0; + + if (scm_is_false (*scm_loc_load_should_autocompile)) + return SCM_BOOL_F; + + if (!message_shown) + { + scm_puts (";;; note: autocompilation is enabled, set GUILE_AUTO_COMPILE=0\n" + ";;; or pass the --no-autocompile argument to disable.\n", + scm_current_error_port ()); + message_shown = 1; + } + + return scm_c_catch (SCM_BOOL_T, + do_try_autocompile, + SCM2PTR (source), + autocompile_catch_handler, + SCM2PTR (source), + NULL, NULL); +} + +SCM_DEFINE (scm_primitive_load_path, "primitive-load-path", 1, 1, 0, + (SCM filename, SCM exception_on_not_found), "Search @var{%load-path} for the file named @var{filename} and\n" "load it into the top-level environment. If @var{filename} is a\n" "relative pathname and is not found in the list of search paths,\n" - "an error is signalled.") + "an error is signalled, unless the optional argument\n" + "@var{exception_on_not_found} is @code{#f}, in which case\n" + "@code{#f} is returned instead.") #define FUNC_NAME s_scm_primitive_load_path { SCM full_filename, compiled_filename; + int compiled_is_fallback = 0; + + if (SCM_UNBNDP (exception_on_not_found)) + exception_on_not_found = SCM_BOOL_T; full_filename = scm_sys_search_load_path (filename); - compiled_filename = scm_search_path (*scm_loc_load_path, + compiled_filename = scm_search_path (*scm_loc_load_compiled_path, filename, *scm_loc_load_compiled_extensions, SCM_BOOL_T); - + + if (scm_is_false (compiled_filename) + && scm_is_true (full_filename) + && scm_is_true (*scm_loc_compile_fallback_path) + && scm_is_pair (*scm_loc_load_compiled_extensions) + && scm_is_string (scm_car (*scm_loc_load_compiled_extensions))) + { + SCM fallback = scm_string_append + (scm_list_3 (*scm_loc_compile_fallback_path, + full_filename, + scm_car (*scm_loc_load_compiled_extensions))); + if (scm_is_true (scm_stat (fallback, SCM_BOOL_F))) + { + compiled_filename = fallback; + compiled_is_fallback = 1; + } + } + if (scm_is_false (full_filename) && scm_is_false (compiled_filename)) - SCM_MISC_ERROR ("Unable to find file ~S in load path", - scm_list_1 (filename)); - - if (scm_is_false (compiled_filename)) - return scm_primitive_load (full_filename); + { + if (scm_is_true (exception_on_not_found)) + SCM_MISC_ERROR ("Unable to find file ~S in load path", + scm_list_1 (filename)); + else + return SCM_BOOL_F; + } - if (scm_is_false (full_filename)) + if (scm_is_false (full_filename) + || (scm_is_true (compiled_filename) + && compiled_is_fresh (full_filename, compiled_filename))) return scm_load_compiled_with_vm (compiled_filename); + /* Perhaps there was the installed .go that was stale, but our fallback is + fresh. Let's try that. Duplicating code, but perhaps that's OK. */ + + if (!compiled_is_fallback + && scm_is_true (*scm_loc_compile_fallback_path) + && scm_is_pair (*scm_loc_load_compiled_extensions) + && scm_is_string (scm_car (*scm_loc_load_compiled_extensions))) + { + SCM fallback = scm_string_append + (scm_list_3 (*scm_loc_compile_fallback_path, + full_filename, + scm_car (*scm_loc_load_compiled_extensions))); + if (scm_is_true (scm_stat (fallback, SCM_BOOL_F)) + && compiled_is_fresh (full_filename, fallback)) + { + scm_puts (";;; found fresh local cache at ", scm_current_error_port ()); + scm_display (fallback, scm_current_error_port ()); + scm_newline (scm_current_error_port ()); + return scm_load_compiled_with_vm (compiled_filename); + } + } + + /* Otherwise, we bottom out here. */ { - char *source, *compiled; - struct stat stat_source, stat_compiled; + SCM freshly_compiled = scm_try_autocompile (full_filename); - source = scm_to_locale_string (full_filename); - compiled = scm_to_locale_string (compiled_filename); - - if (stat (source, &stat_source) == 0 - && stat (compiled, &stat_compiled) == 0 - && stat_source.st_mtime <= stat_compiled.st_mtime) - { - free (source); - free (compiled); - return scm_load_compiled_with_vm (compiled_filename); - } + if (scm_is_true (freshly_compiled)) + return scm_load_compiled_with_vm (freshly_compiled); else - { - scm_puts (";;; note: source file ", scm_current_error_port ()); - scm_puts (source, scm_current_error_port ()); - scm_puts (" newer than compiled ", scm_current_error_port ()); - scm_puts (compiled, scm_current_error_port ()); - scm_puts ("\n", scm_current_error_port ()); - free (source); - free (compiled); - return scm_primitive_load (full_filename); - } + return scm_primitive_load (full_filename); } } #undef FUNC_NAME @@ -567,7 +753,8 @@ SCM_DEFINE (scm_primitive_load_path, "primitive-load-path", 1, 0, 0, SCM scm_c_primitive_load_path (const char *filename) { - return scm_primitive_load_path (scm_from_locale_string (filename)); + return scm_primitive_load_path (scm_from_locale_string (filename), + SCM_BOOL_T); } @@ -600,11 +787,19 @@ scm_init_load () = SCM_VARIABLE_LOC (scm_c_define ("%load-extensions", scm_list_2 (scm_from_locale_string (".scm"), scm_nullstr))); + scm_loc_load_compiled_path + = SCM_VARIABLE_LOC (scm_c_define ("%load-compiled-path", SCM_EOL)); scm_loc_load_compiled_extensions = SCM_VARIABLE_LOC (scm_c_define ("%load-compiled-extensions", scm_list_1 (scm_from_locale_string (".go")))); scm_loc_load_hook = SCM_VARIABLE_LOC (scm_c_define ("%load-hook", SCM_BOOL_F)); + scm_loc_compile_fallback_path + = SCM_VARIABLE_LOC (scm_c_define ("%compile-fallback-path", SCM_BOOL_F)); + + scm_loc_load_should_autocompile + = SCM_VARIABLE_LOC (scm_c_define ("%load-should-autocompile", SCM_BOOL_F)); + the_reader = scm_make_fluid (); scm_fluid_set_x (the_reader, SCM_BOOL_F); scm_c_define("current-reader", the_reader); |