major bump to libc and libpthread to break the dependency of a

particular implementation of libpthread for libc.  libc no longer
needs pthread.h to compile.
OK millert@, brad@, tedu@

4 files changed, 84 insertions, 96 deletions

diff --git a/src/lib/libc/include/thread_private.h b/src/lib/libc/include/thread_private.h
index 4212e7dcb2..edac6b008d 100644
--- a/src/lib/libc/include/thread_private.h
+++ b/src/lib/libc/include/thread_private.h
@@ -1,13 +1,19 @@
-/* $OpenBSD: thread_private.h,v 1.15 2003/01/28 04:58:00 marc Exp $ */
+/* $OpenBSD: thread_private.h,v 1.16 2004/06/07 21:11:23 marc Exp $ */
+
+/* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */
 
 #ifndef _THREAD_PRIVATE_H_
 #define _THREAD_PRIVATE_H_
 
-#include <pthread.h>
+/*
+ * This file defines the thread library interface to libc.  Thread
+ * libraries must implement the functions described here for proper
+ * inter-operation with libc.   libc contains weak versions of the
+ * described functions for operation in a non-threaded environment.
+ */
 
 /*
- * This variable is initially 0 when there is exactly one thread.
- * It should never decrease.
+ * This variable is 0 until a second thread is created.
  */
 extern int __isthreaded;
 
@@ -19,116 +25,102 @@ extern int __isthreaded;
  *     WEAK_ALIAS(n) to generate the weak symbol n pointing to _weak_n,
  *     WEAK_PROTOTYPE(n) to generate a prototype for _weak_n (based on n).
  */
-#define WEAK_NAME(name)                 __CONCAT(_weak_,name)
-#define WEAK_ALIAS(name)                __weak_alias(name, WEAK_NAME(name))
+#define WEAK_NAME(name)         __CONCAT(_weak_,name)
+#define WEAK_ALIAS(name)        __weak_alias(name, WEAK_NAME(name))
 #ifdef __GNUC__
-#define WEAK_PROTOTYPE(name)            __typeof__(name) WEAK_NAME(name)
+#define WEAK_PROTOTYPE(name)    __typeof__(name) WEAK_NAME(name)
 #else
-#define WEAK_PROTOTYPE(name)            /* typeof() only in gcc */
+#define WEAK_PROTOTYPE(name)    /* typeof() only in gcc */
 #endif
 
 /*
- * These macros help in making persistent storage thread-specific.
- * Libc makes extensive use of private static data structures
- * that hold state across function invocation, and these macros
- * are no-ops when running single-threaded.
- *
- * Linking against the user-thread library causes these macros to
- * allocate storage on a per-thread basis.
+ * helper macro to make unique names in the thread namespace
  */
-        
-#define __THREAD_MUTEX_NAME(name)       __CONCAT(_libc_storage_mutex_,name)
-#define __THREAD_KEY_NAME(name)         __CONCAT(_libc_storage_key_,name)
-
-struct _thread_private_key_struct {
-        pthread_once_t          once;
-        void                    (*cleanfn)(void *);
-        pthread_key_t           key;
-};
-
-void    _libc_private_storage_lock(pthread_mutex_t *);
-void    _libc_private_storage_unlock(pthread_mutex_t *);
-void *  _libc_private_storage(volatile struct _thread_private_key_struct *,
-                              void *, size_t, void *);
-
-/* Declare a module mutex. */
-#define _THREAD_PRIVATE_MUTEX(name)                                     \
-        static pthread_mutex_t __THREAD_MUTEX_NAME(name) =              \
-                PTHREAD_MUTEX_INITIALIZER                       
-                
-/* Lock a module mutex against use by any other threads. */
-#define _THREAD_PRIVATE_MUTEX_LOCK(name)                                \
-        _libc_private_storage_lock(&__THREAD_MUTEX_NAME(name))
-                
-/* Unlock a module mutex. */
-#define _THREAD_PRIVATE_MUTEX_UNLOCK(name)                              \
-        _libc_private_storage_unlock(&__THREAD_MUTEX_NAME(name))
-
-/* Declare a thread-private storage key. */
-#define _THREAD_PRIVATE_KEY(name)                                       \
-        static volatile struct _thread_private_key_struct               \
-        __THREAD_KEY_NAME(name) = {                                     \
-                PTHREAD_ONCE_INIT,                                      \
-                0                                                       \
-        }
+#define __THREAD_NAME(name)     __CONCAT(_thread_tagname_,name)
 
 /*
- * In threaded mode, return a pointer to thread-private memory of
- * the same size as, and (initially) with the same contents as 'storage'. If
- * an error occurs, the 'error' parameter is returned.
- * In single-threaded mode, no storage is allocated. Instead, a pointer
- * to storage is always returned.
- * The 'cleanfn' function of the key structure is called to free the storage.
- * If 'cleanfn' is NULL, then free() is used. This hook can be useful for
- * getting rid of memory leaks.
+ * helper functions that exist as (weak) null functions in libc and
+ * (strong) functions in the thread library.   These functions:
+ *
+ * _thread_tag_lock:
+ *      lock the mutex associated with the given tag.   If the given
+ *      tag is NULL a tag is first allocated.
+ *
+ * _thread_tag_unlock:
+ *      unlock the mutex associated with the given tag.   If the given
+ *      tag is NULL a tag is first allocated.
+ *
+ * _thread_tag_storage:
+ *      return a pointer to per thread instance of data associated
+ *      with the given tag.  If the given tag is NULL a tag is first
+ *      allocated.
  */
-#define _THREAD_PRIVATE(keyname, storage, error)                        \
-        _libc_private_storage(&__THREAD_KEY_NAME(keyname),              \
-                              &(storage), sizeof (storage), error)
+void    _thread_tag_lock(void **);
+void    _thread_tag_unlock(void **);
+void   *_thread_tag_storage(void **, void *, size_t, void *);
 
 /*
- * Keys used to access the per thread instances of resolver global data.
- * These are not static as they are referenced in several places.
+ * Macros used in libc to access thread mutex, keys, and per thread storage.
+ * _THREAD_PRIVATE_KEY and _THREAD_PRIVATE_MUTEX are different macros for
+ * historical reasons.   They do the same thing, define a static variable
+ * keyed by 'name' that identifies a mutex and a key to identify per thread
+ * data.
  */
-extern volatile struct _thread_private_key_struct __THREAD_KEY_NAME(_res);
-#ifdef INET6
-extern volatile struct _thread_private_key_struct __THREAD_KEY_NAME(_res_ext);
-#endif
+#define _THREAD_PRIVATE_KEY(name)                                       \
+        static void *__THREAD_NAME(name)
+#define _THREAD_PRIVATE_MUTEX(name)                                     \
+        static void *__THREAD_NAME(name)
+#define _THREAD_PRIVATE_MUTEX_LOCK(name)                                \
+        _thread_tag_lock(&(__THREAD_NAME(name)))
+#define _THREAD_PRIVATE_MUTEX_UNLOCK(name)                              \
+        _thread_tag_unlock(&(__THREAD_NAME(name)))
+#define _THREAD_PRIVATE(keyname, storage, error)                        \
+        _thread_tag_storage(&(__THREAD_NAME(keyname)), &(storage),      \
+                            sizeof (storage), error)
+/*
+ * Resolver code is special cased in that it uses global keys.
+ */
+extern void *__THREAD_NAME(_res);
+extern void *__THREAD_NAME(_res_ext);
+extern void *__THREAD_NAME(serv_mutex);
 
 /*
  * File descriptor locking definitions.
  */
-#define FD_READ             0x1
-#define FD_WRITE            0x2
-#define FD_RDWR             (FD_READ | FD_WRITE)
+#define FD_READ         0x1
+#define FD_WRITE        0x2
+#define FD_RDWR         (FD_READ | FD_WRITE)
+
+int     _thread_fd_lock(int, int, struct timespec *);
+void    _thread_fd_unlock(int, int);
 
-#define _FD_LOCK(_fd,_type,_ts)                                         \
-                _thread_fd_lock(_fd, _type, _ts, __FILE__, __LINE__)
-#define _FD_UNLOCK(_fd,_type)                                           \
-                _thread_fd_unlock(_fd, _type, __FILE__, __LINE__)
+/*
+ * Macros are used in libc code for historical (debug) reasons.
+ * Define them here.
+ */
+#define _FD_LOCK(_fd,_type,_ts) _thread_fd_lock(_fd, _type, _ts)
+#define _FD_UNLOCK(_fd,_type)   _thread_fd_unlock(_fd, _type)
 
-int     _thread_fd_lock(int, int, struct timespec *, const char *, int);
-void    _thread_fd_unlock(int, int, const char *, int);
 
 /*
- * malloc lock/unlock definitions
+ * malloc lock/unlock prototypes and definitions
  */
-# define _MALLOC_LOCK()         do {                                    \
+void    _thread_malloc_init(void);
+void    _thread_malloc_lock(void);
+void    _thread_malloc_unlock(void);
+
+#define _MALLOC_LOCK()          do {                                    \
                                         if (__isthreaded)               \
                                                 _thread_malloc_lock();  \
                                 } while (0)
-# define _MALLOC_UNLOCK()       do {                                    \
+#define _MALLOC_UNLOCK()        do {                                    \
                                         if (__isthreaded)               \
                                                 _thread_malloc_unlock();\
                                 } while (0)
-# define _MALLOC_LOCK_INIT()do {                                        \
+#define _MALLOC_LOCK_INIT()     do {                                    \
                                         if (__isthreaded)               \
                                                 _thread_malloc_init();\
                                 } while (0)
 
 
-void    _thread_malloc_init(void);
-void    _thread_malloc_lock(void);
-void    _thread_malloc_unlock(void);
-
 #endif /* _THREAD_PRIVATE_H_ */
diff --git a/src/lib/libc/net/getaddrinfo.c b/src/lib/libc/net/getaddrinfo.c
index 8fb8975ad8..3db8cc82ee 100644
--- a/src/lib/libc/net/getaddrinfo.c
+++ b/src/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getaddrinfo.c,v 1.49 2004/04/14 07:06:15 itojun Exp $ */
+/*      $OpenBSD: getaddrinfo.c,v 1.50 2004/06/07 21:11:23 marc Exp $   */
 /*      $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $    */
 
 /*
@@ -873,7 +873,7 @@ get_port(ai, servname, matchonly)
         int port;
         int allownumeric;
         /* mutex is defined in getnameinfo.c */
-        extern pthread_mutex_t __THREAD_MUTEX_NAME(serv_mutex);
+        extern void *__THREAD_NAME(serv_mutex);
 
         if (servname == NULL)
                 return 0;
diff --git a/src/lib/libc/net/getnameinfo.c b/src/lib/libc/net/getnameinfo.c
index da5df507ab..62760e178d 100644
--- a/src/lib/libc/net/getnameinfo.c
+++ b/src/lib/libc/net/getnameinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getnameinfo.c,v 1.27 2003/07/21 23:17:53 marc Exp $   */
+/*      $OpenBSD: getnameinfo.c,v 1.28 2004/06/07 21:11:23 marc Exp $   */
 /*      $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $    */
 
 /*
@@ -91,7 +91,7 @@ static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
 /*
  * this mutex is also used by get_port in getaddrinfo.c
  */
-pthread_mutex_t __THREAD_MUTEX_NAME(serv_mutex) = PTHREAD_MUTEX_INITIALIZER;
+void *__THREAD_NAME(serv_mutex);
 
 int
 getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
diff --git a/src/lib/libc/net/res_init.c b/src/lib/libc/net/res_init.c
index 9c73958883..79ccada6ee 100644
--- a/src/lib/libc/net/res_init.c
+++ b/src/lib/libc/net/res_init.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_init.c,v 1.29 2003/06/02 20:18:36 millert Exp $   */
+/*      $OpenBSD: res_init.c,v 1.30 2004/06/07 21:11:23 marc Exp $      */
 
 /*
  * ++Copyright++ 1985, 1989, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_init.c  8.1 (Berkeley) 6/7/93";
 static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_init.c,v 1.29 2003/06/02 20:18:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.30 2004/06/07 21:11:23 marc Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -118,9 +118,7 @@ static u_int32_t net_mask(struct in_addr);
 /*
  * Resolver state default settings.
  */
-volatile struct _thread_private_key_struct __THREAD_KEY_NAME(_res) = {
-        PTHREAD_ONCE_INIT, 0
-};
+void *__THREAD_NAME(_res);
 
 struct __res_state _res
 # if defined(__BIND_RES_TEXT)
@@ -128,9 +126,7 @@ struct __res_state _res
 # endif
         ;
 #ifdef INET6
-volatile struct _thread_private_key_struct __THREAD_KEY_NAME(_res_ext) = {
-        PTHREAD_ONCE_INIT, 0
-};
+void *__THREAD_NAME(_res_ext);
 
 struct __res_state_ext _res_ext;
 #endif /* INET6 */