diff options
| -rw-r--r-- | winsup/cygwin/dcrt0.cc | 6 | ||||
| -rw-r--r-- | winsup/cygwin/exceptions.cc | 18 | ||||
| -rw-r--r-- | winsup/cygwin/local_includes/winsup.h | 1 |
3 files changed, 20 insertions, 5 deletions
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 130d652aa..17c9be731 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -1250,11 +1250,7 @@ vapi_fatal (const char *fmt, va_list ap) __small_vsprintf (buf + n, fmt, ap); va_end (ap); strace.prntf (_STRACE_SYSTEM, NULL, "%s", buf); - -#ifdef DEBUGGING - try_to_debug (); -#endif - cygwin_stackdump (); + api_fatal_debug(); myself.exit (__api_fatal_exit_val); } diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index 362ad69a5..8b1c5493e 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -1396,6 +1396,24 @@ signal_exit (int sig, siginfo_t *si, void *) } } /* extern "C" */ +/* As above, but before exiting due to api_fatal */ +extern "C" +void +api_fatal_debug () +{ + if (try_to_debug ()) + return; + + if (cygheap->rlim_core == 0Ul) + return; + + if (cygheap->rlim_core > 1024*1024) + if (exec_prepared_command (dumper_command)) + return; + + cygwin_stackdump(); +} + /* Attempt to carefully handle SIGCONT when we are stopped. */ void _cygtls::handle_SIGCONT () diff --git a/winsup/cygwin/local_includes/winsup.h b/winsup/cygwin/local_includes/winsup.h index 76957618b..38313962d 100644 --- a/winsup/cygwin/local_includes/winsup.h +++ b/winsup/cygwin/local_includes/winsup.h @@ -181,6 +181,7 @@ void close_all_files (bool = false); extern "C" void error_start_init (const char*); extern "C" void dumper_init (void); extern "C" int try_to_debug (); +extern "C" void api_fatal_debug (); void ld_preload (); void fixup_hooks_after_fork (); |