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/setvbuf.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/setvbuf.c')
| -rw-r--r-- | lib/libc/stdio/setvbuf.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c index 9cc6bb6..a0c6512 100644 --- a/lib/libc/stdio/setvbuf.c +++ b/lib/libc/stdio/setvbuf.c @@ -39,16 +39,13 @@ static char sccsid[] = "@(#)setvbuf.c 8.2 (Berkeley) 11/16/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: setvbuf.c,v 1.5 1997/02/22 15:02:27 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> #include <stdlib.h> #include "local.h" -#ifdef _THREAD_SAFE -#include <pthread.h> -#include "pthread_private.h" -#endif +#include "libc_private.h" /* * Set one of the three kinds of buffering, optionally including @@ -74,9 +71,7 @@ setvbuf(fp, buf, mode, size) if ((mode != _IOFBF && mode != _IOLBF) || (int)size < 0) return (EOF); -#ifdef _THREAD_SAFE - _thread_flockfile(fp,__FILE__,__LINE__); -#endif + FLOCKFILE(fp); /* * Write current buffer, if any. Discard unread input (including * ungetc data), cancel line buffering, and free old buffer if @@ -128,9 +123,7 @@ nbf: fp->_w = 0; fp->_bf._base = fp->_p = fp->_nbuf; fp->_bf._size = 1; -#ifdef _THREAD_SAFE - _thread_funlockfile(fp); -#endif + FUNLOCKFILE(fp); return (ret); } flags |= __SMBF; @@ -171,8 +164,6 @@ nbf: } __cleanup = _cleanup; -#ifdef _THREAD_SAFE - _thread_funlockfile(fp); -#endif + FUNLOCKFILE(fp); return (ret); } |
