diff options
| author | Paul Eggert | 2012-09-23 01:44:20 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-23 01:44:20 -0700 |
| commit | 4d7e6e51dd4acecff466a28d958c50f34fc130b8 (patch) | |
| tree | 5e340d48fb69f9a40a4304cc94db2006caefe51f /src/lisp.h | |
| parent | 8f4635e97e1587c4026ec83fc1bd9f8954775915 (diff) | |
| download | emacs-4d7e6e51dd4acecff466a28d958c50f34fc130b8.tar.gz emacs-4d7e6e51dd4acecff466a28d958c50f34fc130b8.zip | |
Simplify and avoid signal-handling races.
* nt/inc/ms-w32.h (emacs_raise): New macro.
* src/alloc.c (die):
* src/sysdep.c (emacs_abort) [HAVE_NTGUI]:
Avoid recursive loop if there's a fatal error in the function itself.
* src/atimer.c (pending_atimers):
* src/blockinput.h: Don't include "atimer.h"; no longer needed.
(interrupt_input_pending): Remove. All uses removed.
pending_signals now counts both atimers and ordinary interrupts.
This is less racy than having three separate pending-signal flags.
(block_input, unblock_input, totally_unblock_input, unblock_input_to)
(input_blocked_p):
Rename from their upper-case counterparts BLOCK_INPUT,
UNBLOCK_INPUT, TOTALLY_UNBLOCK_INPUT, UNBLOCK_INPUT_TO,
INPUT_BLOCKED_P, and turn into functions. All uses changed.
This makes it easier to access volatile variables more accurately.
(BLOCK_INPUT_RESIGNAL): Remove. All uses replaced by unblock_input ().
(input_blocked_p): Prefer this to 'interrupt_input_blocked', as
that's more reliable if the code is buggy and sets
interrupt_input_blocked to a negative value. All uses changed.
* src/atimer.c (deliver_alarm_signal):
Remove. No need to deliver this to the parent; any thread can
handle this signal now. All uses replaced by underlying handler.
* src/atimer.c (turn_on_atimers):
* src/dispnew.c (handle_window_change_signal):
* src/emacs.c (handle_danger_signal):
* src/keyboard.c (kbd_buffer_get_event):
Don't reestablish signal handler; not needed with sigaction.
* src/blockinput.h (UNBLOCK_INPUT_TO, TOTALLY_UNBLOCK_INPUT)
(UNBLOCK_INPUT_TO):
Rework to avoid unnecessary accesses to volatile variables.
(UNBLOCK_INPUT_TO): Now a function.
(totally_unblock_input, unblock_input): New decls.
* src/data.c (handle_arith_signal, deliver_arith_signal): Move to sysdep.c
(init_data): Remove. Necessary stuff now done in init_signal.
* src/emacs.c, src/xdisp.c: Include "atimer.h", since we invoke atimer functions.
* src/emacs.c (handle_fatal_signal, deliver_fatal_signal): Move to sysdep.c.
(fatal_error_code): Remove; no longer needed.
(terminate_due_to_signal): Rename from fatal_error_backtrace, since
it doesn't always backtrace. All uses changed. No need to reset
signal to default, since sigaction and/or die does that for us now.
Use emacs_raise (FOO), not kill (getpid (), FOO).
(main): Check more-accurately whether we're dumping.
Move fatal-error setup to sysdep.c
* src/floatfns.c: Do not include "syssignal.h"; no longer needed.
* src/gtkutil.c (xg_get_file_name, xg_get_font):
Remove no-longer-needed signal-mask manipulation.
* src/keyboard.c, src/process.c (POLL_FOR_INPUT):
Don't depend on USE_ASYNC_EVENTS, a symbol that is never defined.
* src/keyboard.c (read_avail_input): Remove.
All uses replaced by gobble_input.
(Ftop_level): Use TOTALLY_UNBLOCK_INPUT rather than open code.
(kbd_buffer_store_event_hold, gobble_input):
(record_asynch_buffer_change) [USABLE_SIGIO]:
(store_user_signal_events):
No need to mess with signal mask.
(gobble_input): If blocking input and there are terminals, simply
set pending_signals to 1 and return. All hooks changed to not
worry about whether input is blocked.
(process_pending_signals): Clear pending_signals before processing
them, in case a signal comes in while we're processing.
By convention callers now test pending_signals before calling us.
(UNBLOCK_INPUT_TO, unblock_input, totally_unblock_input):
New functions, to support changes to blockinput.h.
(handle_input_available_signal): Now extern.
(reinvoke_input_signal): Remove. All uses replaced by
handle_async_input.
(quit_count): Now volatile, since a signal handler uses it.
(handle_interrupt): Now takes bool IN_SIGNAL_HANDLER as arg. All
callers changed. Block SIGINT only if not already blocked.
Clear sigmask reliably, even if Fsignal returns, which it can.
Omit unnecessary accesses to volatile var.
(quit_throw_to_read_char): No need to restore sigmask.
* src/keyboard.c (gobble_input, handle_user_signal):
* src/process.c (wait_reading_process_output):
Call signal-handling code rather than killing ourselves.
* src/lisp.h: Include <float.h>, for...
(IEEE_FLOATING_POINT): New macro, moved here to avoid duplication.
(pending_signals): Now volatile.
(syms_of_data): Now const if IEEE floating point.
(handle_input_available_signal) [USABLE_SIGIO]:
(terminate_due_to_signal, record_child_status_change): New decls.
* src/process.c (create_process): Avoid disaster if memory is exhausted
while we're processing a vfork, by tightening the critical section
around the vfork.
(send_process_frame, process_sent_to, handle_pipe_signal)
(deliver_pipe_signal): Remove. No longer needed, as Emacs now
ignores SIGPIPE.
(send_process): No need for setjmp/longjmp any more, since the
SIGPIPE stuff is now gone. Instead, report an error if errno
is EPIPE.
(record_child_status_change): Now extern. PID and W are now args.
Return void, not bool. All callers changed.
* src/sysdep.c (wait_debugging) [(BSD_SYSTEM || HPUX) && !defined (__GNU__)]:
Remove. All uses removed. This bug should be fixed now in a
different way.
(wait_for_termination_1): Use waitpid rather than sigsuspend,
and record the child status change directly. This avoids the
need to futz with the signal mask.
(process_fatal_action): Move here from emacs.c.
(emacs_sigaction_flags): New function, containing
much of what used to be in emacs_sigaction_init.
(emacs_sigaction_init): Use it. Block nonfatal system signals that are
caught by emacs, to make races less likely.
(deliver_process_signal): Rename from handle_on_main_thread.
All uses changed.
(BACKTRACE_LIMIT_MAX): Now at top level.
(thread_backtrace_buffer, threadback_backtrace_pointers):
New static vars.
(deliver_thread_signal, deliver_fatal_thread_signal):
New functions, for more-accurate delivery of thread-specific signals.
(handle_fatal_signal, deliver_fatal_signal): Move here from emacs.c.
(deliver_arith_signal): Handle in this thread, not
in the main thread, since it's triggered by this thread.
(maybe_fatal_sig): New function.
(init_signals): New arg DUMPING so that we can be more accurate
about whether we're dumping. Caller changed.
Treat thread-specific signals differently from process-general signals.
Block all signals while handling fatal error; that's safer.
xsignal from SIGFPE only on non-IEEE hosts, treating it as fatal
on IEEE hosts.
When batch, ignore SIGHUP, SIGINT, SIGTERM if they were already ignored.
Ignore SIGPIPE unless batch.
(emacs_backtrace): Output backtrace for the appropriate thread,
which is not necessarily the main thread.
* src/syssignal.h: Include <stdbool.h>.
(emacs_raise): New macro.
* src/xterm.c (x_connection_signal): Remove; no longer needed
now that we use sigaction.
(x_connection_closed): No need to mess with sigmask now.
(x_initialize): No need to reset SIGPIPE handler here, since
init_signals does this for us now.
Fixes: debbugs:12471
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/lisp.h b/src/lisp.h index 3a473a60b48..7a23ba6165f 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -25,6 +25,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 25 | #include <stdarg.h> | 25 | #include <stdarg.h> |
| 26 | #include <stdbool.h> | 26 | #include <stdbool.h> |
| 27 | #include <stddef.h> | 27 | #include <stddef.h> |
| 28 | #include <float.h> | ||
| 28 | #include <inttypes.h> | 29 | #include <inttypes.h> |
| 29 | #include <limits.h> | 30 | #include <limits.h> |
| 30 | 31 | ||
| @@ -1487,6 +1488,16 @@ struct Lisp_Float | |||
| 1487 | #define XFLOAT_DATA(f) (0 ? XFLOAT (f)->u.data : XFLOAT (f)->u.data) | 1488 | #define XFLOAT_DATA(f) (0 ? XFLOAT (f)->u.data : XFLOAT (f)->u.data) |
| 1488 | #define XFLOAT_INIT(f, n) (XFLOAT (f)->u.data = (n)) | 1489 | #define XFLOAT_INIT(f, n) (XFLOAT (f)->u.data = (n)) |
| 1489 | 1490 | ||
| 1491 | /* Most hosts nowadays use IEEE floating point, so they use IEC 60559 | ||
| 1492 | representations, have infinities and NaNs, and do not trap on | ||
| 1493 | exceptions. Define IEEE_FLOATING_POINT if this host is one of the | ||
| 1494 | typical ones. The C11 macro __STDC_IEC_559__ is close to what is | ||
| 1495 | wanted here, but is not quite right because Emacs does not require | ||
| 1496 | all the features of C11 Annex F (and does not require C11 at all, | ||
| 1497 | for that matter). */ | ||
| 1498 | #define IEEE_FLOATING_POINT (FLT_RADIX == 2 && FLT_MANT_DIG == 24 \ | ||
| 1499 | && FLT_MIN_EXP == -125 && FLT_MAX_EXP == 128) | ||
| 1500 | |||
| 1490 | /* A character, declared with the following typedef, is a member | 1501 | /* A character, declared with the following typedef, is a member |
| 1491 | of some character set associated with the current buffer. */ | 1502 | of some character set associated with the current buffer. */ |
| 1492 | #ifndef _UCHAR_T /* Protect against something in ctab.h on AIX. */ | 1503 | #ifndef _UCHAR_T /* Protect against something in ctab.h on AIX. */ |
| @@ -2108,7 +2119,7 @@ extern char *stack_bottom; | |||
| 2108 | a request to exit Emacs when it is safe to do. */ | 2119 | a request to exit Emacs when it is safe to do. */ |
| 2109 | 2120 | ||
| 2110 | extern void process_pending_signals (void); | 2121 | extern void process_pending_signals (void); |
| 2111 | extern int pending_signals; | 2122 | extern int volatile pending_signals; |
| 2112 | 2123 | ||
| 2113 | extern void process_quit_flag (void); | 2124 | extern void process_quit_flag (void); |
| 2114 | #define QUIT \ | 2125 | #define QUIT \ |
| @@ -2633,7 +2644,6 @@ extern _Noreturn Lisp_Object wrong_type_argument (Lisp_Object, Lisp_Object); | |||
| 2633 | extern Lisp_Object do_symval_forwarding (union Lisp_Fwd *); | 2644 | extern Lisp_Object do_symval_forwarding (union Lisp_Fwd *); |
| 2634 | extern void set_internal (Lisp_Object, Lisp_Object, Lisp_Object, bool); | 2645 | extern void set_internal (Lisp_Object, Lisp_Object, Lisp_Object, bool); |
| 2635 | extern void syms_of_data (void); | 2646 | extern void syms_of_data (void); |
| 2636 | extern void init_data (void); | ||
| 2637 | extern void swap_in_global_binding (struct Lisp_Symbol *); | 2647 | extern void swap_in_global_binding (struct Lisp_Symbol *); |
| 2638 | 2648 | ||
| 2639 | /* Defined in cmds.c */ | 2649 | /* Defined in cmds.c */ |
| @@ -3227,6 +3237,9 @@ extern int input_pending; | |||
| 3227 | extern Lisp_Object menu_bar_items (Lisp_Object); | 3237 | extern Lisp_Object menu_bar_items (Lisp_Object); |
| 3228 | extern Lisp_Object tool_bar_items (Lisp_Object, int *); | 3238 | extern Lisp_Object tool_bar_items (Lisp_Object, int *); |
| 3229 | extern void discard_mouse_events (void); | 3239 | extern void discard_mouse_events (void); |
| 3240 | #ifdef USABLE_SIGIO | ||
| 3241 | void handle_input_available_signal (int); | ||
| 3242 | #endif | ||
| 3230 | extern Lisp_Object pending_funcalls; | 3243 | extern Lisp_Object pending_funcalls; |
| 3231 | extern int detect_input_pending (void); | 3244 | extern int detect_input_pending (void); |
| 3232 | extern int detect_input_pending_ignore_squeezables (void); | 3245 | extern int detect_input_pending_ignore_squeezables (void); |
| @@ -3269,7 +3282,7 @@ extern bool display_arg; | |||
| 3269 | extern Lisp_Object decode_env_path (const char *, const char *); | 3282 | extern Lisp_Object decode_env_path (const char *, const char *); |
| 3270 | extern Lisp_Object empty_unibyte_string, empty_multibyte_string; | 3283 | extern Lisp_Object empty_unibyte_string, empty_multibyte_string; |
| 3271 | extern Lisp_Object Qfile_name_handler_alist; | 3284 | extern Lisp_Object Qfile_name_handler_alist; |
| 3272 | extern _Noreturn void fatal_error_backtrace (int, int); | 3285 | extern _Noreturn void terminate_due_to_signal (int, int); |
| 3273 | extern Lisp_Object Qkill_emacs; | 3286 | extern Lisp_Object Qkill_emacs; |
| 3274 | #if HAVE_SETLOCALE | 3287 | #if HAVE_SETLOCALE |
| 3275 | void fixup_locale (void); | 3288 | void fixup_locale (void); |
| @@ -3320,6 +3333,7 @@ extern int wait_reading_process_output (intmax_t, int, int, int, | |||
| 3320 | #endif | 3333 | #endif |
| 3321 | extern void add_keyboard_wait_descriptor (int); | 3334 | extern void add_keyboard_wait_descriptor (int); |
| 3322 | extern void delete_keyboard_wait_descriptor (int); | 3335 | extern void delete_keyboard_wait_descriptor (int); |
| 3336 | extern void record_child_status_change (pid_t, int); | ||
| 3323 | #ifdef HAVE_GPM | 3337 | #ifdef HAVE_GPM |
| 3324 | extern void add_gpm_wait_descriptor (int); | 3338 | extern void add_gpm_wait_descriptor (int); |
| 3325 | extern void delete_gpm_wait_descriptor (int); | 3339 | extern void delete_gpm_wait_descriptor (int); |