aboutsummaryrefslogtreecommitdiffstats
path: root/libc/stdio/putc.c
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2011-02-12 07:13:44 -0800
committerKenny Root <kroot@google.com>2011-02-14 09:32:56 -0800
commitf582340a6a48588aa50da17e1620e8f91b146941 (patch)
treed30c0ffb648b7a43ff469f89f05850f5008482ec /libc/stdio/putc.c
parent72f9a5c374bf559e9c69a62c1d95304f913ef6b2 (diff)
downloadandroid_bionic-f582340a6a48588aa50da17e1620e8f91b146941.tar.gz
android_bionic-f582340a6a48588aa50da17e1620e8f91b146941.tar.bz2
android_bionic-f582340a6a48588aa50da17e1620e8f91b146941.zip
Fix the handle locking in stdio
Fix the handle locking in stdio to use flockfile/funlockfile internally when and where required. Macros in <stdio.h> are updated to automatically call the underlying functions when the process is threaded to obtain the necessary locking. A private mutex is added to protect __sglue, the internal list of FILE handles, and another to protect the one-time initialization. Some routines in libc that use getc() change to use getc_unlocked() as they're either protected by their own lock or aren't thread-safe routines anyway. Based on OpenBSD change by guenther@openbsd.org http://www.mail-archive.com/source-changes@cvs.openbsd.org/msg01015.html Bug: 3446659 Change-Id: Ie82116e358c541718d6709ec45ca6796be5a007b
Diffstat (limited to 'libc/stdio/putc.c')
-rw-r--r--libc/stdio/putc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/stdio/putc.c b/libc/stdio/putc.c
index 925021549..2b0550466 100644
--- a/libc/stdio/putc.c
+++ b/libc/stdio/putc.c
@@ -60,8 +60,8 @@ putc(int c, FILE *fp)
{
int ret;
- flockfile(fp);
+ FLOCKFILE(fp);
ret = putc_unlocked(c, fp);
- funlockfile(fp);
+ FUNLOCKFILE(fp);
return (ret);
}