mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
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.
This commit is contained in:
@ -124,8 +124,19 @@ _IO_new_fdopen (fd, mode)
|
||||
#ifdef _IO_MTSAFE_IO
|
||||
new_f->fp.file._lock = &new_f->lock;
|
||||
#endif
|
||||
_IO_no_init (&new_f->fp.file, 0, 0, &new_f->wd, &INTUSE(_IO_wfile_jumps));
|
||||
_IO_JUMPS (&new_f->fp) = &INTUSE(_IO_file_jumps);
|
||||
/* Set up initially to use the `maybe_mmap' jump tables rather than using
|
||||
__fopen_maybe_mmap to do it, because we need them in place before we
|
||||
call _IO_file_attach or else it will allocate a buffer immediately. */
|
||||
_IO_no_init (&new_f->fp.file, 0, 0, &new_f->wd,
|
||||
#ifdef _G_HAVE_MMAP
|
||||
(read_write & _IO_NO_WRITES) ? &_IO_wfile_jumps_maybe_mmap :
|
||||
#endif
|
||||
&INTUSE(_IO_wfile_jumps));
|
||||
_IO_JUMPS (&new_f->fp) =
|
||||
#ifdef _G_HAVE_MMAP
|
||||
(read_write & _IO_NO_WRITES) ? &_IO_file_jumps_maybe_mmap :
|
||||
#endif
|
||||
&INTUSE(_IO_file_jumps);
|
||||
INTUSE(_IO_file_init) (&new_f->fp);
|
||||
#if !_IO_UNIFIED_JUMPTABLES
|
||||
new_f->fp.vtable = NULL;
|
||||
@ -143,7 +154,7 @@ _IO_new_fdopen (fd, mode)
|
||||
_IO_mask_flags (&new_f->fp.file, read_write,
|
||||
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
|
||||
|
||||
return __fopen_maybe_mmap (&new_f->fp.file);
|
||||
return &new_f->fp.file;
|
||||
}
|
||||
INTDEF2(_IO_new_fdopen, _IO_fdopen)
|
||||
|
||||
|
Reference in New Issue
Block a user