This is the mail archive of the
newlib@sourceware.org
mailing list for the newlib project.
Re: [PATCH 11/20] unlocked stdio extensions
- From: Yaakov Selkowitz <yselkowi at redhat dot com>
- To: newlib at sourceware dot org
- Date: Wed, 17 Dec 2014 14:47:42 -0600
- Subject: Re: [PATCH 11/20] unlocked stdio extensions
- Authentication-results: sourceware.org; auth=none
- References: <548F3554 dot 5010204 at redhat dot com> <20141216112826 dot GJ10824 at calimero dot vinschen dot de> <5491C810 dot 6080305 at redhat dot com> <20141217182008 dot GX10824 at calimero dot vinschen dot de> <5491CD1D dot 1040703 at redhat dot com>
Revised patch attached.
--
Yaakov Selkowitz
Associate Software Engineer, ARM
Red Hat, Inc.
Index: libc/stdio/fputs.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/fputs.c,v
retrieving revision 1.10
diff -u -p -r1.10 fputs.c
--- libc/stdio/fputs.c 18 Nov 2013 17:28:05 -0000 1.10
+++ libc/stdio/fputs.c 17 Dec 2014 20:42:47 -0000
@@ -17,38 +17,70 @@
/*
FUNCTION
-<<fputs>>---write a character string in a file or stream
+<<fputs>>, <<fputs_unlocked>>---write a character string in a file or stream
INDEX
fputs
INDEX
+ fputs_unlocked
+INDEX
_fputs_r
+INDEX
+ _fputs_unlocked_r
ANSI_SYNOPSIS
#include <stdio.h>
int fputs(const char *restrict <[s]>, FILE *restrict <[fp]>);
+ #define _GNU_SOURCE
+ #include <stdio.h>
+ int fputs_unlocked(const char *restrict <[s]>, FILE *restrict <[fp]>);
+
#include <stdio.h>
int _fputs_r(struct _reent *<[ptr]>, const char *restrict <[s]>, FILE *restrict <[fp]>);
+ #include <stdio.h>
+ int _fputs_unlocked_r(struct _reent *<[ptr]>, const char *restrict <[s]>, FILE *restrict <[fp]>);
+
TRAD_SYNOPSIS
#include <stdio.h>
int fputs(<[s]>, <[fp]>)
char *<[s]>;
FILE *<[fp]>;
+ #define _GNU_SOURCE
+ #include <stdio.h>
+ int fputs_unlocked(<[s]>, <[fp]>)
+ char *<[s]>;
+ FILE *<[fp]>;
+
#include <stdio.h>
int _fputs_r(<[ptr]>, <[s]>, <[fp]>)
struct _reent *<[ptr]>;
char *<[s]>;
FILE *<[fp]>;
+ #include <stdio.h>
+ int _fputs_unlocked_r(<[ptr]>, <[s]>, <[fp]>)
+ struct _reent *<[ptr]>;
+ char *<[s]>;
+ FILE *<[fp]>;
+
DESCRIPTION
<<fputs>> writes the string at <[s]> (but without the trailing null)
to the file or stream identified by <[fp]>.
-<<_fputs_r>> is simply the reentrant version of <<fputs>> that takes
-an additional reentrant struct pointer argument: <[ptr]>.
+<<fputs_unlocked>> is a non-thread-safe version of <<fputs>>.
+<<fputs_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
+<<fputs_unlocked>> is equivalent to <<fputs>>.
+
+<<_fputs_r>> and <<_fputs_unlocked_r>> are simply reentrant versions of the
+above that take an additional reentrant struct pointer argument: <[ptr]>.
RETURNS
If successful, the result is <<0>>; otherwise, the result is <<EOF>>.
@@ -57,6 +89,8 @@ PORTABILITY
ANSI C requires <<fputs>>, but does not specify that the result on
success must be <<0>>; any non-negative value is permitted.
+<<fputs_unlocked>> is a GNU extension.
+
Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
*/
@@ -67,10 +101,14 @@ Supporting OS subroutines required: <<cl
#include "fvwrite.h"
#include "local.h"
+#ifdef __IMPL_UNLOCKED__
+#define _fputs_r _fputs_unlocked_r
+#define fputs fputs_unlocked
+#endif
+
/*
* Write the given string to the given file.
*/
-
int
_DEFUN(_fputs_r, (ptr, s, fp),
struct _reent * ptr _AND
Index: libc/stdio/fputs_u.c
===================================================================
RCS file: libc/stdio/fputs_u.c
diff -N libc/stdio/fputs_u.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libc/stdio/fputs_u.c 17 Dec 2014 20:42:47 -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 "fputs.c"