generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the handle locking in stdio

Browse Source 
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
This commit is contained in:
Kenny Root
2011-02-12 07:13:44 -08:00
parent 72f9a5c374
commit f582340a6a
36 changed files with 239 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libc/stdio/puts.c
View File

@@ -33,6 +33,7 @@
#include <stdio.h>
#include <string.h>
#include "local.h"
#include "fvwrite.h"
/*
@@ -44,6 +45,7 @@ puts(const char *s)
size_t c = strlen(s);
struct __suio uio;
struct __siov iov[2];
int ret;
iov[0].iov_base = (void *)s;
iov[0].iov_len = c;
@@ -52,5 +54,8 @@ puts(const char *s)
uio.uio_resid = c + 1;
uio.uio_iov = &iov[0];
uio.uio_iovcnt = 2;
return (__sfvwrite(stdout, &uio) ? EOF : '\n');
FLOCKFILE(stdout);
ret = __sfvwrite(stdout, &uio);
FUNLOCKFILE(stdout);
return (ret ? EOF : '\n');
}