X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/9de87eea47536e25ef99bc25f07afdd759ee3575..a50eda40dfca0461d7ad6f013fa55d2c14f1d2c6:/libguile/error.c diff --git a/libguile/error.c b/libguile/error.c index dc7e25ac1..89345c2b7 100644 --- a/libguile/error.c +++ b/libguile/error.c @@ -1,27 +1,30 @@ -/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2004 Free Software Foundation, Inc. - * +/* Copyright (C) 1995-1998, 2000, 2001, 2004, 2006, 2010, 2012-2014 + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif +#include #include #include @@ -37,9 +40,7 @@ #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_UNISTD_H #include -#endif /* For Windows... */ #ifdef HAVE_IO_H @@ -77,7 +78,8 @@ SCM_DEFINE (scm_error_scm, "scm-error", 5, 0, 0, "@code{system-error} then it should be a list containing the\n" "Unix @code{errno} value; If @var{key} is @code{signal} then it\n" "should be a list containing the Unix signal number; If\n" - "@var{key} is @code{out-of-range} or @code{wrong-type-arg},\n" + "@var{key} is @code{out-of-range}, @code{wrong-type-arg},\n" + "or @code{keyword-argument-error}, " "it is a list containing the bad value; otherwise\n" "it will usually be @code{#f}.") #define FUNC_NAME s_scm_error_scm @@ -93,21 +95,10 @@ SCM_DEFINE (scm_error_scm, "scm-error", 5, 0, 0, /* No return, but just in case: */ fprintf (stderr, "Guile scm_ithrow returned!\n"); - exit (1); + exit (EXIT_FAILURE); } #undef FUNC_NAME -#ifdef __MINGW32__ -# include "win32-socket.h" -# define SCM_I_STRERROR(err) \ - ((err >= WSABASEERR) ? scm_i_socket_strerror (err) : strerror (err)) -# define SCM_I_ERRNO() \ - (errno ? errno : scm_i_socket_errno ()) -#else -# define SCM_I_STRERROR(err) strerror (err) -# define SCM_I_ERRNO() errno -#endif /* __MINGW32__ */ - /* strerror may not be thread safe, for instance in glibc (version 2.3.2) an error number not among the known values results in a string like "Unknown error 9999" formed in a static buffer, which will be overwritten by a @@ -130,12 +121,15 @@ SCM_DEFINE (scm_strerror, "strerror", 1, 0, 0, #define FUNC_NAME s_scm_strerror { SCM ret; - scm_frame_begin (0); - scm_i_frame_pthread_mutex_lock (&scm_i_misc_mutex); + int errnum = scm_to_int (err); /* Must be done outside of the + critical section below, to avoid a + deadlock on errors. */ + scm_dynwind_begin (0); + scm_i_dynwind_pthread_mutex_lock (&scm_i_misc_mutex); - ret = scm_from_locale_string (SCM_I_STRERROR (scm_to_int (err))); + ret = scm_from_locale_string (strerror (errnum)); - scm_frame_end (); + scm_dynwind_end (); return ret; } #undef FUNC_NAME @@ -144,7 +138,34 @@ SCM_GLOBAL_SYMBOL (scm_system_error_key, "system-error"); void scm_syserror (const char *subr) { - SCM err = scm_from_int (SCM_I_ERRNO ()); + SCM err = scm_from_int (errno); + + /* It could be that we're getting here because the syscall was + interrupted by a signal. In that case a signal handler might have + been queued to run. The signal handler probably throws an + exception. + + If we don't try to run the signal handler now, it will run later, + which would result in two exceptions being thrown: this syserror, + and then at some later time the exception thrown by the async + signal handler. + + The problem is that we don't know if handling the signal caused an + async to be queued. By this time scmsigs.c:take_signal will have + written a byte on the fd, but we don't know if the signal-handling + thread has read it off and queued an async. + + Ideally we need some API like scm_i_ensure_signals_delivered() to + catch up signal delivery. Barring that, we just cross our digits + and pray; it could be that we handle the signal in time, and just + throw once, or it could be that we miss the deadline and throw + twice. + */ +#ifdef EINTR + if (scm_to_int (err) == EINTR) + SCM_ASYNC_TICK; +#endif + scm_error (scm_system_error_key, subr, "~A", @@ -155,6 +176,11 @@ scm_syserror (const char *subr) void scm_syserror_msg (const char *subr, const char *message, SCM args, int eno) { + /* See above note about the EINTR signal handling race. */ +#ifdef EINTR + if (eno == EINTR) + SCM_ASYNC_TICK; +#endif scm_error (scm_system_error_key, subr, message, @@ -231,6 +257,19 @@ scm_wrong_type_arg (const char *subr, int pos, SCM bad_value) scm_list_1 (bad_value)); } +void +scm_i_wrong_type_arg_symbol (SCM symbol, int pos, SCM bad_value) +{ + scm_error_scm (scm_arg_type_key, + scm_symbol_to_string (symbol), + (pos == 0) ? scm_from_locale_string ("Wrong type: ~S") + : scm_from_locale_string ("Wrong type argument in position ~A: ~S"), + (pos == 0) ? scm_list_1 (bad_value) + : scm_list_2 (scm_from_int (pos), bad_value), + scm_list_1 (bad_value)); + scm_remember_upto_here_2 (symbol, bad_value); +} + void scm_wrong_type_arg_msg (const char *subr, int pos, SCM bad_value, const char *szMessage) { @@ -253,14 +292,6 @@ scm_wrong_type_arg_msg (const char *subr, int pos, SCM bad_value, const char *sz } -SCM_GLOBAL_SYMBOL (scm_memory_alloc_key, "memory-allocation-error"); -void -scm_memory_error (const char *subr) -{ - fprintf (stderr, "FATAL: memory error in %s\n", subr); - abort (); -} - SCM_GLOBAL_SYMBOL (scm_misc_error_key, "misc-error"); void scm_misc_error (const char *subr, const char *message, SCM args) @@ -271,7 +302,7 @@ scm_misc_error (const char *subr, const char *message, SCM args) void scm_init_error () { -#include "libguile/cpp_err_symbols.c" +#include "libguile/cpp-E.c" #include "libguile/error.x" }