aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.c
diff options
context:
space:
mode:
authorPaul Eggert2019-07-08 17:50:39 -0700
committerPaul Eggert2019-07-08 17:50:39 -0700
commitf8ab90839fe64b2ec8b398a50e8fb4f33e8e95e1 (patch)
treec3909d7ae6d78c78cc9e293c20cd764f49931bc2 /src/xselect.c
parent7b70efb740a04517e2764b0986c6e92305c1dd3e (diff)
downloademacs-f8ab90839fe64b2ec8b398a50e8fb4f33e8e95e1.tar.gz
emacs-f8ab90839fe64b2ec8b398a50e8fb4f33e8e95e1.zip
Use fewer locks when accessing stdio
* src/alloc.c, src/bidi.c, src/emacs-module.c, src/pdumper.c: * src/regex-emacs.c, src/unexhp9k800.c, src/unexmacosx.c: * src/widget.c, src/xdisp.c, src/xselect.c, src/xterm.c: Include sysstdio.h instead of stdio.h, to avoid locking stdio streams in many cases. * src/alloc.c (test_setjmp): * src/bidi.c (bidi_dump_cached_states): * src/cm.c (calccost): * src/dispnew.c (init_display_interactive): * src/emacs.c (main): * src/image.c (convert_mono_to_color_image): * src/minibuf.c (read_minibuf_noninteractive): * src/nsfont.m (ns_descriptor_to_entity) (ns_dump_glyphstring): * src/nsterm.h (NSTRACE_MSG_NO_DASHES): * src/nsterm.m (ns_mouse_position) (sendEvent:, keyDown:, performDragOperation:): * src/pdumper.c (dump_fingerprint, print_paths_to_root_1): * src/print.c (debug_print): * src/regex-emacs.c (debug_putchar, print_fastmap) (print_partial_compiled_pattern, print_compiled_pattern) (print_double_string, regex_compile): * src/term.c (vfatal): * src/unexhp9k800.c (read_header): * src/unexmacosx.c (unexec_error): * src/widget.c (EmacsFrameInitialize): * src/xdisp.c (message_to_stderr, vmessage, dump_glyph_row) (Fdump_glyph_matrix, Fdump_frame_glyph_matrix, dump_glyph_string): * src/xfaces.c (Fdump_colors, Fdump_face): * src/xselect.c (x_clipboard_manager_error_2): * src/xterm.c (x_initialize): * src/xwidget.c (WEBKIT_FN_INIT): Prefer unlocked calls like fputs to locked calls like fprintf. * src/charset.c (read_hex): * src/cm.c (cmputc, cmcheckmagic): * src/dispnew.c (update_frame, update_frame_with_menu) (update_frame_1, Fsend_string_to_terminal, Fding) (bitch_at_user): * src/emacs.c (main, Fdump_emacs): * src/emacs-module.c (module_abort): * src/fileio.c (Fdo_auto_save): * src/image.c (slurp_file) (png_read_from_file, png_load_body, our_stdio_fill_input_buffer): * src/keyboard.c (record_char, kbd_buffer_get_event) (handle_interrupt): * src/lread.c (readbyte_from_stdio, read1): * src/minibuf.c (read_minibuf_noninteractive): * src/print.c (printchar_to_stream, strout) (Fredirect_debugging_output): * src/sysdep.c (reset_sys_modes, close_output_streams) (procfs_ttyname, procfs_get_total_memory): * src/term.c (tty_ring_bell, tty_send_additional_strings) (tty_set_terminal_modes, tty_reset_terminal_modes) (tty_update_end, tty_clear_end_of_line, tty_write_glyphs) (tty_write_glyphs_with_face, tty_insert_glyphs) (tty_menu_activate): * src/xfaces.c (Fx_load_color_file): Simplify by using ordinary calls like putc to explicitly-unlocked calls like putc_unlocked, since the ordinary calls are now unlocked anyway. * src/emacs.c (main, Fdump_emacs): * src/pdumper.c (Fdump_emacs_portable): Coalesce adjacent printfs. * src/nsterm.h: Include sysstdio.h as this file’s macros rely on it. * src/regex-emacs.c (print_compiled_pattern): Omit redundant fflush. * src/sysstdio.h: Include unlocked-io.h. (clearerr_unlocked, feof_unlocked, ferror_unlocked) (fflush_unlocked, fgets_unlocked, fputc_unlocked) (fputs_unlocked, fread_unlocked, fwrite_unlocked) (getc_unlocked, getchar_unlocked, putc_unlocked) (putchar_unlocked): Remove these macros; now done by unlocked-io.h. * src/xwidget.c: Include sysstdio.h.
Diffstat (limited to 'src/xselect.c')
-rw-r--r--src/xselect.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/xselect.c b/src/xselect.c
index ed68e4b1a6d..d74f064a1c7 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -21,7 +21,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
21 21
22#include <config.h> 22#include <config.h>
23#include <limits.h> 23#include <limits.h>
24#include <stdio.h> /* TRACE_SELECTION needs this. */
25 24
26#ifdef HAVE_SYS_TYPES_H 25#ifdef HAVE_SYS_TYPES_H
27#include <sys/types.h> 26#include <sys/types.h>
@@ -33,6 +32,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
33#include "xterm.h" /* for all of the X includes */ 32#include "xterm.h" /* for all of the X includes */
34#include "frame.h" /* Need this to get the X window of selected_frame */ 33#include "frame.h" /* Need this to get the X window of selected_frame */
35#include "blockinput.h" 34#include "blockinput.h"
35#include "sysstdio.h" /* TRACE_SELECTION needs this. */
36#include "termhooks.h" 36#include "termhooks.h"
37#include "keyboard.h" 37#include "keyboard.h"
38#include "pdumper.h" 38#include "pdumper.h"
@@ -2172,9 +2172,10 @@ If the problem persists, set `%s' to nil.");
2172static Lisp_Object 2172static Lisp_Object
2173x_clipboard_manager_error_2 (Lisp_Object err) 2173x_clipboard_manager_error_2 (Lisp_Object err)
2174{ 2174{
2175 fprintf (stderr, "Error saving to X clipboard manager.\n\ 2175 fputs (("Error saving to X clipboard manager.\n"
2176If the problem persists, set '%s' \ 2176 "If the problem persists,"
2177to nil.\n", "x-select-enable-clipboard-manager"); 2177 " set 'x-select-enable-clipboard-manager' to nil.\n"),
2178 stderr);
2178 return Qnil; 2179 return Qnil;
2179} 2180}
2180 2181