mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-23 07:19:15 +00: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.
137 lines
3.5 KiB
C
137 lines
3.5 KiB
C
/* Prefer faster, non-thread-safe stdio functions if available.
|
|
|
|
Copyright (C) 2001-2004, 2009-2017 Free Software Foundation, Inc.
|
|
|
|
This program 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.
|
|
|
|
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/* Written by Jim Meyering. */
|
|
|
|
#ifndef UNLOCKED_IO_H
|
|
# define UNLOCKED_IO_H 1
|
|
|
|
/* These are wrappers for functions/macros from the GNU C library, and
|
|
from other C libraries supporting POSIX's optional thread-safe functions.
|
|
|
|
The standard I/O functions are thread-safe. These *_unlocked ones are
|
|
more efficient but not thread-safe. That they're not thread-safe is
|
|
fine since all of the applications in this package are single threaded.
|
|
|
|
Also, some code that is shared with the GNU C library may invoke
|
|
the *_unlocked functions directly. On hosts that lack those
|
|
functions, invoke the non-thread-safe versions instead. */
|
|
|
|
# include <stdio.h>
|
|
|
|
# if HAVE_DECL_CLEARERR_UNLOCKED
|
|
# undef clearerr
|
|
# define clearerr(x) clearerr_unlocked (x)
|
|
# else
|
|
# define clearerr_unlocked(x) clearerr (x)
|
|
# endif
|
|
|
|
# if HAVE_DECL_FEOF_UNLOCKED
|
|
# undef feof
|
|
# define feof(x) feof_unlocked (x)
|
|
# else
|
|
# define feof_unlocked(x) feof (x)
|
|
# endif
|
|
|
|
# if HAVE_DECL_FERROR_UNLOCKED
|
|
# undef ferror
|
|
# define ferror(x) ferror_unlocked (x)
|
|
# else
|
|
# define ferror_unlocked(x) ferror (x)
|
|
# endif
|
|
|
|
# if HAVE_DECL_FFLUSH_UNLOCKED
|
|
# undef fflush
|
|
# define fflush(x) fflush_unlocked (x)
|
|
# else
|
|
# define fflush_unlocked(x) fflush (x)
|
|
# endif
|
|
|
|
# if HAVE_DECL_FGETS_UNLOCKED
|
|
# undef fgets
|
|
# define fgets(x,y,z) fgets_unlocked (x,y,z)
|
|
# else
|
|
# define fgets_unlocked(x,y,z) fgets (x,y,z)
|
|
# endif
|
|
|
|
# if HAVE_DECL_FPUTC_UNLOCKED
|
|
# undef fputc
|
|
# define fputc(x,y) fputc_unlocked (x,y)
|
|
# else
|
|
# define fputc_unlocked(x,y) fputc (x,y)
|
|
# endif
|
|
|
|
# if HAVE_DECL_FPUTS_UNLOCKED
|
|
# undef fputs
|
|
# define fputs(x,y) fputs_unlocked (x,y)
|
|
# else
|
|
# define fputs_unlocked(x,y) fputs (x,y)
|
|
# endif
|
|
|
|
# if HAVE_DECL_FREAD_UNLOCKED
|
|
# undef fread
|
|
# define fread(w,x,y,z) fread_unlocked (w,x,y,z)
|
|
# else
|
|
# define fread_unlocked(w,x,y,z) fread (w,x,y,z)
|
|
# endif
|
|
|
|
# if HAVE_DECL_FWRITE_UNLOCKED
|
|
# undef fwrite
|
|
# define fwrite(w,x,y,z) fwrite_unlocked (w,x,y,z)
|
|
# else
|
|
# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z)
|
|
# endif
|
|
|
|
# if HAVE_DECL_GETC_UNLOCKED
|
|
# undef getc
|
|
# define getc(x) getc_unlocked (x)
|
|
# else
|
|
# define getc_unlocked(x) getc (x)
|
|
# endif
|
|
|
|
# if HAVE_DECL_GETCHAR_UNLOCKED
|
|
# undef getchar
|
|
# define getchar() getchar_unlocked ()
|
|
# else
|
|
# define getchar_unlocked() getchar ()
|
|
# endif
|
|
|
|
# if HAVE_DECL_PUTC_UNLOCKED
|
|
# undef putc
|
|
# define putc(x,y) putc_unlocked (x,y)
|
|
# else
|
|
# define putc_unlocked(x,y) putc (x,y)
|
|
# endif
|
|
|
|
# if HAVE_DECL_PUTCHAR_UNLOCKED
|
|
# undef putchar
|
|
# define putchar(x) putchar_unlocked (x)
|
|
# else
|
|
# define putchar_unlocked(x) putchar (x)
|
|
# endif
|
|
|
|
# undef flockfile
|
|
# define flockfile(x) ((void) 0)
|
|
|
|
# undef ftrylockfile
|
|
# define ftrylockfile(x) 0
|
|
|
|
# undef funlockfile
|
|
# define funlockfile(x) ((void) 0)
|
|
|
|
#endif /* UNLOCKED_IO_H */
|