diff --git a/src/sage/interfaces/interface.py b/src/sage/interfaces/interface.py index 616c13d..430ba80 100644 --- a/src/sage/interfaces/interface.py +++ b/src/sage/interfaces/interface.py @@ -589,9 +589,9 @@ class Interface(WithEqualityById, ParentWithBase): EXAMPLES:: sage: maxima.quad_qags(x, x, 0, 1, epsrel=1e-4) - [0.5,0.55511151231257...e-14,21,0] + [0.5,5.5511151231257...e-15,21,0] sage: maxima.function_call('quad_qags', [x, x, 0, 1], {'epsrel':'1e-4'}) - [0.5,0.55511151231257...e-14,21,0] + [0.5,5.5511151231257...e-15,21,0] """ args, kwds = self._convert_args_kwds(args, kwds) self._check_valid_function_name(function) diff --git a/src/sage/interfaces/maxima.py b/src/sage/interfaces/maxima.py index 9ab456e..3e8f4a6 100644 --- a/src/sage/interfaces/maxima.py +++ b/src/sage/interfaces/maxima.py @@ -128,9 +128,9 @@ http://maxima.sourceforge.net/docs/intromax/intromax.html. sage: a = maxima('(1 + sqrt(2))^5') sage: float(a) - 82.01219330881975 + 82.0121933088197... sage: a.numer() - 82.01219330881975 + 82.0121933088197... :: diff --git a/src/sage/interfaces/maxima_abstract.py b/src/sage/interfaces/maxima_abstract.py index 86fbe75..ed3055d 100644 --- a/src/sage/interfaces/maxima_abstract.py +++ b/src/sage/interfaces/maxima_abstract.py @@ -1518,7 +1518,7 @@ class MaximaAbstractElement(ExtraTabCompletion, InterfaceElement): EXAMPLES:: sage: maxima('exp(-sqrt(x))').nintegral('x',0,1) - (0.5284822353142306, 0.41633141378838...e-10, 231, 0) + (0.5284822353142306, 4.1633141378838...e-11, 231, 0) Note that GP also does numerical integration, and can do so to very high precision very quickly:: diff --git a/src/sage/interfaces/tests.py b/src/sage/interfaces/tests.py index fc77f12..a6847a9 100644 --- a/src/sage/interfaces/tests.py +++ b/src/sage/interfaces/tests.py @@ -31,8 +31,8 @@ Test that write errors to stderr are handled gracefully by GAP ....: except IOError: ....: f = open('/dev/null', 'w') sage: kwds = dict(shell=True, stdout=f, stderr=f) - sage: subprocess.call("echo syntax error | ecl", **kwds) - 0 + sage: subprocess.call("echo syntax error | ecl", **kwds) in (0, 255) + True sage: subprocess.call("echo syntax error | gap", **kwds) in (0, 1) True sage: subprocess.call("echo syntax error | gp", **kwds) diff --git a/src/sage/libs/ecl.pxd b/src/sage/libs/ecl.pxd index 4dd273f..f0b30de 100644 --- a/src/sage/libs/ecl.pxd +++ b/src/sage/libs/ecl.pxd @@ -39,7 +39,6 @@ cdef extern from "ecl/ecl.h": ECL_OPT_TRAP_SIGINT, ECL_OPT_TRAP_SIGILL, ECL_OPT_TRAP_SIGBUS, - ECL_OPT_TRAP_SIGCHLD, ECL_OPT_TRAP_SIGPIPE, ECL_OPT_TRAP_INTERRUPT_SIGNAL, ECL_OPT_SIGNAL_HANDLING_THREAD, @@ -53,7 +52,6 @@ cdef extern from "ecl/ecl.h": ECL_OPT_LISP_STACK_SAFETY_AREA, ECL_OPT_C_STACK_SIZE, ECL_OPT_C_STACK_SAFETY_AREA, - ECL_OPT_SIGALTSTACK_SIZE, ECL_OPT_HEAP_SIZE, ECL_OPT_HEAP_SAFETY_AREA, ECL_OPT_THREAD_INTERRUPT_SIGNAL, diff --git a/src/sage/libs/ecl.pyx b/src/sage/libs/ecl.pyx index e408866..fa24ac0 100644 --- a/src/sage/libs/ecl.pyx +++ b/src/sage/libs/ecl.pyx @@ -15,7 +15,7 @@ Library interface to Embeddable Common Lisp (ECL) #adapted to work with pure Python types. from libc.stdlib cimport abort -from libc.signal cimport SIGINT, SIGBUS, SIGSEGV, SIGCHLD +from libc.signal cimport SIGINT, SIGBUS, SIGFPE, SIGSEGV from libc.signal cimport raise_ as signal_raise from posix.signal cimport sigaction, sigaction_t cimport cysignals.signals @@ -47,9 +47,14 @@ cdef extern from "eclsig.h": void ecl_sig_off() cdef sigaction_t ecl_sigint_handler cdef sigaction_t ecl_sigbus_handler + cdef sigaction_t ecl_sigfpe_handler cdef sigaction_t ecl_sigsegv_handler cdef mpz_t ecl_mpz_from_bignum(cl_object obj) cdef cl_object ecl_bignum_from_mpz(mpz_t num) + cdef int fegetexcept() + cdef int feenableexcept(int) + cdef int fedisableexcept(int) + cdef int ecl_feflags cdef cl_object string_to_object(char * s): return ecl_read_from_cstring(s) @@ -139,7 +143,6 @@ def test_ecl_options(): ECL_OPT_TRAP_SIGINT = 1 ECL_OPT_TRAP_SIGILL = 1 ECL_OPT_TRAP_SIGBUS = 1 - ECL_OPT_TRAP_SIGCHLD = 0 ECL_OPT_TRAP_SIGPIPE = 1 ECL_OPT_TRAP_INTERRUPT_SIGNAL = 1 ECL_OPT_SIGNAL_HANDLING_THREAD = 0 @@ -153,7 +156,6 @@ def test_ecl_options(): ECL_OPT_LISP_STACK_SAFETY_AREA = ... ECL_OPT_C_STACK_SIZE = ... ECL_OPT_C_STACK_SAFETY_AREA = ... - ECL_OPT_SIGALTSTACK_SIZE = 1 ECL_OPT_HEAP_SIZE = ... ECL_OPT_HEAP_SAFETY_AREA = ... ECL_OPT_THREAD_INTERRUPT_SIGNAL = ... @@ -171,8 +173,6 @@ def test_ecl_options(): ecl_get_option(ECL_OPT_TRAP_SIGILL))) print('ECL_OPT_TRAP_SIGBUS = {0}'.format( ecl_get_option(ECL_OPT_TRAP_SIGBUS))) - print('ECL_OPT_TRAP_SIGCHLD = {0}'.format( - ecl_get_option(ECL_OPT_TRAP_SIGCHLD))) print('ECL_OPT_TRAP_SIGPIPE = {0}'.format( ecl_get_option(ECL_OPT_TRAP_SIGPIPE))) print('ECL_OPT_TRAP_INTERRUPT_SIGNAL = {0}'.format( @@ -199,8 +199,6 @@ def test_ecl_options(): ecl_get_option(ECL_OPT_C_STACK_SIZE))) print('ECL_OPT_C_STACK_SAFETY_AREA = {0}'.format( ecl_get_option(ECL_OPT_C_STACK_SAFETY_AREA))) - print('ECL_OPT_SIGALTSTACK_SIZE = {0}'.format( - ecl_get_option(ECL_OPT_SIGALTSTACK_SIZE))) print('ECL_OPT_HEAP_SIZE = {0}'.format( ecl_get_option(ECL_OPT_HEAP_SIZE))) print('ECL_OPT_HEAP_SAFETY_AREA = {0}'.format( @@ -238,14 +243,12 @@ def init_ecl(): global ecl_has_booted cdef char *argv[1] cdef sigaction_t sage_action[32] + cdef int sage_fpes cdef int i if ecl_has_booted: raise RuntimeError("ECL is already initialized") - # we need it to stop handling SIGCHLD - ecl_set_option(ECL_OPT_TRAP_SIGCHLD, 0); - #we keep our own GMP memory functions. ECL should not claim them ecl_set_option(ECL_OPT_SET_GMP_MEMORY_FUNCTIONS,0); @@ -257,6 +263,8 @@ def init_ecl(): for i in range(1,32): sigaction(i, NULL, &sage_action[i]) + sage_fpes = fegetexcept() + #initialize ECL ecl_set_option(ECL_OPT_SIGNAL_HANDLING_THREAD, 0) cl_boot(1, argv) @@ -264,14 +272,12 @@ def init_ecl(): #save signal handler from ECL sigaction(SIGINT, NULL, &ecl_sigint_handler) sigaction(SIGBUS, NULL, &ecl_sigbus_handler) + sigaction(SIGFPE, NULL, &ecl_sigfpe_handler) sigaction(SIGSEGV, NULL, &ecl_sigsegv_handler) + #save ECL's floating point exception flags + ecl_feflags = fegetexcept() + - #verify that no SIGCHLD handler was installed - cdef sigaction_t sig_test - sigaction(SIGCHLD, NULL, &sig_test) - assert sage_action[SIGCHLD].sa_handler == NULL # Sage does not set SIGCHLD handler - assert sig_test.sa_handler == NULL # And ECL bootup did not set one - #and put the Sage signal handlers back for i in range(1,32): sigaction(i, &sage_action[i], NULL) @@ -276,6 +288,9 @@ def init_ecl(): for i in range(1,32): sigaction(i, &sage_action[i], NULL) + fedisableexcept(ecl_feflags) + feenableexcept(sage_fpes) + #initialise list of objects and bind to global variable # *SAGE-LIST-OF-OBJECTS* to make it rooted in the reachable tree for the GC list_of_objects=cl_cons(Cnil,cl_cons(Cnil,Cnil)) @@ -319,7 +334,6 @@ def init_ecl(): (values nil (princ-to-string cnd))))) """)) safe_funcall_clobj=cl_eval(string_to_object(b"(symbol-function 'sage-safe-funcall)")) - ecl_has_booted = 1 cdef cl_object ecl_safe_eval(cl_object form) except NULL: diff --git a/src/sage/libs/eclsig.h b/src/sage/libs/eclsig.h index f9f2690..a7e1f40 100644 --- a/src/sage/libs/eclsig.h +++ b/src/sage/libs/eclsig.h @@ -9,24 +9,66 @@ #include + +/* Rummage around to determine how ECL was configured */ +#define ECL_AVOID_FPE_H /* Prevent some local includes */ +#include + +#ifdef HAVE_FENV_H +#include +#ifndef FE_ALL_EXCEPT +#define FE_ALL_EXCEPT FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID +#endif +#else +#ifndef FE_ALL_EXCEPT +#define FE_ALL_EXCEPT 0 +#endif +#define feclearexcept(flags) do {} while (0) +#endif + +#ifndef HAVE_FEENABLEEXCEPT +/* These are GNU extensions */ +#define fegetexcept() 0 +#define feenablexcept(flags) do {} while (0) +#define fdisableexcept(flags) do {} while (0) +#endif + static struct sigaction ecl_sigint_handler; static struct sigaction ecl_sigbus_handler; +static struct sigaction ecl_sigfpe_handler; static struct sigaction ecl_sigsegv_handler; static struct sigaction sage_sigint_handler; static struct sigaction sage_sigbus_handler; +static struct sigaction sage_sigfpe_handler; static struct sigaction sage_sigsegv_handler; +static int ecl_feflags; +static int sage_feflags; static inline void set_ecl_signal_handler(void) { sigaction(SIGINT, &ecl_sigint_handler, &sage_sigint_handler); sigaction(SIGBUS, &ecl_sigbus_handler, &sage_sigbus_handler); + sigaction(SIGFPE, &ecl_sigfpe_handler, &sage_sigfpe_handler); sigaction(SIGSEGV, &ecl_sigsegv_handler, &sage_sigsegv_handler); + + /* first clear pending floating point exceptions, if any */ + feclearexcept(FE_ALL_EXCEPT); + + /* sage_feflags should be 0; we don't set them otherwise */ + sage_feflags = fedisableexcept(FE_ALL_EXCEPT); + feenableexcept(ecl_feflags); } static inline void unset_ecl_signal_handler(void) { + /* clear pending exceptions and restore previous exception mask */ + feclearexcept(FE_ALL_EXCEPT); + ecl_feflags = fedisableexcept(FE_ALL_EXCEPT); + feenableexcept(sage_feflags); + sigaction(SIGINT, &sage_sigint_handler, NULL); sigaction(SIGBUS, &sage_sigbus_handler, NULL); + sigaction(SIGFPE, &sage_sigfpe_handler, NULL); sigaction(SIGSEGV, &sage_sigsegv_handler, NULL); }