Mercurial > hg > xemacs-beta
comparison src/emacs.c @ 5014:c2e0c3af5fe3
cleanups to debug-print, try harder to make it work during GC
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_failed):
Fix comments about when inhibit_non_essential_printing_operations
is set and how used. Increment/decrement in assert_failed rather
than just setting/resetting to avoid hosing things in case we're
called when the value is already non-zero. Similarly increment/
decrement in_assert_failed.
* gc.c (gc_prepare):
* gc.c (gc_finish):
Increment/decrement inhibit_non_essential_printing_operations
rather than setting/resetting.
* print.c:
* print.c (debug_out):
* print.c (write_string_to_alternate_debugging_output):
* print.c (restore_inhibit_non_essential_conversion_operations):
* print.c (debug_print_exit):
* print.c (debug_print_enter):
* print.c (debug_prin1):
* print.c (debug_p4):
* print.c (ext_print_begin):
* print.c (ext_print_end):
* print.c (external_debug_print):
* print.c (debug_p3):
* print.c (debug_backtrace):
* print.c (debug_short_backtrace):
* print.c (vars_of_print):
Lots of cleanup. Fix debug_out() so it binds
inhibit_non_essential_printing_operations around it to ensure no
conversion. Remove many other places that set the same var since
the lower-level functions now all do it. A few other places, add
inhibit_non_essential_printing_operations bindings.Extract the
code out that sets up and resets lots of bindings in debug_prin1()
so that debug_backtrace() can use it, and rewrite it to use the
new STORE_VOID_IN_LISP() rather than having to have a single
static opaque structure holding all the bindings (and not handling
reentrancy). Fix raw `char' to be `CIbyte' in the declaration of
`alternate_do_string'.
* signal.c (check_what_happened):
Fix bug: Don't try to check for QUIT when
inhibit_non_essential_printing_operations or we may screw things
up if QUIT happens during debug printing.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 07:00:24 -0600 |
parents | 44d7bde26046 |
children | 838630c0734f |
comparison
equal
deleted
inserted
replaced
5013:ae48681c47fa | 5014:c2e0c3af5fe3 |
---|---|
668 /* Nonzero means we're going down, so we better not run any hooks | 668 /* Nonzero means we're going down, so we better not run any hooks |
669 or do other non-essential stuff. */ | 669 or do other non-essential stuff. */ |
670 int preparing_for_armageddon; | 670 int preparing_for_armageddon; |
671 | 671 |
672 /* Nonzero means we're in an unstable situation and need to skip | 672 /* Nonzero means we're in an unstable situation and need to skip |
673 i18n conversions and such. During printing we check for this, | 673 internal->external conversions, QUIT checking and such. This gets set |
674 and during conversion we abort if we see this. */ | 674 during early startup, during shutdown, and when debug printing |
675 (i.e. called from a debugger such as gdb to print Lisp objects or | |
676 backtraces). During printing we check for this, and during conversion | |
677 we abort if we see this. */ | |
675 int inhibit_non_essential_conversion_operations; | 678 int inhibit_non_essential_conversion_operations; |
676 | 679 |
677 static JMP_BUF run_temacs_catch; | 680 static JMP_BUF run_temacs_catch; |
678 | 681 |
679 static int run_temacs_argc; | 682 static int run_temacs_argc; |
3965 return; | 3968 return; |
3966 | 3969 |
3967 /* We are extremely paranoid so we sensibly deal with recursive | 3970 /* We are extremely paranoid so we sensibly deal with recursive |
3968 assertion failures. */ | 3971 assertion failures. */ |
3969 in_assert_failed++; | 3972 in_assert_failed++; |
3970 inhibit_non_essential_conversion_operations = 1; | 3973 inhibit_non_essential_conversion_operations++; |
3971 | 3974 |
3972 if (in_assert_failed >= 4) | 3975 if (in_assert_failed >= 4) |
3973 _exit (-1); | 3976 _exit (-1); |
3974 else if (in_assert_failed == 3) | 3977 else if (in_assert_failed == 3) |
3975 { | 3978 { |
4033 0); */ | 4036 0); */ |
4034 #else | 4037 #else |
4035 really_abort (); | 4038 really_abort (); |
4036 #endif /* defined (_MSC_VER) || defined (CYGWIN) */ | 4039 #endif /* defined (_MSC_VER) || defined (CYGWIN) */ |
4037 #endif /* !defined (ASSERTIONS_DONT_ABORT) */ | 4040 #endif /* !defined (ASSERTIONS_DONT_ABORT) */ |
4038 inhibit_non_essential_conversion_operations = 0; | 4041 inhibit_non_essential_conversion_operations--; |
4039 in_assert_failed = 0; | 4042 in_assert_failed--; |
4040 } | 4043 } |
4041 | 4044 |
4042 /* -------------------------------------- */ | 4045 /* -------------------------------------- */ |
4043 /* low-memory notification */ | 4046 /* low-memory notification */ |
4044 /* -------------------------------------- */ | 4047 /* -------------------------------------- */ |