Put interrupt input blocking in a separate file from xterm.h.
This isn't specific to X, and it allows us to avoid #including
xterm.h in files that don't really have anything to do with X.
* blockinput.h: New file.
* xterm.h (BLOCK_INPUT, UNBLOCK_INPUT, TOTALLY_UNBLOCK_INPUT,
UNBLOCK_INPUT_RESIGNAL): These are now in blockinput.h.
(x_input_blocked, x_pending_input): Deleted; there are analogs
in blockinput.h called interrupt_input_blocked and
interrupt_input_pending.
* keyboard.c (interrupt_input_blocked, interrupt_input_pending):
New variables, used by the macros in blockinput.h.
* xterm.c: #include blockinput.h.
(x_input_blocked, x_pending_input): Deleted.
(XTread_socket): Test and set interrupt_input_blocked and
interrupt_input_pending instead of the old variables.
* alloc.c, xfaces.c, xfns.c, xmenu.c, xselect.c, keymap.c:
#include blockinput.h.
* eval.c: #include blockinput.h instead of xterm.h.
* keyboard.c: #include blockinput.h.
(input_poll_signal): Just test
interrupt_input_blocked, instead of testing HAVE_X_WINDOWS and
x_input_blocked.
Block the processing of interrupt input while we're manipulating the
malloc heap.
* alloc.c: (xfree): New function, to make it easy to free things
safely.
(xmalloc, xrealloc): Block X input while doing the deed.
(VALIDATE_LISP_STORAGE, gc_sweep, compact_strings): Use xfree
instead of free.
(uninterrupt_malloc): New function, to install input-blocking
hooks into the GNU malloc routines.
* emacs.c [not SYSTEM_MALLOC] (main): Call uninterrupt_malloc
on startup.
* alloc.c: (make_interval, make_float, Fcons, Fmake_vector,
Fmake_symbol, Fmake_marker, make_uninit_string, Fgarbage_collect):
Use xmalloc instead of malloc; don't bother to check if out of
memory here.
(Fgarbage_collect): Call xrealloc instead of realloc.
* buffer.c: Use xmalloc and xfree instead of malloc and free;
don't bother to check if out of memory here.
(Fget_buffer_create): Put BLOCK_INPUT/UNBLOCK_INPUT pair around
calls to ralloc routines.
* insdel.c: Same.
* lisp.h (xfree): New extern declaration.
* xfaces.c (xfree): Don't #define this to be free; use the
definition in alloc.c.
* dispnew.c, doc.c, doprnt.c, fileio.c, lread.c, term.c, xfns.c,
xmenu.c, xterm.c: Use xfree instead of free.
* hftctl.c: Use xfree and xmalloc instead of free and malloc.
* keymap.c (current_minor_maps): BLOCK_INPUT while calling realloc
and malloc.
* search.c: Since the regexp routines can malloc, BLOCK_INPUT
while runing them. #include blockinput.h.
* sysdep.c: #include blockinput.h. Call xfree and xmalloc instead
of free and malloc. BLOCK_INPUT around routines which we know
will call malloc.
ymakefile (keyboard.o, keymap.o, search.o, sysdep.o, xfaces.o,
xfns.o, xmenu.o, xterm.o, xselect.o, alloc.o, eval.o): Note that
these depend on blockinput.h.
1993-03-31 10:55:33 +00:00
|
|
|
/* blockinput.h - interface to blocking complicated interrupt-driven input.
|
1993-03-31 08:13:16 +00:00
|
|
|
Copyright (C) 1989, 1993 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with GNU Emacs; see the file COPYING. If not, write to
|
1996-01-15 09:18:04 +00:00
|
|
|
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
1993-03-31 08:13:16 +00:00
|
|
|
|
2000-06-25 16:02:04 +00:00
|
|
|
#ifndef EMACS_BLOCKINPUT_H
|
|
|
|
#define EMACS_BLOCKINPUT_H
|
|
|
|
|
|
|
|
#include "atimer.h"
|
1993-03-31 08:13:16 +00:00
|
|
|
|
|
|
|
/* When Emacs is using signal-driven input, the processing of those
|
|
|
|
input signals can get pretty hairy. For example, when Emacs is
|
|
|
|
running under X windows, handling an input signal can entail
|
|
|
|
retrieving events from the X event queue, or making other X calls.
|
|
|
|
|
|
|
|
If an input signal occurs while Emacs is in the midst of some
|
|
|
|
non-reentrant code, and the signal processing invokes that same
|
|
|
|
code, we lose. For example, malloc and the Xlib functions aren't
|
|
|
|
usually re-entrant, and both are used by the X input signal handler
|
|
|
|
- if we try to process an input signal in the midst of executing
|
|
|
|
any of these functions, we'll lose.
|
|
|
|
|
|
|
|
To avoid this, we make the following requirements:
|
|
|
|
|
|
|
|
* Everyone must evaluate BLOCK_INPUT before entering these functions,
|
|
|
|
and then call UNBLOCK_INPUT after performing them. Calls
|
|
|
|
BLOCK_INPUT and UNBLOCK_INPUT may be nested.
|
|
|
|
|
|
|
|
* Any complicated interrupt handling code should test
|
|
|
|
interrupt_input_blocked, and put off its work until later.
|
|
|
|
|
|
|
|
* If the interrupt handling code wishes, it may set
|
|
|
|
interrupt_input_pending to a non-zero value. If that flag is set
|
|
|
|
when input becomes unblocked, UNBLOCK_INPUT will send a new SIGIO. */
|
|
|
|
|
1993-04-07 22:09:23 +00:00
|
|
|
extern int interrupt_input_blocked;
|
1993-03-31 08:13:16 +00:00
|
|
|
|
|
|
|
/* Nonzero means an input interrupt has arrived
|
|
|
|
during the current critical section. */
|
|
|
|
extern int interrupt_input_pending;
|
|
|
|
|
2000-01-25 15:53:45 +00:00
|
|
|
|
|
|
|
/* Non-zero means asynchronous timers should be run when input is
|
|
|
|
unblocked. */
|
|
|
|
|
|
|
|
extern int pending_atimers;
|
|
|
|
|
1993-03-31 08:13:16 +00:00
|
|
|
/* Begin critical section. */
|
|
|
|
#define BLOCK_INPUT (interrupt_input_blocked++)
|
|
|
|
|
1993-05-10 00:14:09 +00:00
|
|
|
/* End critical section.
|
|
|
|
|
|
|
|
If doing signal-driven input, and a signal came in when input was
|
|
|
|
blocked, reinvoke the signal handler now to deal with it.
|
|
|
|
|
|
|
|
We used to have two possible definitions of this macro - one for
|
|
|
|
when SIGIO was #defined, and one for when it wasn't; when SIGIO
|
|
|
|
wasn't #defined, we wouldn't bother to check if we should re-invoke
|
|
|
|
the signal handler. But that doesn't work very well; some of the
|
|
|
|
files which use this macro don't #include the right files to get
|
|
|
|
SIGIO.
|
|
|
|
|
|
|
|
So, we always test interrupt_input_pending now; that's not too
|
|
|
|
expensive, and it'll never get set if we don't need to resignal. */
|
2000-01-25 15:53:45 +00:00
|
|
|
|
|
|
|
#define UNBLOCK_INPUT \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
--interrupt_input_blocked; \
|
|
|
|
if (interrupt_input_blocked == 0) \
|
|
|
|
{ \
|
|
|
|
if (interrupt_input_pending) \
|
|
|
|
reinvoke_input_signal (); \
|
|
|
|
if (pending_atimers) \
|
|
|
|
do_pending_atimers (); \
|
|
|
|
} \
|
|
|
|
else if (interrupt_input_blocked < 0) \
|
|
|
|
abort (); \
|
|
|
|
} \
|
|
|
|
while (0)
|
1993-03-31 08:13:16 +00:00
|
|
|
|
|
|
|
#define TOTALLY_UNBLOCK_INPUT (interrupt_input_blocked = 0)
|
|
|
|
#define UNBLOCK_INPUT_RESIGNAL UNBLOCK_INPUT
|
1998-04-14 12:33:47 +00:00
|
|
|
|
|
|
|
/* Defined in keyboard.c */
|
1998-04-28 02:33:19 +00:00
|
|
|
/* Don't use a prototype here; it causes trouble in some files. */
|
|
|
|
extern void reinvoke_input_signal ();
|
2000-06-25 16:02:04 +00:00
|
|
|
|
|
|
|
#endif /* EMACS_BLOCKINPUT_H */
|