changeset: 7176:e0a103845344
user: David Wilson <d...@botanicus.net>
date: Wed Nov 08 13:40:34 2017 -0800
link: http://dev.mutt.org/hg/mutt/rev/e0a103845344
Use fgets_unlocked and fgetc_unlocked if available.
Since mutt does not use threads, there is no reason it should use the
locked variants of the FILE* IO functions. This checks if the unlocked
functions are available, and if so enables them globally via mutt.h.
Cuts load time for a 56k message, 1.8GB /var/mail mailbox from 14
seconds to ~6 seconds, since we avoid acquiring and releasing a mutex
for every character of input read.
Before: 0m14.376s
74.98% mutt libc-2.18.so [.] _IO_getc
11.87% mutt mutt [.] mbox_parse_mailbox
0.94% mutt [kernel.kallsyms] [k] copy_user_generic_string
0.83% mutt libc-2.18.so [.] __strchr_sse2
0.53% mutt libc-2.18.so [.] __memcpy_sse2
0.44% mutt libc-2.18.so [.] _int_malloc
After: 6 seconds
68.92% mutt mutt [.] mbox_parse_mailbox
2.25% mutt [kernel.kallsyms] [k] copy_user_generic_string
1.73% mutt libc-2.18.so [.] __strchr_sse2
1.24% mutt libc-2.18.so [.] __memcpy_sse2
1.17% mutt libc-2.18.so [.] _int_malloc
0.87% mutt libc-2.18.so [.] __strspn_sse42
diffs (29 lines):
diff -r 2999c3089999 -r e0a103845344 configure.ac
--- a/configure.ac Wed Nov 08 12:57:50 2017 -0800
+++ b/configure.ac Wed Nov 08 13:40:34 2017 -0800
@@ -333,6 +333,7 @@
AC_CHECK_HEADERS(unix.h)
AC_CHECK_FUNCS(setrlimit getsid)
+AC_CHECK_FUNCS(fgets_unlocked fgetc_unlocked)
AC_MSG_CHECKING(for sig_atomic_t in signal.h)
AC_EGREP_HEADER(sig_atomic_t,signal.h,
diff -r 2999c3089999 -r e0a103845344 mutt.h
--- a/mutt.h Wed Nov 08 12:57:50 2017 -0800
+++ b/mutt.h Wed Nov 08 13:40:34 2017 -0800
@@ -71,6 +71,14 @@
# define MB_LEN_MAX 16
#endif
+#ifdef HAVE_FGETS_UNLOCKED
+# define fgets fgets_unlocked
+#endif
+
+#ifdef HAVE_FGETC_UNLOCKED
+# define fgetc fgetc_unlocked
+#endif
+
/* nifty trick I stole from ELM 2.5alpha. */
#ifdef MAIN_C
#define WHERE
