X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/3d9156a7a519a5e3aa1b92e9d9d4b991f1aed7ff..refs/heads/master:/stdio/FreeBSD/findfp.c?ds=sidebyside diff --git a/stdio/FreeBSD/findfp.c b/stdio/FreeBSD/findfp.c index 2621966..233ca39 100644 --- a/stdio/FreeBSD/findfp.c +++ b/stdio/FreeBSD/findfp.c @@ -13,10 +13,6 @@ * 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. @@ -34,11 +30,16 @@ * 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 -__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.29 2004/05/22 15:19:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.34 2009/12/05 19:31:38 ed Exp $"); + +#include #include #include @@ -46,34 +47,55 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.29 2004/05/22 15:19:41 tjr E #include #include #include +#include +#include +#include #include #include "libc_private.h" #include "local.h" #include "glue.h" -int __sdidinit; +pthread_once_t __sdidinit; +#if !TARGET_OS_IPHONE #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 */ +static int64_t __stream_max; -#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 */ +#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. */ /* 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]; +static struct __sFILEX __sFX[3] = {__sFXInit3, __sFXInit3, __sFXInit3}; /* - * 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. + * 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. */ FILE __sF[3] = { std(__SRD, STDIN_FILENO), @@ -81,55 +103,47 @@ FILE __sF[3] = { 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; +#else +struct glue __sglue = { NULL, 3, __sF }; +static struct glue *lastglue = &__sglue; +#endif 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 -#define SET_GLUE_PTR(ptr, val) ptr = val -#endif +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(n) - int n; +moreglue(int n) { struct glue *g; - static FILE empty; - static struct __sFILEX emptyx; FILE *p; struct __sFILEX *fx; + size_t align; - g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE) + + align = __alignof__( (struct { FILE f; struct __sFILEX s; }){} ); + g = (struct glue *)malloc(sizeof(*g) + align + n * sizeof(FILE) + n * sizeof(struct __sFILEX)); if (g == NULL) return (NULL); - p = (FILE *)ALIGN(g + 1); + p = (FILE *)roundup((uintptr_t)(g + 1), align); fx = (struct __sFILEX *)&p[n]; g->next = NULL; g->niobs = n; g->iobs = p; + while (--n >= 0) { - *p = empty; + bzero(p, sizeof(*p)); p->_extra = fx; - *p->_extra = emptyx; + INITEXTRA(p); p++, fx++; } return (g); @@ -139,33 +153,51 @@ moreglue(n) * Find a free FILE for fopen et al. */ FILE * -__sfp() +__sfp(int count) { FILE *fp; int n; struct glue *g; - if (!__sdidinit) - __sinit(); + pthread_once(&__sdidinit, __sinit); + + if (count) { + int64_t new = OSAtomicIncrement64(&__scounted); + if (new > __stream_max) { + /* Greater than the saved limit, check again with getrlimit. */ + if (new > (__stream_max = sysconf(_SC_STREAM_MAX))){ + OSAtomicDecrement64(&__scounted); + errno = EMFILE; + return NULL; + } + } + /* Overflowing #streams beyond RLIMIT_INFINITY */ + if (new < 0) { + errno = EOVERFLOW; + return NULL; + } + } /* * The list must be locked because a FILE may be updated. */ - THREAD_LOCK(); + FILELIST_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; } - THREAD_UNLOCK(); /* don't hold lock while malloc()ing. */ + FILELIST_UNLOCK(); /* don't hold lock while malloc()ing. */ if ((g = moreglue(NDYNAMIC)) == NULL) return (NULL); - THREAD_LOCK(); /* reacquire the lock */ - SET_GLUE_PTR(lastglue->next, g); /* atomically append glue to list */ + FILELIST_LOCK(); /* reacquire the lock */ + 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 */ - THREAD_UNLOCK(); + FILELIST_UNLOCK(); + + /* _flags = 1 means the FILE* is in use, and this thread owns the object while it is being initialized */ fp->_p = NULL; /* no current pointer */ fp->_w = 0; /* nothing to read or write */ fp->_r = 0; @@ -179,11 +211,30 @@ found: fp->_lb._base = NULL; /* no line buffer */ fp->_lb._size = 0; /* fp->_lock = NULL; */ /* once set always set (reused) */ - fp->_extra->orientation = 0; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + INITEXTRA(fp); + fp->_extra->counted = count ? 1 : 0; 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(); +} + /* * XXX. Force immediate allocation of internal memory. Not used by stdio, * but documented historically for certain applications. Bad applications. @@ -192,7 +243,7 @@ __warn_references(f_prealloc, "warning: this program uses f_prealloc(), which is not recommended."); void -f_prealloc() +f_prealloc(void) { struct glue *g; int n; @@ -206,10 +257,10 @@ f_prealloc() for (g = &__sglue; (n -= g->niobs) > 0 && g->next; g = g->next) /* void */; if ((n > 0) && ((g = moreglue(n)) != NULL)) { - THREAD_LOCK(); - SET_GLUE_PTR(lastglue->next, g); + FILELIST_LOCK(); + lastglue->next = g; lastglue = g; - THREAD_UNLOCK(); + FILELIST_UNLOCK(); } } @@ -221,7 +272,7 @@ f_prealloc() * The name `_cleanup' is, alas, fairly well known outside stdio. */ void -_cleanup() +_cleanup(void) { /* (void) _fwalk(fclose); */ (void) _fwalk(__sflush); /* `cheating' */ @@ -231,19 +282,23 @@ _cleanup() * __sinit() is called whenever stdio's internal variables must be set up. */ void -__sinit() +__sinit(void) { - int i; +#if !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) + int i; +#endif - 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 */ + __stream_max = sysconf(_SC_STREAM_MAX); + __scounted = 3; /* std{in,out,err} already exists */ - /* Make sure we clean up on exit. */ - __cleanup = _cleanup; /* conservative */ - __sdidinit = 1; +#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]); } - THREAD_UNLOCK(); +#endif } +#pragma clang diagnostic pop