diff options
| author |   guenther <guenther@openbsd.org> | 2009-10-21 16:04:23 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2009-10-21 16:04:23 +0000 |
| commit | 9962e7fd037872c423544f61cba1c901b045363a (patch) | |
| tree | ce799ea09983ba455c4a97b46913cf18ffa2a841 /lib/libc/stdio/local.h | |
| parent | "usage:" is lowercase; spacing. (diff) | |
| download | wireguard-openbsd-9962e7fd037872c423544f61cba1c901b045363a.tar.xz wireguard-openbsd-9962e7fd037872c423544f61cba1c901b045363a.zip | |
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.
ok kurt@, earlier version tested by sthen@ and jj@
Diffstat (limited to 'lib/libc/stdio/local.h')
| -rw-r--r-- | lib/libc/stdio/local.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h index e5863e5a604..5c5e878841f 100644 --- a/lib/libc/stdio/local.h +++ b/lib/libc/stdio/local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: local.h,v 1.12 2005/10/10 17:37:44 espie Exp $ */ +/* $OpenBSD: local.h,v 1.13 2009/10/21 16:04:23 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -42,6 +42,7 @@ #include "fileext.h" int __sflush(FILE *); +int __sflush_locked(FILE *); FILE *__sfp(void); int __srefill(FILE *); int __sread(void *, char *, int); @@ -56,6 +57,7 @@ int _fwalk(int (*)(FILE *)); int __swsetup(FILE *); int __sflags(const char *, int *); wint_t __fgetwc_unlock(FILE *); +int __vfprintf(FILE *, const char *, __va_list); extern void __atexit_register_cleanup(void (*)(void)); extern int __sdidinit; @@ -86,3 +88,6 @@ extern int __sdidinit; free((char *)(fp)->_lb._base); \ (fp)->_lb._base = NULL; \ } + +#define FLOCKFILE(fp) do { if (__isthreaded) flockfile(fp); } while (0) +#define FUNLOCKFILE(fp) do { if (__isthreaded) funlockfile(fp); } while (0) |