X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=e49d7d15052c900e11959430b21e8135577d6157;hb=HEAD;hp=f1c50cf1f174f3363d43e58becf2e9fd98267f00;hpb=ebb604b4422ba886e70ce2e531c1f4d28d44e721;p=sbcl.git diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index f1c50cf..e49d7d1 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include "runtime.h" #ifndef LISP_FEATURE_WIN32 #include #endif @@ -42,7 +42,9 @@ #include #endif +#if !(defined(LISP_FEATURE_WIN32) && defined(LISP_FEATURE_SB_THREAD)) #include "signal.h" +#endif #include "runtime.h" #include "vars.h" @@ -93,7 +95,7 @@ void sigint_init(void) { SHOW("entering sigint_init()"); - install_handler(SIGINT, sigint_handler); + install_handler(SIGINT, sigint_handler, 1); SHOW("leaving sigint_init()"); } @@ -215,7 +217,15 @@ SBCL is free software, provided as is, with absolutely no warranty.\n\ It is mostly in the public domain; some portions are provided under\n\ BSD-style licenses. See the CREDITS and COPYING files in the\n\ distribution for more information.\n\ -", SBCL_VERSION_STRING); +" +#ifdef LISP_FEATURE_WIN32 +"\n\ +WARNING: the Windows port is fragile, particularly for multithreaded\n\ +code. Unfortunately, the development team currently lacks the time\n\ +and resources this platform demands.\n\ +" +#endif +, SBCL_VERSION_STRING); } /* Look for a core file to load, first in the directory named by the @@ -285,6 +295,18 @@ search_for_executable(const char *argv0) return search; } } + /* The above for-loop fails to process the last part of PATH if PATH does + * not end with ':'. We may consider appending an extra ':' to the end of + * SEARCH. -- houjingyi 2013-05-24 */ + if (start != NULL && *start != '\0') { + snprintf(buf, PATH_MAX + 1, "%s/%s", start, argv0); + if (access(buf, F_OK) == 0) { + free(search); + search = copied_realpath(buf); + free(buf); + return search; + } + } free(search); free(buf); @@ -292,10 +314,11 @@ search_for_executable(const char *argv0) } #endif /* LISP_FEATURE_WIN32 */ -unsigned long parse_size_arg(char *arg, char *arg_name) +size_t +parse_size_arg(char *arg, char *arg_name) { char *tail, *power_name; - unsigned long power, res; + size_t power, res; res = strtoul(arg, &tail, 0); @@ -327,7 +350,7 @@ unsigned long parse_size_arg(char *arg, char *arg_name) free(power_name); } if ((res <= 0) || - (res > (ULONG_MAX >> power))) { + (res >= (SIZE_MAX >> power))) { lose("%s argument is out of range: %s", arg_name, arg); } res <<= power; @@ -340,6 +363,54 @@ char *core_string; struct runtime_options *runtime_options; char *saved_runtime_path = NULL; +#if defined(LISP_FEATURE_WIN32) && defined(LISP_FEATURE_SB_THREAD) +void pthreads_win32_init(); +#endif + +void print_locale_variable(const char *name) +{ + char *value = getenv(name); + + if (value) { + fprintf(stderr, "\n %s=%s", name, value); + } +} + +void setup_locale() +{ + if(setlocale(LC_ALL, "") == NULL) { +#ifndef LISP_FEATURE_WIN32 + + fprintf(stderr, "WARNING: Setting locale failed.\n"); + fprintf(stderr, " Check the following variables for correct values:"); + + if (setlocale(LC_CTYPE, "") == NULL) { + print_locale_variable("LC_ALL"); + print_locale_variable("LC_CTYPE"); + print_locale_variable("LANG"); + } + + if (setlocale(LC_MESSAGES, "") == NULL) { + print_locale_variable("LC_MESSAGES"); + } + if (setlocale(LC_COLLATE, "") == NULL) { + print_locale_variable("LC_COLLATE"); + } + if (setlocale(LC_MONETARY, "") == NULL) { + print_locale_variable("LC_MONETARY"); + } + if (setlocale(LC_NUMERIC, "") == NULL) { + print_locale_variable("LC_NUMERIC"); + } + if (setlocale(LC_TIME, "") == NULL) { + print_locale_variable("LC_TIME"); + } + fprintf(stderr, "\n"); + +#endif + } +} + int main(int argc, char *argv[], char *envp[]) @@ -364,11 +435,14 @@ main(int argc, char *argv[], char *envp[]) lispobj initial_function; const char *sbcl_home = getenv("SBCL_HOME"); +#if defined(LISP_FEATURE_WIN32) && defined(LISP_FEATURE_SB_THREAD) + os_preinit(); + pthreads_win32_init(); +#endif + interrupt_init(); block_blockable_signals(0, 0); - setlocale(LC_ALL, ""); - runtime_options = NULL; /* Save the argv[0] derived runtime path in case @@ -445,14 +519,22 @@ main(int argc, char *argv[], char *envp[]) ++argi; if (argi >= argc) lose("missing argument for --dynamic-space-size"); - dynamic_space_size = parse_size_arg(argv[argi++], "--dynamic-space-size"); + dynamic_space_size = parse_size_arg(argv[argi++], + "--dynamic-space-size"); # ifdef MAX_DYNAMIC_SPACE_END if (!((DYNAMIC_SPACE_START < DYNAMIC_SPACE_START+dynamic_space_size) && (DYNAMIC_SPACE_START+dynamic_space_size <= - MAX_DYNAMIC_SPACE_END))) - lose("--dynamic-space-size argument %s is too large, max %lu", - argv[argi-1], MAX_DYNAMIC_SPACE_END-DYNAMIC_SPACE_START); + MAX_DYNAMIC_SPACE_END))) { + char* suffix = ""; + char* size = argv[argi-1]; + if (!strchr(size, 'B') && !strchr(size, 'b')) { + suffix = " [MB]"; + } + lose("--dynamic-space-size argument %s%s is too large, max %lu KB", + size, suffix, + (MAX_DYNAMIC_SPACE_END-DYNAMIC_SPACE_START) / 1024); + } # endif } else if (0 == strcmp(arg, "--control-stack-size")) { ++argi; @@ -530,11 +612,11 @@ main(int argc, char *argv[], char *envp[]) /* Align down to multiple of page_table page size, and to the appropriate * stack alignment. */ - dynamic_space_size &= ~(PAGE_BYTES-1); + dynamic_space_size &= ~(sword_t)(PAGE_BYTES-1); #ifdef LISP_FEATURE_GENCGC - dynamic_space_size &= ~(GENCGC_CARD_BYTES-1); + dynamic_space_size &= ~(sword_t)(GENCGC_CARD_BYTES-1); #endif - thread_control_stack_size &= ~(CONTROL_STACK_ALIGNMENT_BYTES-1); + thread_control_stack_size &= ~(sword_t)(CONTROL_STACK_ALIGNMENT_BYTES-1); /* Preserve the runtime options for possible future core saving */ runtime_options->dynamic_space_size = dynamic_space_size; @@ -549,6 +631,8 @@ main(int argc, char *argv[], char *envp[]) gc_init(); validate(); + setup_locale(); + /* If no core file was specified, look for one. */ if (!core) { core = search_for_core(); @@ -604,6 +688,9 @@ main(int argc, char *argv[], char *envp[]) if (initial_function == NIL) { lose("couldn't find initial function\n"); } +#ifdef LISP_FEATURE_SB_DYNAMIC_CORE + os_link_runtime(); +#endif #ifdef LISP_FEATURE_HPUX /* -1 = CLOSURE_FUN_OFFSET, 23 = SIMPLE_FUN_CODE_OFFSET, we are * not in LANGUAGE_ASSEMBLY so we cant reach them. */ @@ -629,14 +716,7 @@ main(int argc, char *argv[], char *envp[]) FSHOW((stderr, "/funcalling initial_function=0x%lx\n", (unsigned long)initial_function)); -#ifdef LISP_FEATURE_WIN32 - fprintf(stderr, "\n\ -This is experimental prerelease support for the Windows platform: use\n\ -at your own risk. \"Your Kitten of Death awaits!\"\n"); - fflush(stdout); - fflush(stderr); -#endif create_initial_thread(initial_function); - lose("CATS. CATS ARE NICE.\n"); + lose("unexpected return from initial thread in main()\n"); return 0; }