summary refs log tree commit diff
path: root/libio/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-02 01:29:37 +0000
committerRoland McGrath <roland@gnu.org>2002-08-02 01:29:37 +0000
commitacbee5f637fe1f2acda89cf2dbddf0d327005dd2 (patch)
tree1c4021979dcc5f419ad94871bdf4f2be23807dba /libio/Makefile
parente42637b67781ed47a1581c6062421de514560cb3 (diff)
downloadglibc-acbee5f637fe1f2acda89cf2dbddf0d327005dd2.tar.gz
glibc-acbee5f637fe1f2acda89cf2dbddf0d327005dd2.tar.xz
glibc-acbee5f637fe1f2acda89cf2dbddf0d327005dd2.zip
* libio/fileops.c (_IO_file_sync_mmap): New function.
	(_IO_file_jumps_mmap): Use it.
	(_IO_file_underflow_mmap): Rewritten.  If after EOF or fflush,
	repeat the stat check and resize the mapped buffer as necessary.

2002-07-31  Roland McGrath  <roland@frob.com>

	* libio/fileops.c (decide_maybe_mmap): New static function.
	Code taken from libio/iofopen.c:__fopen_maybe_mmap to try to
	mmap the file contents.  Then switch the jump tables to the mmap
	tables if it worked, or the vanilla file tables if not.
	(_IO_file_underflow_maybe_mmap): New function.
	(_IO_file_seekoff_maybe_mmap): New function.
	(_IO_file_xsgetn_maybe_mmap): New function.
	(_IO_file_jumps_maybe_mmap): New variable, jump table using those.
	* libio/libioP.h: Declare those.
	* libio/wfileops.c (_IO_wfile_underflow_maybe_mmap): New function.
	(_IO_wfile_jumps_maybe_mmap): New variable, jump table using that.
	* libio/iofopen.c (__fopen_maybe_mmap): Don't try to mmap here.
	If the stream is read-only, set its jump tables to those new ones.
	* libio/iofdopen.c (_IO_new_fdopen) [_G_HAVE_MMAP]: Set the initial
	jump tables to the maybe_mmap ones, and don't call __fopen_maybe_mmap.
	We need the tables set before _IO_file_attach.

	* libio/tst-mmap-eofsync.c: New file.
	* libio/tst-mmap-fflushsync.c: New file.
	* libio/bug-mmap-fflush.c: New file.
	* libio/tst-mmap2-eofsync.c: New file.
	* libio/Makefile (tests): Add them.

	* libio/wfileops.c (_IO_wfile_underflow_mmap): Don't set EOF bit when
	_IO_file_underflow_mmap fails, it already set the appropriate bit.
Diffstat (limited to 'libio/Makefile')
-rw-r--r--libio/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/libio/Makefile b/libio/Makefile
index f5e69e3e14..28d8519a97 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -51,7 +51,9 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc   \
 	tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-fopenloc	      \
 	tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-swscanf tst-sscanf	      \
 	tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof          \
-	tst-freopen bug-rewind bug-ungetc bug-fseek
+	tst-freopen bug-rewind bug-ungetc bug-fseek \
+	tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \
+	tst-mmap2-eofsync
 test-srcs = test-freopen
 
 all: # Make this the default target; it will be defined in Rules.