diff options
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/amd64/SYS.h | 36 | ||||
| -rw-r--r-- | lib/libc/amd64/sys/pipe.S | 10 | ||||
| -rw-r--r-- | lib/libc/amd64/sys/sigreturn.S | 10 | ||||
| -rw-r--r-- | lib/libc/gen/ttyname.c | 3 | ||||
| -rw-r--r-- | lib/libc/i386/SYS.h | 36 | ||||
| -rw-r--r-- | lib/libc/i386/sys/fork.S | 10 | ||||
| -rw-r--r-- | lib/libc/i386/sys/pipe.S | 10 | ||||
| -rw-r--r-- | lib/libc/i386/sys/rfork.S | 10 | ||||
| -rw-r--r-- | lib/libc/i386/sys/sigpending.S | 10 | ||||
| -rw-r--r-- | lib/libc/i386/sys/sigreturn.S | 10 | ||||
| -rw-r--r-- | lib/libc/net/gethostnamadr.c | 25 | ||||
| -rw-r--r-- | lib/libc/stdtime/localtime.c | 12 |
12 files changed, 108 insertions, 74 deletions
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h index caea98f..c8a86f5 100644 --- a/lib/libc/amd64/SYS.h +++ b/lib/libc/amd64/SYS.h @@ -35,7 +35,7 @@ * * from: @(#)SYS.h 5.5 (Berkeley) 5/7/91 * - * $Id: SYS.h,v 1.3 1996/01/22 00:00:51 julian Exp $ + * $Id: SYS.h,v 1.4 1996/05/05 07:56:03 peter Exp $ */ #include <sys/syscall.h> @@ -64,20 +64,38 @@ #define SYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); ENTRY(x); lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b #define RSYSCALL(x) SYSCALL(x); ret +#define PSEUDO(x,y) ENTRY(x); lea __CONCAT(SYS_,y), %eax; KERNCALL; ret +#define CALL(x,y) call CNAME(y); addl $4*x,%esp +/* gas fucks up offset -- although we don't currently need it, do for BCS */ +#define LCALL(x,y) .byte 0x9a ; .long y; .word x + +/* + * Design note: + * + * The macros PSYSCALL() and PRSYSCALL() are intended for use where a + * syscall needs to be renamed in the threaded library. When building + * a normal library, they default to the traditional SYSCALL() and + * RSYSCALL(). This avoids the need to #ifdef _THREAD_SAFE everywhere + * that the renamed function needs to be called. + */ +#ifdef _THREAD_SAFE /* in case */ /* * For the thread_safe versions, we prepend _thread_sys_ to the function * name so that the 'C' wrapper can go around the real name. */ -#ifdef _THREAD_SAFE /* in case */ -#define PSYSCALL(x,y) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); ENTRY(y); lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b -#define PRSYSCALL(x,y) PSYSCALL(x,y); ret +#define PSYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); ENTRY(_thread_sys_/**/x); lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b +#define PRSYSCALL(x) PSYSCALL(x); ret +#define PPSEUDO(x,y) ENTRY(_thread_sys_/**/x); lea __CONCAT(SYS_,y), %eax; KERNCALL; ret +#else +/* + * The non-threaded library defaults to traditional syscalls where + * the function name matches the syscall name. + */ +#define PSYSCALL(x) SYSCALL(x) +#define PRSYSCALL(x) RSYSCALL(x) +#define PPSEUDO(x,y) PSEUDO(x,y) #endif -#define PSEUDO(x,y) ENTRY(x); lea __CONCAT(SYS_,y), %eax; KERNCALL; ret -#define CALL(x,y) call CNAME(y); addl $4*x,%esp -/* gas fucks up offset -- although we don't currently need it, do for BCS */ -#define LCALL(x,y) .byte 0x9a ; .long y; .word x - #ifdef __ELF__ #define KERNCALL int $0x80 /* Faster */ #else diff --git a/lib/libc/amd64/sys/pipe.S b/lib/libc/amd64/sys/pipe.S index 0dcf857..d52b189 100644 --- a/lib/libc/amd64/sys/pipe.S +++ b/lib/libc/amd64/sys/pipe.S @@ -33,21 +33,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pipe.S,v 1.3 1996/01/22 00:00:58 julian Exp $ + * $Id: pipe.S,v 1.4 1996/05/05 07:56:13 peter Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: pipe.S,v 1.3 1996/01/22 00:00:58 julian Exp $" + .asciz "$Id: pipe.S,v 1.4 1996/05/05 07:56:13 peter Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" -#ifdef _THREAD_SAFE -PSYSCALL(pipe,_thread_sys_pipe) -#else -SYSCALL(pipe) -#endif +PSYSCALL(pipe) movl 4(%esp),%ecx movl %eax,(%ecx) movl %edx,4(%ecx) diff --git a/lib/libc/amd64/sys/sigreturn.S b/lib/libc/amd64/sys/sigreturn.S index cce518b..c685b91 100644 --- a/lib/libc/amd64/sys/sigreturn.S +++ b/lib/libc/amd64/sys/sigreturn.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sigreturn.S,v 1.3 1996/01/22 00:01:00 julian Exp $ + * $Id: sigreturn.S,v 1.4 1996/05/05 07:56:19 peter Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: sigreturn.S,v 1.3 1996/01/22 00:01:00 julian Exp $" + .asciz "$Id: sigreturn.S,v 1.4 1996/05/05 07:56:19 peter Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" @@ -48,9 +48,5 @@ * must be saved. On FreeBSD, this is not the case. */ -#ifdef _THREAD_SAFE -PSYSCALL(sigreturn,_thread_sys_sigreturn) -#else -SYSCALL(sigreturn) -#endif +PSYSCALL(sigreturn) ret diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c index 7ec5429..7593850 100644 --- a/lib/libc/gen/ttyname.c +++ b/lib/libc/gen/ttyname.c @@ -49,7 +49,8 @@ static char sccsid[] = "@(#)ttyname.c 8.2 (Berkeley) 1/27/94"; #ifdef _THREAD_SAFE #include <pthread.h> #include "pthread_private.h" -static pthread_mutex_t ttyname_lock = PTHREAD_MUTEX_INITIALIZER; +static struct pthread_mutex _ttyname_lockd = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t ttyname_lock = &_ttyname_lockd; static pthread_key_t ttyname_key; static int ttyname_init = 0; diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h index caea98f..c8a86f5 100644 --- a/lib/libc/i386/SYS.h +++ b/lib/libc/i386/SYS.h @@ -35,7 +35,7 @@ * * from: @(#)SYS.h 5.5 (Berkeley) 5/7/91 * - * $Id: SYS.h,v 1.3 1996/01/22 00:00:51 julian Exp $ + * $Id: SYS.h,v 1.4 1996/05/05 07:56:03 peter Exp $ */ #include <sys/syscall.h> @@ -64,20 +64,38 @@ #define SYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); ENTRY(x); lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b #define RSYSCALL(x) SYSCALL(x); ret +#define PSEUDO(x,y) ENTRY(x); lea __CONCAT(SYS_,y), %eax; KERNCALL; ret +#define CALL(x,y) call CNAME(y); addl $4*x,%esp +/* gas fucks up offset -- although we don't currently need it, do for BCS */ +#define LCALL(x,y) .byte 0x9a ; .long y; .word x + +/* + * Design note: + * + * The macros PSYSCALL() and PRSYSCALL() are intended for use where a + * syscall needs to be renamed in the threaded library. When building + * a normal library, they default to the traditional SYSCALL() and + * RSYSCALL(). This avoids the need to #ifdef _THREAD_SAFE everywhere + * that the renamed function needs to be called. + */ +#ifdef _THREAD_SAFE /* in case */ /* * For the thread_safe versions, we prepend _thread_sys_ to the function * name so that the 'C' wrapper can go around the real name. */ -#ifdef _THREAD_SAFE /* in case */ -#define PSYSCALL(x,y) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); ENTRY(y); lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b -#define PRSYSCALL(x,y) PSYSCALL(x,y); ret +#define PSYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); ENTRY(_thread_sys_/**/x); lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b +#define PRSYSCALL(x) PSYSCALL(x); ret +#define PPSEUDO(x,y) ENTRY(_thread_sys_/**/x); lea __CONCAT(SYS_,y), %eax; KERNCALL; ret +#else +/* + * The non-threaded library defaults to traditional syscalls where + * the function name matches the syscall name. + */ +#define PSYSCALL(x) SYSCALL(x) +#define PRSYSCALL(x) RSYSCALL(x) +#define PPSEUDO(x,y) PSEUDO(x,y) #endif -#define PSEUDO(x,y) ENTRY(x); lea __CONCAT(SYS_,y), %eax; KERNCALL; ret -#define CALL(x,y) call CNAME(y); addl $4*x,%esp -/* gas fucks up offset -- although we don't currently need it, do for BCS */ -#define LCALL(x,y) .byte 0x9a ; .long y; .word x - #ifdef __ELF__ #define KERNCALL int $0x80 /* Faster */ #else diff --git a/lib/libc/i386/sys/fork.S b/lib/libc/i386/sys/fork.S index 96cb4b6..aae2ff9 100644 --- a/lib/libc/i386/sys/fork.S +++ b/lib/libc/i386/sys/fork.S @@ -33,21 +33,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: fork.S,v 1.3 1996/01/22 00:00:57 julian Exp $ + * $Id: fork.S,v 1.4 1996/05/05 07:56:13 peter Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: fork.S,v 1.3 1996/01/22 00:00:57 julian Exp $" + .asciz "$Id: fork.S,v 1.4 1996/05/05 07:56:13 peter Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" -#ifdef _THREAD_SAFE -PSYSCALL(fork,_thread_sys_fork) -#else -SYSCALL(fork) -#endif +PSYSCALL(fork) cmpl $0,%edx /* parent, since %edx == 0 in parent, 1 in child */ je 1f movl $0,%eax diff --git a/lib/libc/i386/sys/pipe.S b/lib/libc/i386/sys/pipe.S index 0dcf857..d52b189 100644 --- a/lib/libc/i386/sys/pipe.S +++ b/lib/libc/i386/sys/pipe.S @@ -33,21 +33,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pipe.S,v 1.3 1996/01/22 00:00:58 julian Exp $ + * $Id: pipe.S,v 1.4 1996/05/05 07:56:13 peter Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: pipe.S,v 1.3 1996/01/22 00:00:58 julian Exp $" + .asciz "$Id: pipe.S,v 1.4 1996/05/05 07:56:13 peter Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" -#ifdef _THREAD_SAFE -PSYSCALL(pipe,_thread_sys_pipe) -#else -SYSCALL(pipe) -#endif +PSYSCALL(pipe) movl 4(%esp),%ecx movl %eax,(%ecx) movl %edx,4(%ecx) diff --git a/lib/libc/i386/sys/rfork.S b/lib/libc/i386/sys/rfork.S index c1e85e6..3411357 100644 --- a/lib/libc/i386/sys/rfork.S +++ b/lib/libc/i386/sys/rfork.S @@ -33,21 +33,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rfork.S,v 1.1 1996/02/23 19:56:47 peter Exp $ + * $Id: rfork.S,v 1.2 1996/05/05 07:56:15 peter Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: rfork.S,v 1.1 1996/02/23 19:56:47 peter Exp $" + .asciz "$Id: rfork.S,v 1.2 1996/05/05 07:56:15 peter Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" -#ifdef _THREAD_SAFE -PSYSCALL(rfork,_thread_sys_rfork) -#else -SYSCALL(rfork) -#endif +PSYSCALL(rfork) cmpl $0,%edx /* parent, since %edx == 0 in parent, 1 in child */ je 1f movl $0,%eax diff --git a/lib/libc/i386/sys/sigpending.S b/lib/libc/i386/sys/sigpending.S index a56c8f7..938a069 100644 --- a/lib/libc/i386/sys/sigpending.S +++ b/lib/libc/i386/sys/sigpending.S @@ -33,21 +33,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sigpending.S,v 1.3 1996/01/22 00:00:59 julian Exp $ + * $Id: sigpending.S,v 1.4 1996/05/05 07:56:18 peter Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: sigpending.S,v 1.3 1996/01/22 00:00:59 julian Exp $" + .asciz "$Id: sigpending.S,v 1.4 1996/05/05 07:56:18 peter Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" -#ifdef _THREAD_SAFE -PSYSCALL(sigpending,_thread_sys_sigpending) -#else -SYSCALL(sigpending) -#endif +PSYSCALL(sigpending) movl 4(%esp),%ecx # fetch pointer to... movl %eax,(%ecx) # store old mask xorl %eax,%eax diff --git a/lib/libc/i386/sys/sigreturn.S b/lib/libc/i386/sys/sigreturn.S index cce518b..c685b91 100644 --- a/lib/libc/i386/sys/sigreturn.S +++ b/lib/libc/i386/sys/sigreturn.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sigreturn.S,v 1.3 1996/01/22 00:01:00 julian Exp $ + * $Id: sigreturn.S,v 1.4 1996/05/05 07:56:19 peter Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: sigreturn.S,v 1.3 1996/01/22 00:01:00 julian Exp $" + .asciz "$Id: sigreturn.S,v 1.4 1996/05/05 07:56:19 peter Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" @@ -48,9 +48,5 @@ * must be saved. On FreeBSD, this is not the case. */ -#ifdef _THREAD_SAFE -PSYSCALL(sigreturn,_thread_sys_sigreturn) -#else -SYSCALL(sigreturn) -#endif +PSYSCALL(sigreturn) ret diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c index fff18cb..d274365 100644 --- a/lib/libc/net/gethostnamadr.c +++ b/lib/libc/net/gethostnamadr.c @@ -24,8 +24,8 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)$Id: gethostnamadr.c,v 1.7 1995/05/30 05:40:45 rgrimes Exp $"; -static char rcsid[] = "$Id: gethostnamadr.c,v 1.7 1995/05/30 05:40:45 rgrimes Exp $"; +static char sccsid[] = "@(#)$Id: gethostnamadr.c,v 1.8 1996/07/12 18:54:36 jkh Exp $"; +static char rcsid[] = "$Id: gethostnamadr.c,v 1.8 1996/07/12 18:54:36 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -184,6 +184,27 @@ gethostbyaddr(const char *addr, int len, int type) return hp; } +#ifdef _THREAD_SAFE +struct hostent_data; + +/* + * Temporary function (not thread safe) + */ +int gethostbyaddr_r(const char *addr, int len, int type, + struct hostent *result, struct hostent_data *buffer) +{ + struct hostent *hp = 0; + int ret; + if ((hp = gethostbyaddr(addr, len, type)) == NULL) { + ret = -1; + } else { + memcpy(result, hp, sizeof(struct hostent)); + ret = 0; + } + return(ret); +} +#endif + void sethostent(stayopen) int stayopen; diff --git a/lib/libc/stdtime/localtime.c b/lib/libc/stdtime/localtime.c index ecb201b..ae302ec 100644 --- a/lib/libc/stdtime/localtime.c +++ b/lib/libc/stdtime/localtime.c @@ -168,8 +168,10 @@ static char lcl_TZname[TZ_STRLEN_MAX + 1]; static int lcl_is_set; static int gmt_is_set; #ifdef _THREAD_SAFE -static pthread_mutex_t lcl_mutex = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t gmt_mutex = PTHREAD_MUTEX_INITIALIZER; +static struct pthread_mutex _lcl_mutexd = PTHREAD_MUTEX_INITIALIZER; +static struct pthread_mutex _gmt_mutexd = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t lcl_mutex = &_lcl_mutexd; +static pthread_mutex_t gmt_mutex = &_gmt_mutexd; #endif char * tzname[2] = { @@ -1087,7 +1089,8 @@ localtime(timep) const time_t * const timep; { #ifdef _THREAD_SAFE - static pthread_mutex_t localtime_mutex = PTHREAD_MUTEX_INITIALIZER; + static struct pthread_mutex _localtime_mutex = PTHREAD_MUTEX_INITIALIZER; + static pthread_mutex_t localtime_mutex = &_localtime_mutex; static pthread_key_t localtime_key = -1; struct tm *p_tm; @@ -1170,7 +1173,8 @@ gmtime(timep) const time_t * const timep; { #ifdef _THREAD_SAFE - static pthread_mutex_t gmtime_mutex = PTHREAD_MUTEX_INITIALIZER; + static struct pthread_mutex _gmtime_mutex = PTHREAD_MUTEX_INITIALIZER; + static pthread_mutex_t gmtime_mutex = &_gmtime_mutex; static pthread_key_t gmtime_key = -1; struct tm *p_tm; |
