split internal lock API out of libc.h, creating lock.h

this further reduces the number of source files which need to include
libc.h and thereby be potentially exposed to libc global state and
internals.

this will also facilitate further improvements like adding an inline
fast-path, if we want to do so later.

diff --git a/src/dirent/readdir_r.c b/src/dirent/readdir_r.c
index 6293a5146196420a9959275946168a1f2e42573e..e2a818f36a0c66b398e8b0fc1622859605e1c434 100644 (file)
--- a/src/dirent/readdir_r.c
+++ b/src/dirent/readdir_r.c
@@ -2,7 +2,7 @@
 #include <errno.h>
 #include <string.h>
 #include "__dirent.h"
-#include "libc.h"
+#include "lock.h"
 
 int readdir_r(DIR *restrict dir, struct dirent *restrict buf, struct dirent **restrict result)
 {

diff --git a/src/dirent/rewinddir.c b/src/dirent/rewinddir.c
index f2053008b36c2d8e0b35dd60676cbb0b455a813f..7ddda437213d182bd90b3aa119ca4a43720d6cfc 100644 (file)
--- a/src/dirent/rewinddir.c
+++ b/src/dirent/rewinddir.c
@@ -1,7 +1,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #include "__dirent.h"
-#include "libc.h"
+#include "lock.h"
 
 void rewinddir(DIR *dir)
 {

diff --git a/src/dirent/seekdir.c b/src/dirent/seekdir.c
index 5be47d4a15564178eb84e73a0d9a9569fd8b30b3..bf6cc6ec40453ed5a7bf4cffbfb5ef573e1ddc6e 100644 (file)
--- a/src/dirent/seekdir.c
+++ b/src/dirent/seekdir.c
@@ -1,7 +1,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #include "__dirent.h"
-#include "libc.h"
+#include "lock.h"
 
 void seekdir(DIR *dir, long off)
 {

diff --git a/src/exit/abort.c b/src/exit/abort.c
index 7c323d2670a7d43a3c43686712e87c081b77720c..e1980f10a5b6488a8a82a98a6a987e6db7997e3b 100644 (file)
--- a/src/exit/abort.c
+++ b/src/exit/abort.c
@@ -3,7 +3,7 @@
 #include "syscall.h"
 #include "pthread_impl.h"
 #include "atomic.h"
-#include "libc.h"
+#include "lock.h"
 #include "ksigaction.h"
 
 hidden volatile int __abort_lock[1];

diff --git a/src/exit/at_quick_exit.c b/src/exit/at_quick_exit.c
index 4079b242cf7dc40b550208f28b7a52d2390dd99f..d3ce6522df7dd810ee1014ae84a9ceaa08e66927 100644 (file)
--- a/src/exit/at_quick_exit.c
+++ b/src/exit/at_quick_exit.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include "libc.h"
+#include "lock.h"
 
 #define COUNT 32
 

diff --git a/src/exit/atexit.c b/src/exit/atexit.c
index cd3b0a648399f57f820abde2fecfdfece7a020e4..160d277aeb76a3837f856052ec9b93653eabdb2b 100644 (file)
--- a/src/exit/atexit.c
+++ b/src/exit/atexit.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include "libc.h"
+#include "lock.h"
 
 /* Ensure that at least 32 atexit handlers can be registered without malloc */
 #define COUNT 32

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 0a279184bb05cff52572af218a6ffe0f0de99e10..10bd66bdf686a2ea517b265c61ff49de36839d78 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -51,12 +51,6 @@ extern char *__progname, *__progname_full;
 
 extern hidden const char __libc_version[];
 
-/* Designed to avoid any overhead in non-threaded processes */
-hidden void __lock(volatile int *);
-hidden void __unlock(volatile int *);
-#define LOCK(x) __lock(x)
-#define UNLOCK(x) __unlock(x)
-
 hidden void __synccall(void (*)(void *), void *);
 hidden int __setxid(int, int, int, int);
 

diff --git a/src/internal/lock.h b/src/internal/lock.h
new file mode 100644 (file)
index 0000000..c77db6f
--- /dev/null
+++ b/src/internal/lock.h
@@ -0,0 +1,9 @@
+#ifndef LOCK_H
+#define LOCK_H
+
+hidden void __lock(volatile int *);
+hidden void __unlock(volatile int *);
+#define LOCK(x) __lock(x)
+#define UNLOCK(x) __unlock(x)
+
+#endif

diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c
index eefa31a818a8a9eb37da06d40fe985b1b1bdb1cd..7fbe7196c1732246ace3db69cae6f40bf6d56ef5 100644 (file)
--- a/src/locale/dcngettext.c
+++ b/src/locale/dcngettext.c
@@ -9,6 +9,7 @@
 #include "locale_impl.h"
 #include "atomic.h"
 #include "pleval.h"
+#include "lock.h"
 
 struct binding {
        struct binding *next;

diff --git a/src/locale/locale_map.c b/src/locale/locale_map.c
index e7b518a1a0c8394e66e30330af360f3752b0034f..2321bac0ea97c7ef695282429cba544d07194fcb 100644 (file)
--- a/src/locale/locale_map.c
+++ b/src/locale/locale_map.c
@@ -3,7 +3,7 @@
 #include <sys/mman.h>
 #include "locale_impl.h"
 #include "libc.h"
-#include "atomic.h"
+#include "lock.h"
 
 const char *__lctrans_impl(const char *msg, const struct __locale_map *lm)
 {

diff --git a/src/locale/setlocale.c b/src/locale/setlocale.c
index 60e3353c9a7ac962cf5c94fa9fcb2d59251829eb..11d823ce93997284450ae768d8c06139b574b159 100644 (file)
--- a/src/locale/setlocale.c
+++ b/src/locale/setlocale.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include "locale_impl.h"
 #include "libc.h"
-#include "atomic.h"
+#include "lock.h"
 
 static char buf[LC_ALL*(LOCALE_NAME_MAX+1)];
 

diff --git a/src/malloc/lite_malloc.c b/src/malloc/lite_malloc.c
index 49157d36515720ccacbb28dc9037de0c50e05fed..050d84f648bcc690f97d704ce7232089b9a256f0 100644 (file)
--- a/src/malloc/lite_malloc.c
+++ b/src/malloc/lite_malloc.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <limits.h>
 #include <errno.h>
-#include "libc.h"
+#include "lock.h"
 #include "malloc_impl.h"
 
 #define ALIGN 16

diff --git a/src/misc/syslog.c b/src/misc/syslog.c
index 410709d7eca47a27d79ba4006f9f726d7e696d50..13d4b0a6d7bc34f737eb9bb36d09bf0881f6b557 100644 (file)
--- a/src/misc/syslog.c
+++ b/src/misc/syslog.c
@@ -9,7 +9,7 @@
 #include <pthread.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "libc.h"
+#include "lock.h"
 
 static volatile int lock[1];
 static char log_ident[32];

diff --git a/src/prng/random.c b/src/prng/random.c
index 13a5e6df5f650d12802c589f0e5f49122a870625..633a17f6902fcf9e287c0ecbc921304513bf23a9 100644 (file)
--- a/src/prng/random.c
+++ b/src/prng/random.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <stdint.h>
-#include "libc.h"
+#include "lock.h"
 
 /*
 this code uses the same lagged fibonacci generator as the

diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 2adedaa4711cfcc69fb1b4980022b8121bf87c53..af47195e001376c2e5e870f410b71ae5f230bb25 100644 (file)
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -4,6 +4,7 @@
 #include "syscall.h"
 #include "pthread_impl.h"
 #include "libc.h"
+#include "lock.h"
 #include "ksigaction.h"
 
 volatile int dummy_lock[1] = { 0 };

diff --git a/src/stdio/ofl.c b/src/stdio/ofl.c
index 0e3602aa58e4dc2639d2075266b9da89a75751c1..f2d3215a9e7d7eec8f32351991f3ec8b4d270fc9 100644 (file)
--- a/src/stdio/ofl.c
+++ b/src/stdio/ofl.c
@@ -1,5 +1,5 @@
 #include "stdio_impl.h"
-#include "libc.h"
+#include "lock.h"
 
 static FILE *ofl_head;
 static volatile int ofl_lock[1];

diff --git a/src/thread/pthread_atfork.c b/src/thread/pthread_atfork.c
index c6f77b3f4fe73c626f9a1ee3ae5b2daa0175a424..764974016576d6fe816f89da88220e78b86f46af 100644 (file)
--- a/src/thread/pthread_atfork.c
+++ b/src/thread/pthread_atfork.c
@@ -1,5 +1,6 @@
 #include <pthread.h>
 #include "libc.h"
+#include "lock.h"
 
 static struct atfork_funcs {
        void (*prepare)(void);

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 23dfe0ad5ecc185e88b8daf7bb782257cb16c5e7..3293dcd543e58b740a6b5390622203c8adf62422 100644 (file)
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -2,6 +2,7 @@
 #include "pthread_impl.h"
 #include "stdio_impl.h"
 #include "libc.h"
+#include "lock.h"
 #include <sys/mman.h>
 #include <string.h>
 #include <stddef.h>

diff --git a/src/thread/pthread_getschedparam.c b/src/thread/pthread_getschedparam.c
index 05be42427c4503b5b6d7f1ab7a339a0d186aa641..1cba073d0c7d549023e2b5cc7faeb1ec8faa401e 100644 (file)
--- a/src/thread/pthread_getschedparam.c
+++ b/src/thread/pthread_getschedparam.c
@@ -1,4 +1,5 @@
 #include "pthread_impl.h"
+#include "lock.h"
 
 int pthread_getschedparam(pthread_t t, int *restrict policy, struct sched_param *restrict param)
 {

diff --git a/src/thread/pthread_kill.c b/src/thread/pthread_kill.c
index 6d70e626daf40bdf8e60240fc1fbb1b561d377dd..3d9395cb7e0a0b5797c962e4af2d22d95de93718 100644 (file)
--- a/src/thread/pthread_kill.c
+++ b/src/thread/pthread_kill.c
@@ -1,4 +1,5 @@
 #include "pthread_impl.h"
+#include "lock.h"
 
 int pthread_kill(pthread_t t, int sig)
 {

diff --git a/src/thread/pthread_setschedparam.c b/src/thread/pthread_setschedparam.c
index ab45f2ff8ba2e290241db7d0924e1e839bce8301..038d13d8acfb4cbd01aa573cd05c791fe2ef0b95 100644 (file)
--- a/src/thread/pthread_setschedparam.c
+++ b/src/thread/pthread_setschedparam.c
@@ -1,4 +1,5 @@
 #include "pthread_impl.h"
+#include "lock.h"
 
 int pthread_setschedparam(pthread_t t, int policy, const struct sched_param *param)
 {

diff --git a/src/thread/pthread_setschedprio.c b/src/thread/pthread_setschedprio.c
index c353f6b53942dc9d21066aba5948d83bb3d89b58..5bf4a0197e3abb9faac8b250733669126c814eab 100644 (file)
--- a/src/thread/pthread_setschedprio.c
+++ b/src/thread/pthread_setschedprio.c
@@ -1,4 +1,5 @@
 #include "pthread_impl.h"
+#include "lock.h"
 
 int pthread_setschedprio(pthread_t t, int prio)
 {

diff --git a/src/thread/sem_open.c b/src/thread/sem_open.c
index 1bd8020a7b7a544b15a9ad9bd99aae920cee57f9..de8555c5a6869ceda20c956cc6c8d1ea8470a138 100644 (file)
--- a/src/thread/sem_open.c
+++ b/src/thread/sem_open.c
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "libc.h"
+#include "lock.h"
 
 static struct {
        ino_t ino;

diff --git a/src/thread/synccall.c b/src/thread/synccall.c
index ba2f258e8161962a63a4f53a82ff3be04b0669e7..cc66bd2491089afb2b2dc3eb5ff50b8b7f89d3e8 100644 (file)
--- a/src/thread/synccall.c
+++ b/src/thread/synccall.c
@@ -7,6 +7,7 @@
 #include "futex.h"
 #include "atomic.h"
 #include "../dirent/__dirent.h"
+#include "lock.h"
 
 static struct chain {
        struct chain *next;

diff --git a/src/time/__tz.c b/src/time/__tz.c
index 6f5257fe36b7ae5652a0e148d955a2e2bc1fb3b4..51e665141b53209ae645be010cc636b5a69aeaa1 100644 (file)
--- a/src/time/__tz.c
+++ b/src/time/__tz.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <sys/mman.h>
 #include "libc.h"
+#include "lock.h"
 
 long  __timezone = 0;
 int   __daylight = 0;