Loading...
--- Libc/Libc-1725.40.4/stdio/FreeBSD/findfp.c
+++ Libc/Libc-391/stdio/FreeBSD/findfp.c
@@ -13,6 +13,10 @@
* 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.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -30,16 +34,11 @@
* SUCH DAMAGE.
*/
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcomma"
-
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)findfp.c 8.2 (Berkeley) 1/4/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.34 2009/12/05 19:31:38 ed Exp $");
-
-#include <TargetConditionals.h>
+__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.29 2004/05/22 15:19:41 tjr Exp $");
#include <sys/param.h>
#include <machine/atomic.h>
@@ -47,54 +46,34 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <libkern/OSAtomic.h>
-#include <errno.h>
-
-#include <pthread.h>
+
#include <spinlock.h>
#include "libc_private.h"
#include "local.h"
#include "glue.h"
-pthread_once_t __sdidinit;
-
-#if !TARGET_OS_IPHONE
+int __sdidinit;
+
#define NDYNAMIC 10 /* add ten more whenever necessary */
-#else
-#define NDYNAMIC 1 /* add one at a time on embedded */
-#endif
-
-#define std(flags, file) { \
- ._flags = (flags), \
- ._file = (file), \
- ._cookie = __sF + (file), \
- ._close = __sclose, \
- ._read = __sread, \
- ._seek = __sseek, \
- ._write = __swrite, \
- ._extra = __sFX + file, \
-}
- /* set counted */
-#define __sFXInit3 {.fl_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER, .counted = 1}
-
-static int64_t __scounted; /* streams counted against STREAM_MAX */
-
-#if !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
-/* usual and usual_extra are data pigs. See 7929728. For embedded we should
- * always allocate dynamically, and probably should for desktop too. */
+
+#define std(flags, file) \
+ {0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite, \
+ {0}, __sFX + file}
+ /* p r w flags file _bf z cookie close read seek write */
+ /* _ub _extra */
/* the usual - (stdin + stdout + stderr) */
static FILE usual[FOPEN_MAX - 3];
static struct __sFILEX usual_extra[FOPEN_MAX - 3];
static struct glue uglue = { NULL, FOPEN_MAX - 3, usual };
-#endif /* !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) */
-
-static struct __sFILEX __sFX[3] = {__sFXInit3, __sFXInit3, __sFXInit3};
-
-/*
- * We can't make this 'static' due to binary compatibility concerns.
- * This also means we cannot change the sizeof(FILE) and must continue to
- * use the __sFILEX stuff to add to FILE.
+
+static struct __sFILEX __sFX[3];
+
+/*
+ * We can't make this 'static' until 6.0-current due to binary
+ * compatibility concerns. This also means we cannot change the
+ * sizeof(FILE) until that time either and must continue to use the
+ * __sFILEX stuff to add to FILE.
*/
FILE __sF[3] = {
std(__SRD, STDIN_FILENO),
@@ -102,47 +81,55 @@
std(__SWR|__SNBF, STDERR_FILENO)
};
+/*
+ * The following kludge is done to ensure enough binary compatibility
+ * with future versions of libc. Or rather it allows us to work with
+ * libraries that have been built with a newer libc that defines these
+ * symbols and expects libc to provide them. We only have need to support
+ * i386 and alpha because they are the only "old" systems we have deployed.
+ */
FILE *__stdinp = &__sF[0];
FILE *__stdoutp = &__sF[1];
FILE *__stderrp = &__sF[2];
-#if !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
struct glue __sglue = { &uglue, 3, __sF };
static struct glue *lastglue = &uglue;
+
+static struct glue * moreglue(int);
+
+static spinlock_t thread_lock = _SPINLOCK_INITIALIZER;
+#define THREAD_LOCK() if (__isthreaded) _SPINLOCK(&thread_lock)
+#define THREAD_UNLOCK() if (__isthreaded) _SPINUNLOCK(&thread_lock)
+
+#if NOT_YET
+#define SET_GLUE_PTR(ptr, val) atomic_set_rel_ptr(&(ptr), (uintptr_t)(val))
#else
-struct glue __sglue = { NULL, 3, __sF };
-static struct glue *lastglue = &__sglue;
+#define SET_GLUE_PTR(ptr, val) ptr = val
#endif
-static struct glue * moreglue(int);
-
-static pthread_mutex_t filelist_lock = PTHREAD_MUTEX_INITIALIZER;
-#define FILELIST_LOCK() do { pthread_mutex_lock(&filelist_lock); } while(0)
-#define FILELIST_UNLOCK() do { pthread_mutex_unlock(&filelist_lock); } while(0)
-
static struct glue *
-moreglue(int n)
+moreglue(n)
+ int n;
{
struct glue *g;
+ static FILE empty;
+ static struct __sFILEX emptyx;
FILE *p;
struct __sFILEX *fx;
- size_t align;
-
- align = __alignof__( (struct { FILE f; struct __sFILEX s; }){} );
- g = (struct glue *)malloc(sizeof(*g) + align + n * sizeof(FILE) +
+
+ g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE) +
n * sizeof(struct __sFILEX));
if (g == NULL)
return (NULL);
- p = (FILE *)roundup((uintptr_t)(g + 1), align);
+ p = (FILE *)ALIGN(g + 1);
fx = (struct __sFILEX *)&p[n];
g->next = NULL;
g->niobs = n;
g->iobs = p;
-
while (--n >= 0) {
- bzero(p, sizeof(*p));
+ *p = empty;
p->_extra = fx;
- INITEXTRA(p);
+ *p->_extra = emptyx;
p++, fx++;
}
return (g);
@@ -152,52 +139,33 @@
* Find a free FILE for fopen et al.
*/
FILE *
-__sfp(int count)
+__sfp()
{
FILE *fp;
int n;
struct glue *g;
- pthread_once(&__sdidinit, __sinit);
-
- if (count) {
- int64_t new = OSAtomicIncrement64(&__scounted);
- if (new > sysconf(_SC_STREAM_MAX)) {
- OSAtomicDecrement64(&__scounted);
- errno = EMFILE;
- return NULL;
- }
- /* Overflowing #streams beyond RLIM_INFINITY */
- if (new < 0) {
- OSAtomicDecrement64(&__scounted);
- errno = EOVERFLOW;
- return NULL;
- }
- }
+ if (!__sdidinit)
+ __sinit();
/*
* The list must be locked because a FILE may be updated.
*/
- FILELIST_LOCK();
+ THREAD_LOCK();
for (g = &__sglue; g != NULL; g = g->next) {
for (fp = g->iobs, n = g->niobs; --n >= 0; fp++)
if (fp->_flags == 0)
goto found;
}
- FILELIST_UNLOCK(); /* don't hold lock while malloc()ing. */
- if ((g = moreglue(NDYNAMIC)) == NULL) {
- if (count)
- OSAtomicDecrement64(&__scounted);
+ THREAD_UNLOCK(); /* don't hold lock while malloc()ing. */
+ if ((g = moreglue(NDYNAMIC)) == NULL)
return (NULL);
- }
- FILELIST_LOCK(); /* reacquire the lock */
- lastglue->next = g; /* atomically append glue to list */
+ THREAD_LOCK(); /* reacquire the lock */
+ SET_GLUE_PTR(lastglue->next, g); /* atomically append glue to list */
lastglue = g; /* not atomic; only accessed when locked */
fp = g->iobs;
found:
fp->_flags = 1; /* reserve this slot; caller sets real flags */
- FILELIST_UNLOCK();
-
- /* _flags = 1 means the FILE* is in use, and this thread owns the object while it is being initialized */
+ THREAD_UNLOCK();
fp->_p = NULL; /* no current pointer */
fp->_w = 0; /* nothing to read or write */
fp->_r = 0;
@@ -211,28 +179,9 @@
fp->_lb._base = NULL; /* no line buffer */
fp->_lb._size = 0;
/* fp->_lock = NULL; */ /* once set always set (reused) */
- INITEXTRA(fp);
- fp->_extra->counted = count ? 1 : 0;
+ fp->_extra->orientation = 0;
+ memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t));
return (fp);
-}
-
-/*
- * Mark as free and update count as needed
- */
-__private_extern__ void
-__sfprelease(FILE *fp)
-{
- if (fp->_counted) {
- OSAtomicDecrement64(&__scounted);
- fp->_counted = 0;
- }
-
- pthread_mutex_destroy(&fp->_extra->fl_mutex);
-
- /* Make sure nobody else is enumerating the list while we clear the "in use" _flags field. */
- FILELIST_LOCK();
- fp->_flags = 0;
- FILELIST_UNLOCK();
}
/*
@@ -243,7 +192,7 @@
"warning: this program uses f_prealloc(), which is not recommended.");
void
-f_prealloc(void)
+f_prealloc()
{
struct glue *g;
int n;
@@ -257,70 +206,44 @@
for (g = &__sglue; (n -= g->niobs) > 0 && g->next; g = g->next)
/* void */;
if ((n > 0) && ((g = moreglue(n)) != NULL)) {
- FILELIST_LOCK();
- lastglue->next = g;
+ THREAD_LOCK();
+ SET_GLUE_PTR(lastglue->next, g);
lastglue = g;
- FILELIST_UNLOCK();
- }
-}
-
-/*
- * exit() calls _cleanup() checking __cleanup, set whenever we
+ THREAD_UNLOCK();
+ }
+}
+
+/*
+ * exit() calls _cleanup() through *__cleanup, set whenever we
* open or buffer a file. This chicanery is done so that programs
* that do not use stdio need not link it all in.
*
* The name `_cleanup' is, alas, fairly well known outside stdio.
*/
-#ifdef __APPLE__
-static int
-tryflush(FILE *fp)
-{
- int ret;
-
- if (__isthreaded)
- if (ftrylockfile(fp) < 0)
- return (-1);
- ret = __sflush(fp);
- if (__isthreaded)
- funlockfile(fp);
- return (ret);
-}
-#endif /* __APPLE__ */
void
-_cleanup(void)
-{
-#ifdef __APPLE__
- (void)_fwalk(tryflush);
-#else
+_cleanup()
+{
/* (void) _fwalk(fclose); */
(void) _fwalk(__sflush); /* `cheating' */
-#endif /* __APPLE__ */
}
/*
* __sinit() is called whenever stdio's internal variables must be set up.
*/
void
-__sinit(void)
-{
-#if !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
- int i;
-#endif
-
- /* Make sure we clean up on exit. */
-#ifdef __APPLE__
- __cleanup = 1; /* conservative */
-#else
- __cleanup = _cleanup; /* conservative */
-#endif // __APPLE__
- __scounted = 3; /* account for std{in,out,err} */
-
-#if !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
- /* Set _extra for the usual suspects. */
- for (i = 0; i < FOPEN_MAX - 3; i++) {
- usual[i]._extra = &usual_extra[i];
- INITEXTRA(&usual[i]);
- }
-#endif
-}
-#pragma clang diagnostic pop
+__sinit()
+{
+ int i;
+
+ THREAD_LOCK();
+ if (__sdidinit == 0) {
+ /* Set _extra for the usual suspects. */
+ for (i = 0; i < FOPEN_MAX - 3; i++)
+ usual[i]._extra = &usual_extra[i];
+
+ /* Make sure we clean up on exit. */
+ __cleanup = _cleanup; /* conservative */
+ __sdidinit = 1;
+ }
+ THREAD_UNLOCK();
+}