mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 08:40:07 +00:00
d2e0491883
Locking overhead can be significant in some stdio operations that are common in single threaded applications. This patch adds the _IO_FLAGS2_NEED_LOCK flag to indicate if an _IO_FILE object needs to be locked and some of the stdio functions just jump to their _unlocked variant when not. The flag is set on all _IO_FILE objects when the first thread is created. A new GLIBC_PRIVATE libc symbol, _IO_enable_locks, was added to do this from libpthread. The optimization can be applied to more stdio functions, currently it is only applied to single flag check or single non-wide-char standard operations. The flag should probably be never set for files with _IO_USER_LOCK, but that's just a further optimization, not a correctness requirement. The optimization is valid in a single thread because stdio operations are non-as-safe (so lock state is not observable from a signal handler) and stdio locks are recursive (so lock state is not observable via deadlock). The optimization is not valid if a thread may be created while an stdio lock is taken and thus it should be disabled if any user code may run during an stdio operation (interposed malloc, printf hooks, etc). This makes the optimization more complicated for some stdio operations (e.g. printf), but those are bigger and thus less important to optimize so this patch does not try to do that. * libio/libio.h (_IO_FLAGS2_NEED_LOCK, _IO_need_lock): Define. * libio/libioP.h (_IO_enable_locks): Declare. * libio/Versions (_IO_enable_locks): New symbol. * libio/genops.c (_IO_enable_locks): Define. (_IO_old_init): Initialize flags2. * libio/feof.c.c (_IO_feof): Avoid locking when not needed. * libio/ferror.c (_IO_ferror): Likewise. * libio/fputc.c (fputc): Likewise. * libio/putc.c (_IO_putc): Likewise. * libio/getc.c (_IO_getc): Likewise. * libio/getchar.c (getchar): Likewise. * libio/ioungetc.c (_IO_ungetc): Likewise. * nptl/pthread_create.c (__pthread_create_2_1): Enable stdio locks. * libio/iofopncook.c (_IO_fopencookie): Enable locking for the file. * sysdeps/pthread/flockfile.c (__flockfile): Likewise.
295 lines
8.4 KiB
C
295 lines
8.4 KiB
C
/* Copyright (C) 1993-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
As a special exception, if you link the code in this file with
|
|
files compiled with a GNU compiler to produce an executable,
|
|
that does not cause the resulting executable to be covered by
|
|
the GNU Lesser General Public License. This exception does not
|
|
however invalidate any other reasons why the executable file
|
|
might be covered by the GNU Lesser General Public License.
|
|
This exception applies to code released by its copyright holders
|
|
in files containing the exception. */
|
|
|
|
#include <libioP.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <shlib-compat.h>
|
|
|
|
/* Prototyped for local functions. */
|
|
static _IO_ssize_t _IO_cookie_read (_IO_FILE* fp, void* buf,
|
|
_IO_ssize_t size);
|
|
static _IO_ssize_t _IO_cookie_write (_IO_FILE* fp,
|
|
const void* buf, _IO_ssize_t size);
|
|
static _IO_off64_t _IO_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir);
|
|
static _IO_off64_t _IO_cookie_seekoff (_IO_FILE *fp, _IO_off64_t offset,
|
|
int dir, int mode);
|
|
static int _IO_cookie_close (_IO_FILE* fp);
|
|
|
|
static _IO_ssize_t
|
|
_IO_cookie_read (_IO_FILE *fp, void *buf, _IO_ssize_t size)
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
cookie_read_function_t *read_cb = cfile->__io_functions.read;
|
|
#ifdef PTR_DEMANGLE
|
|
PTR_DEMANGLE (read_cb);
|
|
#endif
|
|
|
|
if (read_cb == NULL)
|
|
return -1;
|
|
|
|
return read_cb (cfile->__cookie, buf, size);
|
|
}
|
|
|
|
static _IO_ssize_t
|
|
_IO_cookie_write (_IO_FILE *fp, const void *buf, _IO_ssize_t size)
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
cookie_write_function_t *write_cb = cfile->__io_functions.write;
|
|
#ifdef PTR_DEMANGLE
|
|
PTR_DEMANGLE (write_cb);
|
|
#endif
|
|
|
|
if (write_cb == NULL)
|
|
{
|
|
fp->_flags |= _IO_ERR_SEEN;
|
|
return 0;
|
|
}
|
|
|
|
_IO_ssize_t n = write_cb (cfile->__cookie, buf, size);
|
|
if (n < size)
|
|
fp->_flags |= _IO_ERR_SEEN;
|
|
|
|
return n;
|
|
}
|
|
|
|
static _IO_off64_t
|
|
_IO_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir)
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
cookie_seek_function_t *seek_cb = cfile->__io_functions.seek;
|
|
#ifdef PTR_DEMANGLE
|
|
PTR_DEMANGLE (seek_cb);
|
|
#endif
|
|
|
|
return ((seek_cb == NULL
|
|
|| (seek_cb (cfile->__cookie, &offset, dir)
|
|
== -1)
|
|
|| offset == (_IO_off64_t) -1)
|
|
? _IO_pos_BAD : offset);
|
|
}
|
|
|
|
static int
|
|
_IO_cookie_close (_IO_FILE *fp)
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
cookie_close_function_t *close_cb = cfile->__io_functions.close;
|
|
#ifdef PTR_DEMANGLE
|
|
PTR_DEMANGLE (close_cb);
|
|
#endif
|
|
|
|
if (close_cb == NULL)
|
|
return 0;
|
|
|
|
return close_cb (cfile->__cookie);
|
|
}
|
|
|
|
|
|
static _IO_off64_t
|
|
_IO_cookie_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode)
|
|
{
|
|
/* We must force the fileops code to always use seek to determine
|
|
the position. */
|
|
fp->_offset = _IO_pos_BAD;
|
|
return _IO_file_seekoff (fp, offset, dir, mode);
|
|
}
|
|
|
|
|
|
static const struct _IO_jump_t _IO_cookie_jumps libio_vtable = {
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, _IO_file_finish),
|
|
JUMP_INIT(overflow, _IO_file_overflow),
|
|
JUMP_INIT(underflow, _IO_file_underflow),
|
|
JUMP_INIT(uflow, _IO_default_uflow),
|
|
JUMP_INIT(pbackfail, _IO_default_pbackfail),
|
|
JUMP_INIT(xsputn, _IO_file_xsputn),
|
|
JUMP_INIT(xsgetn, _IO_default_xsgetn),
|
|
JUMP_INIT(seekoff, _IO_cookie_seekoff),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, _IO_file_setbuf),
|
|
JUMP_INIT(sync, _IO_file_sync),
|
|
JUMP_INIT(doallocate, _IO_file_doallocate),
|
|
JUMP_INIT(read, _IO_cookie_read),
|
|
JUMP_INIT(write, _IO_cookie_write),
|
|
JUMP_INIT(seek, _IO_cookie_seek),
|
|
JUMP_INIT(close, _IO_cookie_close),
|
|
JUMP_INIT(stat, _IO_default_stat),
|
|
JUMP_INIT(showmanyc, _IO_default_showmanyc),
|
|
JUMP_INIT(imbue, _IO_default_imbue),
|
|
};
|
|
|
|
|
|
/* Copy the callbacks from SOURCE to *TARGET, with pointer
|
|
mangling. */
|
|
static void
|
|
set_callbacks (_IO_cookie_io_functions_t *target,
|
|
_IO_cookie_io_functions_t source)
|
|
{
|
|
#ifdef PTR_MANGLE
|
|
PTR_MANGLE (source.read);
|
|
PTR_MANGLE (source.write);
|
|
PTR_MANGLE (source.seek);
|
|
PTR_MANGLE (source.close);
|
|
#endif
|
|
*target = source;
|
|
}
|
|
|
|
void
|
|
_IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,
|
|
void *cookie, _IO_cookie_io_functions_t io_functions)
|
|
{
|
|
_IO_init_internal (&cfile->__fp.file, 0);
|
|
_IO_JUMPS (&cfile->__fp) = &_IO_cookie_jumps;
|
|
|
|
cfile->__cookie = cookie;
|
|
set_callbacks (&cfile->__io_functions, io_functions);
|
|
|
|
_IO_new_file_init_internal (&cfile->__fp);
|
|
|
|
_IO_mask_flags (&cfile->__fp.file, read_write,
|
|
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
|
|
|
|
cfile->__fp.file._flags2 |= _IO_FLAGS2_NEED_LOCK;
|
|
|
|
/* We use a negative number different from -1 for _fileno to mark that
|
|
this special stream is not associated with a real file, but still has
|
|
to be treated as such. */
|
|
cfile->__fp.file._fileno = -2;
|
|
}
|
|
|
|
|
|
_IO_FILE *
|
|
_IO_fopencookie (void *cookie, const char *mode,
|
|
_IO_cookie_io_functions_t io_functions)
|
|
{
|
|
int read_write;
|
|
struct locked_FILE
|
|
{
|
|
struct _IO_cookie_file cfile;
|
|
#ifdef _IO_MTSAFE_IO
|
|
_IO_lock_t lock;
|
|
#endif
|
|
} *new_f;
|
|
|
|
switch (*mode++)
|
|
{
|
|
case 'r':
|
|
read_write = _IO_NO_WRITES;
|
|
break;
|
|
case 'w':
|
|
read_write = _IO_NO_READS;
|
|
break;
|
|
case 'a':
|
|
read_write = _IO_NO_READS|_IO_IS_APPENDING;
|
|
break;
|
|
default:
|
|
__set_errno (EINVAL);
|
|
return NULL;
|
|
}
|
|
if (mode[0] == '+' || (mode[0] == 'b' && mode[1] == '+'))
|
|
read_write &= _IO_IS_APPENDING;
|
|
|
|
new_f = (struct locked_FILE *) malloc (sizeof (struct locked_FILE));
|
|
if (new_f == NULL)
|
|
return NULL;
|
|
#ifdef _IO_MTSAFE_IO
|
|
new_f->cfile.__fp.file._lock = &new_f->lock;
|
|
#endif
|
|
|
|
_IO_cookie_init (&new_f->cfile, read_write, cookie, io_functions);
|
|
|
|
return (_IO_FILE *) &new_f->cfile.__fp;
|
|
}
|
|
|
|
versioned_symbol (libc, _IO_fopencookie, fopencookie, GLIBC_2_2);
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
|
|
|
|
static _IO_off64_t _IO_old_cookie_seek (_IO_FILE *fp, _IO_off64_t offset,
|
|
int dir);
|
|
_IO_FILE * _IO_old_fopencookie (void *cookie, const char *mode,
|
|
_IO_cookie_io_functions_t io_functions);
|
|
|
|
static _IO_off64_t
|
|
attribute_compat_text_section
|
|
_IO_old_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir)
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
int (*seek_cb) (_IO_FILE *, _IO_off_t, int)
|
|
= (int (*) (_IO_FILE *, _IO_off_t, int)) cfile->__io_functions.seek;;
|
|
#ifdef PTR_DEMANGLE
|
|
PTR_DEMANGLE (seek_cb);
|
|
#endif
|
|
|
|
if (seek_cb == NULL)
|
|
return _IO_pos_BAD;
|
|
|
|
int ret = seek_cb (cfile->__cookie, offset, dir);
|
|
|
|
return (ret == -1) ? _IO_pos_BAD : ret;
|
|
}
|
|
|
|
static const struct _IO_jump_t _IO_old_cookie_jumps libio_vtable = {
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, _IO_file_finish),
|
|
JUMP_INIT(overflow, _IO_file_overflow),
|
|
JUMP_INIT(underflow, _IO_file_underflow),
|
|
JUMP_INIT(uflow, _IO_default_uflow),
|
|
JUMP_INIT(pbackfail, _IO_default_pbackfail),
|
|
JUMP_INIT(xsputn, _IO_file_xsputn),
|
|
JUMP_INIT(xsgetn, _IO_default_xsgetn),
|
|
JUMP_INIT(seekoff, _IO_cookie_seekoff),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, _IO_file_setbuf),
|
|
JUMP_INIT(sync, _IO_file_sync),
|
|
JUMP_INIT(doallocate, _IO_file_doallocate),
|
|
JUMP_INIT(read, _IO_cookie_read),
|
|
JUMP_INIT(write, _IO_cookie_write),
|
|
JUMP_INIT(seek, _IO_old_cookie_seek),
|
|
JUMP_INIT(close, _IO_cookie_close),
|
|
JUMP_INIT(stat, _IO_default_stat),
|
|
JUMP_INIT(showmanyc, _IO_default_showmanyc),
|
|
JUMP_INIT(imbue, _IO_default_imbue),
|
|
};
|
|
|
|
_IO_FILE *
|
|
attribute_compat_text_section
|
|
_IO_old_fopencookie (void *cookie, const char *mode,
|
|
_IO_cookie_io_functions_t io_functions)
|
|
{
|
|
_IO_FILE *ret;
|
|
|
|
ret = _IO_fopencookie (cookie, mode, io_functions);
|
|
if (ret != NULL)
|
|
_IO_JUMPS_FILE_plus (ret) = &_IO_old_cookie_jumps;
|
|
|
|
return ret;
|
|
}
|
|
|
|
compat_symbol (libc, _IO_old_fopencookie, fopencookie, GLIBC_2_0);
|
|
|
|
#endif
|