diff options
| author | jb <jb@FreeBSD.org> | 1998-04-11 07:40:47 +0000 |
|---|---|---|
| committer | jb <jb@FreeBSD.org> | 1998-04-11 07:40:47 +0000 |
| commit | 0ff63017b40dda207b2aadc9881e0c93e7fd2753 (patch) | |
| tree | 4819eff8a5c9bc5ae04aaf772d0d5b4f7bfaaebc /lib/libc/stdio/fclose.c | |
| parent | 525c97c21dbcb3fd61a8a530a3f8df5e901bf1ab (diff) | |
| download | FreeBSD-src-0ff63017b40dda207b2aadc9881e0c93e7fd2753.zip FreeBSD-src-0ff63017b40dda207b2aadc9881e0c93e7fd2753.tar.gz | |
Add FILE locking stubs for libc.
Change the FILE locking to support kernel threads when linked with
libpthread (which you haven't see yet). This requires that libc become
thread-safe and thread-aware, testing __isthreaded before attempting
to do lock/unlock calls. The impact on non-threaded programs is minor.
This change works with libc_r, so it's the best compromise.
Diffstat (limited to 'lib/libc/stdio/fclose.c')
| -rw-r--r-- | lib/libc/stdio/fclose.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c index 1104bd0..5919ce0 100644 --- a/lib/libc/stdio/fclose.c +++ b/lib/libc/stdio/fclose.c @@ -39,17 +39,14 @@ static char sccsid[] = "@(#)fclose.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: fclose.c,v 1.5 1997/02/22 15:01:47 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include <errno.h> #include <stdio.h> #include <stdlib.h> #include "local.h" -#ifdef _THREAD_SAFE -#include <pthread.h> -#include "pthread_private.h" -#endif +#include "libc_private.h" int fclose(fp) @@ -61,9 +58,7 @@ fclose(fp) errno = EBADF; return (EOF); } -#ifdef _THREAD_SAFE - _thread_flockfile(fp,__FILE__,__LINE__); -#endif + FLOCKFILE(fp); r = fp->_flags & __SWR ? __sflush(fp) : 0; if (fp->_close != NULL && (*fp->_close)(fp->_cookie) < 0) r = EOF; @@ -73,9 +68,7 @@ fclose(fp) FREEUB(fp); if (HASLB(fp)) FREELB(fp); -#ifdef _THREAD_SAFE - _thread_funlockfile(fp); -#endif + FUNLOCKFILE(fp); fp->_flags = 0; /* Release this FILE for reuse. */ fp->_file = -1; fp->_r = fp->_w = 0; /* Mess up if reaccessed. */ |
