mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 09:04:13 +00:00
try using sigsetjmp
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28111 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald
parent
3db89e14dd
commit
3cfdb02718
5 changed files with 147 additions and 16 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2009-03-21 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
* configure.ac:
|
||||
* configure:
|
||||
* Headers/Additions/GNUstepBase/config.h.in:
|
||||
* Source/NSDebug.m:
|
||||
Try using sigsetjmp for dealing with signals during stack trace,
|
||||
in case it helps work arouns bugs in signal handling.
|
||||
|
||||
2009-03-21 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSMessagePort.m:
|
||||
|
|
|
|||
|
|
@ -289,6 +289,9 @@
|
|||
/* Define to 1 if you have the <signal.h> header file. */
|
||||
#undef HAVE_SIGNAL_H
|
||||
|
||||
/* Define to 1 if you have the `sigsetjmp' function. */
|
||||
#undef HAVE_SIGSETJMP
|
||||
|
||||
/* Define to 1 if you have the `statvfs' function. */
|
||||
#undef HAVE_STATVFS
|
||||
|
||||
|
|
@ -486,25 +489,25 @@
|
|||
/* Define to 1 if the `setpgrp' function takes no argument. */
|
||||
#undef SETPGRP_VOID
|
||||
|
||||
/* The size of `double', as computed by sizeof. */
|
||||
/* The size of a `double', as computed by sizeof. */
|
||||
#undef SIZEOF_DOUBLE
|
||||
|
||||
/* The size of `float', as computed by sizeof. */
|
||||
/* The size of a `float', as computed by sizeof. */
|
||||
#undef SIZEOF_FLOAT
|
||||
|
||||
/* The size of `int', as computed by sizeof. */
|
||||
/* The size of a `int', as computed by sizeof. */
|
||||
#undef SIZEOF_INT
|
||||
|
||||
/* The size of `long', as computed by sizeof. */
|
||||
/* The size of a `long', as computed by sizeof. */
|
||||
#undef SIZEOF_LONG
|
||||
|
||||
/* The size of `long long', as computed by sizeof. */
|
||||
/* The size of a `long long', as computed by sizeof. */
|
||||
#undef SIZEOF_LONG_LONG
|
||||
|
||||
/* The size of `short', as computed by sizeof. */
|
||||
/* The size of a `short', as computed by sizeof. */
|
||||
#undef SIZEOF_SHORT
|
||||
|
||||
/* The size of `void*', as computed by sizeof. */
|
||||
/* The size of a `void*', as computed by sizeof. */
|
||||
#undef SIZEOF_VOIDP
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
|
|
@ -532,5 +535,5 @@
|
|||
#undef inline
|
||||
#endif
|
||||
|
||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
||||
/* Define to `unsigned' if <sys/types.h> does not define. */
|
||||
#undef size_t
|
||||
|
|
|
|||
|
|
@ -873,23 +873,32 @@ case a: env->addr = __builtin_return_address(a + 1); break;
|
|||
* functions are not reliable (at least not on my EM64T based system) and
|
||||
* will sometimes walk off the stack and access illegal memory locations.
|
||||
* In order to prevent such an occurrance from crashing the application,
|
||||
* we use setjmp() and longjmp() to ensure that we can recover, and
|
||||
* we use sigsetjmp() and siglongjmp() to ensure that we can recover, and
|
||||
* we keep the jump buffer in thread-local memory to avoid possible thread
|
||||
* safety issues.
|
||||
* Of course this will fail horribly if an exception occurs in one of the
|
||||
* few methods we use to manage the per-thread jump buffer.
|
||||
*/
|
||||
#include <signal.h>
|
||||
#include <setjmp.h>
|
||||
|
||||
#if defined(__MINGW32__)
|
||||
#include <setjmp.h>
|
||||
#ifndef SIGBUS
|
||||
#define SIGBUS SIGILL
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* sigsetjmp may be a function or a macro. The test for the function is
|
||||
* done at configure time so we can tell here if either is available.
|
||||
*/
|
||||
#if !defined(HAVE_SIGSETJMP) && !defined(sigsetjmp)
|
||||
#define siglongjmp(A,B) longjmp(A,B)
|
||||
#define sigsetjmp(A,B) setjmp(A)
|
||||
#define sigjmp_buf jmp_buf
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
jmp_buf buf;
|
||||
sigjmp_buf buf;
|
||||
void *addr;
|
||||
void (*bus)(int);
|
||||
void (*segv)(int);
|
||||
|
|
@ -914,7 +923,7 @@ jbuf()
|
|||
static void
|
||||
recover(int sig)
|
||||
{
|
||||
longjmp(jbuf()->buf, 1);
|
||||
siglongjmp(jbuf()->buf, 1);
|
||||
}
|
||||
|
||||
void *
|
||||
|
|
@ -923,7 +932,7 @@ NSFrameAddress(NSUInteger offset)
|
|||
jbuf_type *env;
|
||||
|
||||
env = jbuf();
|
||||
if (setjmp(env->buf) == 0)
|
||||
if (sigsetjmp(env->buf, 1) == 0)
|
||||
{
|
||||
env->segv = signal(SIGSEGV, recover);
|
||||
env->bus = signal(SIGBUS, recover);
|
||||
|
|
@ -983,7 +992,7 @@ NSUInteger NSCountFrames(void)
|
|||
jbuf_type *env;
|
||||
|
||||
env = jbuf();
|
||||
if (setjmp(env->buf) == 0)
|
||||
if (sigsetjmp(env->buf, 1) == 0)
|
||||
{
|
||||
env->segv = signal(SIGSEGV, recover);
|
||||
env->bus = signal(SIGBUS, recover);
|
||||
|
|
@ -1047,7 +1056,7 @@ NSReturnAddress(NSUInteger offset)
|
|||
jbuf_type *env;
|
||||
|
||||
env = jbuf();
|
||||
if (setjmp(env->buf) == 0)
|
||||
if (sigsetjmp(env->buf, 1) == 0)
|
||||
{
|
||||
env->segv = signal(SIGSEGV, recover);
|
||||
env->bus = signal(SIGBUS, recover);
|
||||
|
|
@ -1140,7 +1149,7 @@ GSPrivateStackAddresses(void)
|
|||
}
|
||||
|
||||
env = jbuf();
|
||||
if (setjmp(env->buf) == 0)
|
||||
if (sigsetjmp(env->buf, 1) == 0)
|
||||
{
|
||||
env->segv = signal(SIGSEGV, recover);
|
||||
env->bus = signal(SIGBUS, recover);
|
||||
|
|
|
|||
106
configure
vendored
106
configure
vendored
|
|
@ -14814,6 +14814,112 @@ fi
|
|||
done
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Needed by NSDebug.m
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
for ac_func in sigsetjmp
|
||||
do
|
||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||||
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_var+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
||||
For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
||||
#define $ac_func innocuous_$ac_func
|
||||
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func (); below.
|
||||
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||||
<limits.h> exists even on freestanding compilers. */
|
||||
|
||||
#ifdef __STDC__
|
||||
# include <limits.h>
|
||||
#else
|
||||
# include <assert.h>
|
||||
#endif
|
||||
|
||||
#undef $ac_func
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char $ac_func ();
|
||||
/* The GNU C library defines this for functions which it implements
|
||||
to always fail with ENOSYS. Some functions are actually named
|
||||
something starting with __ and the normal name is an alias. */
|
||||
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
||||
choke me
|
||||
#else
|
||||
char (*f) () = $ac_func;
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return f != $ac_func;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
eval "$as_ac_var=yes"
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval "$as_ac_var=no"
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
||||
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
||||
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# This type needed by GSFormat
|
||||
#--------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1019,6 +1019,11 @@ AC_CHECK_FUNCS(setrlimit)
|
|||
#--------------------------------------------------------------------
|
||||
AC_CHECK_FUNCS(strerror_r strerror)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Needed by NSDebug.m
|
||||
#--------------------------------------------------------------------
|
||||
AC_CHECK_FUNCS(sigsetjmp)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# This type needed by GSFormat
|
||||
#--------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue