diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-09 08:05:10 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-17 20:35:19 +0100 |
| commit | 219b69d72e878094f3ce03a9e70719709a9b4c43 (patch) | |
| tree | c79c264c6e76d470e88ff57491ba3bf13c8aef46 /libc/stdio/_stdio.c | |
| parent | 2e116b2eeea5f47ca26458b1962783baced2784c (diff) | |
libc/stdio: Rework custom streams interface similar to glibc.
Save 20 bytes per FILE structure, avoid indirect call for
read/write/seek/close operations for normal streams.
Additionally, custom streams has fileno = -2 now, like in glibc.
bloat-o-meter report (UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y):
function old new delta
fopencookie 69 131 +62
ftello64 233 260 +27
fseeko64 298 319 +21
fclose 423 442 +19
.rodata 16696 16708 +12
fileno_unlocked 53 45 -8
__ns_name_pack 859 851 -8
vswscanf 184 144 -40
vdprintf 231 187 -44
vsscanf 210 151 -59
vswprintf 269 201 -68
vsnprintf 249 181 -68
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/7 up/down: 141/-295) Total: -154 bytes
Signed-off-by: Leonid Lisovskiy <lly.dev@gmail.com>
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
Diffstat (limited to 'libc/stdio/_stdio.c')
| -rw-r--r-- | libc/stdio/_stdio.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/libc/stdio/_stdio.c b/libc/stdio/_stdio.c index ee247a5fd..2a1054618 100644 --- a/libc/stdio/_stdio.c +++ b/libc/stdio/_stdio.c @@ -51,13 +51,6 @@ #define __STDIO_FILE_INIT_BUFFERS(buf,bufsize) #endif -#ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ -#define __STDIO_FILE_INIT_CUSTOM_STREAM(stream) \ - &((stream).__filedes), { _cs_read, _cs_write, _cs_seek, _cs_close }, -#else -#define __STDIO_FILE_INIT_CUSTOM_STREAM(stream) -#endif - #ifdef __STDIO_MBSTATE #define __STDIO_FILE_INIT_MBSTATE \ { 0, 0 }, @@ -92,7 +85,6 @@ __STDIO_FILE_INIT_BUFGETC((buf)) \ __STDIO_FILE_INIT_BUFPUTC((buf)) \ __STDIO_FILE_INIT_NEXT(next) \ - __STDIO_FILE_INIT_CUSTOM_STREAM(stream) \ __STDIO_FILE_INIT_WUNGOT \ __STDIO_FILE_INIT_MBSTATE \ __STDIO_FILE_INIT_UNUSED \ @@ -240,7 +232,7 @@ void _stdio_term(void) #endif #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ /* Actually close all custom streams to perform any special cleanup. */ - if (ptr->__cookie != &ptr->__filedes) { + if (__STDIO_STREAM_IS_CUSTOM(ptr)) { __CLOSE(ptr); } #endif @@ -284,14 +276,9 @@ void attribute_hidden _stdio_validate_FILE(const FILE *stream) #endif #warning Define a constant for minimum possible valid __filedes? - assert(stream->__filedes >= -3); + assert(stream->__filedes >= -4); if (stream->__filedes < 0) { -/* assert((stream->__filedes != -1) */ -/* #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ */ -/* || (stream->__cookie == &stream->__filedes) /\* custom *\/ */ -/* #endif */ -/* ); */ /* assert((stream->__filedes == -1) || __STDIO_STREAM_IS_FBF(stream)); */ assert(!__STDIO_STREAM_IS_FAKE_VSNPRINTF(stream) @@ -308,12 +295,6 @@ void attribute_hidden _stdio_validate_FILE(const FILE *stream) #endif } -#ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ - if (stream->__cookie != &stream->__filedes) { /* custom */ - assert(stream->__filedes == -1); - } -#endif - /* Can not be both narrow and wide oriented at the same time. */ assert(!(__STDIO_STREAM_IS_NARROW(stream) && __STDIO_STREAM_IS_WIDE(stream))); |