cpython: e6f00778d61f (original) (raw)

Mercurial > cpython

changeset 100691:e6f00778d61f

Issue #23848: Try to fix test_faulthandler on ARM Restore the previous code for stack_overflow(). [#23848]

Victor Stinner victor.stinner@gmail.com
date	Wed, 23 Mar 2016 15:19:12 +0100
parents	efcc48cd5bfb
children	3cc36e0f2325
files	Modules/faulthandler.c
diffstat	1 files changed, 16 insertions(+), 32 deletions(-)[+] [-] Modules/faulthandler.c 48

line wrap: on

line diff

--- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -418,21 +418,21 @@ int faulthandler_enable(void) { size_t i;

fault_handler_t *handler;

-#ifdef HAVE_SIGACTION

struct sigaction action;

-#endif

int err;

if (fatal_error.enabled) { return 0; } - fatal_error.enabled = 1; for (i=0; i < faulthandler_nsignals; i++) {

```
   fault_handler_t *handler;[](#l1.20)
```

+#ifdef HAVE_SIGACTION

```
   struct sigaction action;[](#l1.22)
```

+#endif

```
   int err;[](#l1.24)
```

+ handler = &faulthandler_handlers[i]; -

```
   assert(!handler->enabled);[](#l1.28)
```

#ifdef HAVE_SIGACTION action.sa_handler = faulthandler_fatal_error; sigemptyset(&action.sa_mask); @@ -1062,7 +1062,6 @@ faulthandler_fatal_error_py(PyObject se Py_RETURN_NONE; } - #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION) #define FAULTHANDLER_STACK_OVERFLOW @@ -1079,21 +1078,12 @@ stack_overflow(Py_uintptr_t min_sp, Py_u / allocate 4096 bytes on the stack at each call */ unsigned char buffer[4096]; Py_uintptr_t sp = (Py_uintptr_t)&buffer;

Py_uintptr_t stop;

- *depth += 1;

if (sp < min_sp || max_sp < sp) {

   printf("call #%lu\n", (unsigned long)*depth);[](#l1.48)

if (sp < min_sp || max_sp < sp) return sp;

}

memset(buffer, (unsigned char)*depth, sizeof(buffer));
stop = stack_overflow(min_sp, max_sp, depth) + buffer[0];

memset(buffer, (unsigned char)stop, sizeof(buffer));
stop = stack_overflow(min_sp, max_sp, depth) + buffer[0];

return stop;

buffer[0] = 1;
buffer[4095] = 0;
return stack_overflow(min_sp, max_sp, depth);

} static PyObject * @@ -1101,19 +1091,13 @@ faulthandler_stack_overflow(PyObject *se { size_t depth, size; Py_uintptr_t sp = (Py_uintptr_t)&depth;

Py_uintptr_t min_sp, max_sp, stop;

Py_uintptr_t stop;

faulthandler_suppress_crash_report(); - depth = 0;

if (sp > STACK_OVERFLOW_MAX_SIZE)

   min_sp = sp - STACK_OVERFLOW_MAX_SIZE;[](#l1.77)

else
```
   min_sp = 0;[](#l1.79)
```
max_sp = sp + STACK_OVERFLOW_MAX_SIZE;

stop = stack_overflow(min_sp, max_sp, &depth);

stop = stack_overflow(sp - STACK_OVERFLOW_MAX_SIZE,

                     sp + STACK_OVERFLOW_MAX_SIZE,[](#l1.85)

```
                     &depth);[](#l1.86)
```
if (sp < stop) size = stop - sp; else @@ -1124,7 +1108,7 @@ faulthandler_stack_overflow(PyObject se size, depth); return NULL; } -#endif / (defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION)) ... / +#endif / defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION) */ static int