Re: [PATCH 13/20] unlocked stdio extensions

[Yaakov Selkowitz <yselkowi at redhat dot com>]

Revised patch attached.

--
Yaakov Selkowitz
Associate Software Engineer, ARM
Red Hat, Inc.

Index: libc/stdio/fputws.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/fputws.c,v
retrieving revision 1.6
diff -u -p -r1.6 fputws.c
--- libc/stdio/fputws.c	26 Nov 2013 17:21:00 -0000	1.6
+++ libc/stdio/fputws.c	17 Dec 2014 20:42:50 -0000
@@ -26,46 +26,81 @@
 
 /*
 FUNCTION        
-<<fputws>>---write a wide character string in a file or stream
+<<fputws>>, <<fputws_unlocked>>---write a wide character string in a file or stream
 
 INDEX
 	fputws   
 INDEX
+	fputws_unlocked 
+INDEX
 	_fputws_r
+INDEX
+	_fputws_unlocked_r
 
 ANSI_SYNOPSIS
 	#include <wchar.h>
 	int fputws(const wchar_t *__restrict <[ws]>, FILE *__restrict <[fp]>);
 
+	#define _GNU_SOURCE
+	#include <wchar.h>
+	int fputws_unlocked(const wchar_t *__restrict <[ws]>, FILE *__restrict <[fp]>);
+
 	#include <wchar.h>
 	int _fputws_r(struct _reent *<[ptr]>, const wchar_t *<[ws]>,
                       FILE *<[fp]>);
 
+	#include <wchar.h>
+	int _fputws_unlocked_r(struct _reent *<[ptr]>, const wchar_t *<[ws]>,
+                               FILE *<[fp]>);
+
 TRAD_SYNOPSIS   
 	#include <wchar.h>
 	int fputws(<[ws]>, <[fp]>)
 	wchar_t *__restrict <[ws]>;
 	FILE *__restrict <[fp]>;
 
+	#define _GNU_SOURCE
+	#include <wchar.h>
+	int fputws_unlocked(<[ws]>, <[fp]>)
+	wchar_t *__restrict <[ws]>;
+	FILE *__restrict <[fp]>;
+
 	#include <wchar.h>
 	int _fputws_r(<[ptr]>, <[ws]>, <[fp]>)
 	struct _reent *<[ptr]>;
 	wchar_t *<[ws]>;
 	FILE *<[fp]>;
 
+	#include <wchar.h>
+	int _fputws_unlocked_r(<[ptr]>, <[ws]>, <[fp]>)
+	struct _reent *<[ptr]>;
+	wchar_t *<[ws]>;
+	FILE *<[fp]>;
+
 DESCRIPTION
 <<fputws>> writes the wide character string at <[ws]> (but without the
 trailing null) to the file or stream identified by <[fp]>.
 
-<<_fputws_r>> is simply the reentrant version of <<fputws>> that takes
-an additional reentrant struct pointer argument: <[ptr]>.
+<<fputws_unlocked>> is a non-thread-safe version of <<fputws>>.
+<<fputws_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
+<<fputws_unlocked>> is equivalent to <<fputws>>.
+
+<<_fputws_r>> and <<_fputws_unlocked_r>> are simply reentrant versions of the
+above that take an additional reentrant struct pointer argument: <[ptr]>.
 
 RETURNS
 If successful, the result is a non-negative integer; otherwise, the result
 is <<-1>> to indicate an error.
 
 PORTABILITY
-C99, POSIX.1-2001
+<<fputws> is required by C99 and POSIX.1-2001.
+
+<<fputws_unlocked>> is a GNU extension.
 */
 
 #include <_ansi.h>
@@ -77,6 +112,11 @@ C99, POSIX.1-2001
 #include "fvwrite.h"
 #include "local.h"
 
+#ifdef __IMPL_UNLOCKED__
+#define _fputws_r _fputws_unlocked_r
+#define fputws fputws_unlocked
+#endif
+
 int
 _DEFUN(_fputws_r, (ptr, ws, fp),
 	struct _reent *ptr _AND
Index: libc/stdio/fputws_u.c
===================================================================
RCS file: libc/stdio/fputws_u.c
diff -N libc/stdio/fputws_u.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libc/stdio/fputws_u.c	17 Dec 2014 20:42:50 -0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2014 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#define __IMPL_UNLOCKED__
+#include "fputws.c"