From 968738f9b133c8bda7d5ced178fd92f4445d791c Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 18 Dec 2014 14:55:21 +0000
Subject: Implement BSD/GNU unlocked stdio extensions. * libc/include/stdio.h
(clearerr_unlocked, feof_unlocked, ferror_unlocked, fflush_unlocked,
fgetc_unlocked, fgets_unlocked, fileno_unlocked, fputc_unlocked,
fputs_unlocked, fread_unlocked, fwrite_unlocked): Declare. *
libc/include/wchar.h (fgetwc_unlocked, fgetws_unlocked, fputwc_unlocked,
fputws_unlocked, getwc_unlocked, getwchar_unlocked, putwc_unlocked,
putwchar_unlocked): Declare. * libc/stdio/Makefile.am (ELIX_4_SOURCES): Add
clearerr_u.c, feof_u.c, ferror_u.c, fflush_u.c, fgetc_u.c, fgets_u.c,
fgetwc_u.c, fgetws_u.c, fileno_u.c, fputc_u.c, fputs_u.c, fputwc_u.c,
fputws_u.c, fread_u.c, fwrite_u.c, getwc_u.c, getwchar_u.c, putwc_u.c,
putwchar_u.c. Add necessary dependencies. * libc/stdio/Makefile.in:
Regenerate. * libc/stdio/clearerr.c: Document unlocked variant. *
libc/stdio/clearerr_u.c: New file. * libc/stdio/feof.c: Document unlocked
variant. * libc/stdio/feof_u.c: New file. * libc/stdio/ferror.c: Document
unlocked variant. * libc/stdio/ferror_u.c: New file. * libc/stdio/fflush.c:
Add __IMPL_UNLOCKED__ overrides. Document unlocked variants. *
libc/stdio/fflush_u.c: New file. * libc/stdio/fgetc.c: Document unlocked
variants. * libc/stdio/fgetc_u.c: New file. * libc/stdio/fgets.c: Add
__IMPL_UNLOCKED__ overrides. Document unlocked variants. *
libc/stdio/fgets_u.c: New file. * libc/stdio/fgetwc.c: Document unlocked
variants. (__fgetwc): Make non-static. * libc/stdio/fgetwc_u.c: New file. *
libc/stdio/fgetws.c: Add __IMPL_UNLOCKED__ overrides. Document unlocked
variants. * libc/stdio/fgetws_u.c: New file. * libc/stdio/fileno.c: Document
unlocked variant. * libc/stdio/fileno_u.c: New file. * libc/stdio/fputc.c:
Document unlocked variants. * libc/stdio/fputc_u.c: New file. *
libc/stdio/fputs.c: Add __IMPL_UNLOCKED__ overrides. Document unlocked
variants. * libc/stdio/fputs_u.c: New file. * libc/stdio/fputwc.c: Document
unlocked variants. (__fputwc): Make non-static. * libc/stdio/fputwc_u.c: New
file. * libc/stdio/fputws.c: Add __IMPL_UNLOCKED__ overrides. Document
unlocked variants. * libc/stdio/fputws_u.c: New file. * libc/stdio/fread.c:
Add __IMPL_UNLOCKED__ overrides. Document unlocked variants. *
libc/stdio/fread_u.c: New file. * libc/stdio/fwrite.c: Add __IMPL_UNLOCKED__
overrides. Document unlocked variants. * libc/stdio/fwrite_u.c: New file. *
libc/stdio/getwc_u.c: New file. * libc/stdio/getwchar.c: Document unlocked
variants. * libc/stdio/getwchar_u.c: New file. * libc/stdio/local.h: Define
locking macros as empty ifdef __IMPL_UNLOCKED__. (__fgetwc, __fputwc):
Declare. * libc/stdio/putwc_u.c: New file. * libc/stdio/putwchar.c: Document
unlocked variants. * libc/stdio/putwchar_u.c: New file.
---
newlib/libc/stdio/fwrite.c | 51 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 48 insertions(+), 3 deletions(-)
(limited to 'newlib/libc/stdio/fwrite.c')
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index f460ae3..6b3ff90 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -17,22 +17,35 @@
/*
FUNCTION
-<<fwrite>>---write array elements
+<<fwrite>>, <<fwrite_unlocked>>---write array elements
INDEX
fwrite
INDEX
+ fwrite_unlocked
+INDEX
_fwrite_r
+INDEX
+ _fwrite_unlocked_r
ANSI_SYNOPSIS
#include <stdio.h>
size_t fwrite(const void *restrict <[buf]>, size_t <[size]>,
size_t <[count]>, FILE *restrict <[fp]>);
+ #define _BSD_SOURCE
+ #include <stdio.h>
+ size_t fwrite_unlocked(const void *restrict <[buf]>, size_t <[size]>,
+ size_t <[count]>, FILE *restrict <[fp]>);
+
#include <stdio.h>
size_t _fwrite_r(struct _reent *<[ptr]>, const void *restrict <[buf]>, size_t <[size]>,
size_t <[count]>, FILE *restrict <[fp]>);
+ #include <stdio.h>
+ size_t _fwrite_unlocked_r(struct _reent *<[ptr]>, const void *restrict <[buf]>, size_t <[size]>,
+ size_t <[count]>, FILE *restrict <[fp]>);
+
TRAD_SYNOPSIS
#include <stdio.h>
size_t fwrite(<[buf]>, <[size]>, <[count]>, <[fp]>)
@@ -41,6 +54,14 @@ TRAD_SYNOPSIS
size_t <[count]>;
FILE *<[fp]>;
+ #define _BSD_SOURCE
+ #include <stdio.h>
+ size_t fwrite_unlocked(<[buf]>, <[size]>, <[count]>, <[fp]>)
+ char *<[buf]>;
+ size_t <[size]>;
+ size_t <[count]>;
+ FILE *<[fp]>;
+
#include <stdio.h>
size_t _fwrite_r(<[ptr]>, <[buf]>, <[size]>, <[count]>, <[fp]>)
struct _reent *<[ptr]>;
@@ -49,6 +70,14 @@ TRAD_SYNOPSIS
size_t <[count]>;
FILE *<[fp]>;
+ #include <stdio.h>
+ size_t _fwrite_unlocked_r(<[ptr]>, <[buf]>, <[size]>, <[count]>, <[fp]>)
+ struct _reent *<[ptr]>;
+ char *<[buf]>;
+ size_t <[size]>;
+ size_t <[count]>;
+ FILE *<[fp]>;
+
DESCRIPTION
<<fwrite>> attempts to copy, starting from the memory location
<[buf]>, <[count]> elements (each of size <[size]>) into the file or
@@ -58,8 +87,17 @@ stream identified by <[fp]>. <<fwrite>> may copy fewer elements than
<<fwrite>> also advances the file position indicator (if any) for
<[fp]> by the number of @emph{characters} actually written.
-<<_fwrite_r>> is simply the reentrant version of <<fwrite>> that
-takes an additional reentrant structure argument: <[ptr]>.
+<<fwrite_unlocked>> is a non-thread-safe version of <<fwrite>>.
+<<fwrite_unlocked>> may only safely be used within a scope
+protected by flockfile() (or ftrylockfile()) and funlockfile(). This
+function may safely be used in a multi-threaded program if and only
+if they are called while the invoking thread owns the (FILE *)
+object, as is the case after a successful call to the flockfile() or
+ftrylockfile() functions. If threads are disabled, then
+<<fwrite_unlocked>> is equivalent to <<fwrite>>.
+
+<<_fwrite_r>> and <<_fwrite_unlocked_r>> are simply reentrant versions of the
+above that take an additional reentrant structure argument: <[ptr]>.
RETURNS
If <<fwrite>> succeeds in writing all the elements you specify, the
@@ -70,6 +108,8 @@ the file.
PORTABILITY
ANSI C requires <<fwrite>>.
+<<fwrite_unlocked>> is a BSD extension also provided by GNU libc.
+
Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
*/
@@ -89,6 +129,11 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include "fvwrite.h"
#endif
+#ifdef __IMPL_UNLOCKED__
+#define _fwrite_r _fwrite_unlocked_r
+#define fwrite fwrite_unlocked
+#endif
+
/*
* Write `count' objects (each size `size') from memory to the given file.
* Return the number of whole objects written.
--
cgit v1.1