diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-06-22 11:21:20 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-06-22 11:22:53 -0700 |
commit | f6ef15cf84c1288e972ef0e6165b97e34d6033b6 (patch) | |
tree | 7f3fcd101a6c1a02965ebe6fd8dbf070f8340f53 /lib-src | |
parent | 18896f79136bb7d6d4c0c6b1d066b4e82644db6a (diff) | |
download | emacs-f6ef15cf84c1288e972ef0e6165b97e34d6033b6.tar.gz |
Use unlocked stdio more systematically
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.
Diffstat (limited to 'lib-src')
-rw-r--r-- | lib-src/ebrowse.c | 8 | ||||
-rw-r--r-- | lib-src/emacsclient.c | 3 | ||||
-rw-r--r-- | lib-src/etags.c | 1 | ||||
-rw-r--r-- | lib-src/hexl.c | 2 | ||||
-rw-r--r-- | lib-src/make-docfile.c | 10 | ||||
-rw-r--r-- | lib-src/movemail.c | 4 | ||||
-rw-r--r-- | lib-src/profile.c | 2 | ||||
-rw-r--r-- | lib-src/update-game-score.c | 3 |
8 files changed, 19 insertions, 14 deletions
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 51d181997b1..e77b7c94cca 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -20,21 +20,21 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> #include <stddef.h> -#include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <assert.h> #include <getopt.h> +#include <flexmember.h> +#include <min-max.h> +#include <unlocked-io.h> + /* The SunOS compiler doesn't have SEEK_END. */ #ifndef SEEK_END #define SEEK_END 2 #endif -#include <flexmember.h> -#include <min-max.h> - /* Files are read in chunks of this number of bytes. */ enum { READ_CHUNK_SIZE = 100 * 1024 }; diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 8828b7652de..f1d4e8976da 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -73,7 +73,6 @@ char *w32_getenv (const char *); #include <stdarg.h> #include <ctype.h> -#include <stdio.h> #include <stdlib.h> #include <string.h> #include <getopt.h> @@ -84,6 +83,8 @@ char *w32_getenv (const char *); #include <signal.h> #include <errno.h> +#include <unlocked-io.h> + #ifndef VERSION #define VERSION "unspecified" #endif diff --git a/lib-src/etags.c b/lib-src/etags.c index 6f280d8ab40..e5ff7bd10fc 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -123,6 +123,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4"; #include <errno.h> #include <fcntl.h> #include <binary-io.h> +#include <unlocked-io.h> #include <c-ctype.h> #include <c-strcase.h> diff --git a/lib-src/hexl.c b/lib-src/hexl.c index 319ce8bc890..d949af08902 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c @@ -22,11 +22,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> #include <inttypes.h> -#include <stdio.h> #include <stdlib.h> #include <string.h> #include <binary-io.h> +#include <unlocked-io.h> static char *progname; diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 9470bd635f5..6b2cc110403 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -39,10 +39,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <stdarg.h> #include <stddef.h> #include <stdint.h> -#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <binary-io.h> +#include <intprops.h> +#include <min-max.h> +#include <unlocked-io.h> + #ifdef WINDOWSNT /* Defined to be sys_fopen in ms-w32.h, but only #ifdef emacs, so this is really just insurance. */ @@ -50,10 +54,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <direct.h> #endif /* WINDOWSNT */ -#include <binary-io.h> -#include <intprops.h> -#include <min-max.h> - #ifdef DOS_NT /* Defined to be sys_chdir in ms-w32.h, but only #ifdef emacs, so this is really just insurance. diff --git a/lib-src/movemail.c b/lib-src/movemail.c index cd12c48ed36..e5ca0b16611 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -59,7 +59,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <sys/types.h> #include <sys/stat.h> #include <sys/file.h> -#include <stdio.h> #include <stdlib.h> #include <errno.h> #include <time.h> @@ -69,6 +68,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <fcntl.h> #include <signal.h> #include <string.h> + +#include <unlocked-io.h> + #include "syswait.h" #ifdef MAIL_USE_POP #include "pop.h" diff --git a/lib-src/profile.c b/lib-src/profile.c index 253f00e2d80..f4ab45c1718 100644 --- a/lib-src/profile.c +++ b/lib-src/profile.c @@ -34,11 +34,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> #include <inttypes.h> -#include <stdio.h> #include <stdlib.h> #include <intprops.h> #include <systime.h> +#include <unlocked-io.h> static struct timespec TV1; static int watch_not_started = 1; /* flag */ diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index 5edc8e79569..942aeeb399d 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c @@ -39,7 +39,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <limits.h> #include <string.h> #include <stdlib.h> -#include <stdio.h> #include <time.h> #include <pwd.h> #include <ctype.h> @@ -47,6 +46,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <sys/stat.h> #include <getopt.h> +#include <unlocked-io.h> + #ifdef WINDOWSNT #include "ntlib.h" #endif |