From ec216c263498f3ab7c5554f5c5571125b57024b8 Mon Sep 17 00:00:00 2001 From: John Birrell Date: Sat, 11 Apr 1998 07:40:47 +0000 Subject: 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. --- lib/libc/stdio/fwrite.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'lib/libc/stdio/fwrite.c') diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c index ba8540d4af96..d2dadd838074 100644 --- a/lib/libc/stdio/fwrite.c +++ b/lib/libc/stdio/fwrite.c @@ -39,16 +39,13 @@ static char sccsid[] = "@(#)fwrite.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: fwrite.c,v 1.5 1997/02/22 15:02:10 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include #include "local.h" #include "fvwrite.h" -#ifdef _THREAD_SAFE -#include -#include "pthread_private.h" -#endif +#include "libc_private.h" /* * Write `count' objects (each size `size') from memory to the given file. @@ -69,9 +66,7 @@ fwrite(buf, size, count, fp) uio.uio_iov = &iov; uio.uio_iovcnt = 1; -#ifdef _THREAD_SAFE - _thread_flockfile(fp,__FILE__,__LINE__); -#endif + FLOCKFILE(fp); /* * The usual case is success (__sfvwrite returns 0); * skip the divide if this happens, since divides are @@ -79,8 +74,6 @@ fwrite(buf, size, count, fp) */ if (__sfvwrite(fp, &uio) != 0) count = (n - uio.uio_resid) / size; -#ifdef _THREAD_SAFE - _thread_funlockfile(fp); -#endif + FUNLOCKFILE(fp); return (count); } -- cgit v1.2.3