mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-12 06:21:02 -08:00
f6ef15cf84
This can improve performance significantly on stdio-bottlenecked code. E.g., make-docfile is 3x faster on my Fedora 25 x86-64 desktop. * admin/merge-gnulib (GNULIB_MODULES): Add unlocked-io. * lib-src/ebrowse.c, lib-src/emacsclient.c, lib-src/etags.c: * lib-src/hexl.c, lib-src/make-docfile.c, lib-src/movemail.c: * lib-src/profile.c, lib-src/update-game-score.c: Include unlocked-io.h instead of stdio.h, since these programs are single-threaded. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lib/unlocked-io.h, m4/unlocked-io.m4: New files, copied from Gnulib. * src/charset.c, src/cm.c, src/emacs.c, src/image.c, src/keyboard.c: * src/lread.c, src/term.c: Include sysstdio.h, possibly instead of stdio.h, to define the unlocked functions if the system does not provide them. * src/charset.c, src/lread.c (getc_unlocked): Remove, since sysstdio.h now defines it if needed. * 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/fileio.c (Fdo_auto_save, Fset_binary_mode): * 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_file): * src/minibuf.c (read_minibuf_noninteractive): * src/print.c (printchar_to_stream, strout) (Fredirect_debugging_output): * src/sysdep.c (reset_sys_modes, 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): Use unlocked stdio when it should be safe. * src/sysstdio.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_unloced): Provide substitutes if not declared.
77 lines
2.1 KiB
C
77 lines
2.1 KiB
C
/* Standard I/O for Emacs.
|
|
|
|
Copyright 2013-2017 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef EMACS_SYSSTDIO_H
|
|
#define EMACS_SYSSTDIO_H
|
|
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
|
|
extern FILE *emacs_fopen (char const *, char const *);
|
|
|
|
#if O_BINARY
|
|
# define FOPEN_BINARY "b"
|
|
# define FOPEN_TEXT "t"
|
|
#else
|
|
# define FOPEN_BINARY ""
|
|
# define FOPEN_TEXT ""
|
|
#endif
|
|
|
|
/* These are compatible with unlocked-io.h, if both files are included. */
|
|
#if !HAVE_DECL_CLEARERR_UNLOCKED
|
|
# define clearerr_unlocked(x) clearerr (x)
|
|
#endif
|
|
#if !HAVE_DECL_FEOF_UNLOCKED
|
|
# define feof_unlocked(x) feof (x)
|
|
#endif
|
|
#if !HAVE_DECL_FERROR_UNLOCKED
|
|
# define ferror_unlocked(x) ferror (x)
|
|
#endif
|
|
#if !HAVE_DECL_FFLUSH_UNLOCKED
|
|
# define fflush_unlocked(x) fflush (x)
|
|
#endif
|
|
#if !HAVE_DECL_FGETS_UNLOCKED
|
|
# define fgets_unlocked(x,y,z) fgets (x,y,z)
|
|
#endif
|
|
#if !HAVE_DECL_FPUTC_UNLOCKED
|
|
# define fputc_unlocked(x,y) fputc (x,y)
|
|
#endif
|
|
#if !HAVE_DECL_FPUTS_UNLOCKED
|
|
# define fputs_unlocked(x,y) fputs (x,y)
|
|
#endif
|
|
#if !HAVE_DECL_FREAD_UNLOCKED
|
|
# define fread_unlocked(w,x,y,z) fread (w,x,y,z)
|
|
#endif
|
|
#if !HAVE_DECL_FWRITE_UNLOCKED
|
|
# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z)
|
|
#endif
|
|
#if !HAVE_DECL_GETC_UNLOCKED
|
|
# define getc_unlocked(x) getc (x)
|
|
#endif
|
|
#if !HAVE_DECL_GETCHAR_UNLOCKED
|
|
# define getchar_unlocked() getchar ()
|
|
#endif
|
|
#if !HAVE_DECL_PUTC_UNLOCKED
|
|
# define putc_unlocked(x,y) putc (x,y)
|
|
#endif
|
|
#if !HAVE_DECL_PUTCHAR_UNLOCKED
|
|
# define putchar_unlocked(x) putchar (x)
|
|
#endif
|
|
|
|
#endif /* EMACS_SYSSTDIO_H */
|