mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-07 22:58:11 +00:00
Code Issues Releases Activity
644256cc6e
freebsd-ports/devel/linuxthreads/files/patch-aa

1463 lines
46 KiB
Plaintext
Raw Normal View History

Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
diff -ru ./Examples/Makefile ../linuxthreads-2.1.2/Examples/Makefile
--- ./Examples/Makefile Wed Mar 11 04:42:23 1998
+++ ../linuxthreads-2.1.2/Examples/Makefile Wed Dec 8 18:48:35 1999
@@ -1,8 +1,13 @@
CC=gcc
-CFLAGS=-g -O -Wall -I.. -D_REENTRANT
-LIBPTHREAD=../libpthread.a
+CFLAGS := -g -O -Wall
+CFLAGS += -I../sysdeps/${MACHINE_ARCH}
+CFLAGS += -I../sysdeps/pthread
+CFLAGS += -I../sysdeps/unix/sysv/linux
+CFLAGS += -D_REENTRANT
-PROGS=ex1 ex2 ex3 ex4 ex5 proxy
+LIBPTHREAD=../liblthread.a
+
+PROGS=ex1 ex2 ex3 ex4 ex5 ex6
all: $(PROGS)
diff -ru ./Makefile ../linuxthreads-2.1.2/Makefile
--- ./Makefile Fri Jul 9 21:00:32 1999
+++ ../linuxthreads-2.1.2/Makefile Mon Dec 13 15:05:25 1999
@@ -1,68 +1,72 @@
-# Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-# This file is part of the GNU C Library.
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+LIB=lthread
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+SHLIB_MAJOR= 2
+SHLIB_MINOR= 1
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
+.if !defined(MACHINE_ARCH)
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+MACHINE_ARCH != /usr/bin/uname -m
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+.endif
+
+.if !defined(LIBSRC_BASE)
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+LIBSRC_BASE = /usr/src/lib
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+.endif
+
+.if !defined(PREFIX)
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+PREFIX = /usr/local
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+.endif
+
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+LIBDIR = ${PREFIX}/lib
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+CFLAGS +=-Wall
+#CFLAGS +=-g -O0 -Wall -DDEBUG
+CFLAGS +=-DCOMPILING_LINUXTHREADS
+#CFLAGS += -D__NO_WEAK_PTHREAD_ALIASES
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+CFLAGS += -I${.CURDIR}
+CFLAGS += -I${.CURDIR}/sysdeps/${MACHINE_ARCH}
+CFLAGS += -I${.CURDIR}/sysdeps/pthread
+CFLAGS += -I${.CURDIR}/sysdeps/unix/sysv/linux
+CFLAGS += -I${LIBSRC_BASE}/libc/stdtime
+CFLAGS += -I${LIBSRC_BASE}/libc/${MACHINE_ARCH}
+CFLAGS += -DLIBC_RCS
+CFLAGS += -DLINUXTHREADS
+CFLAGS += -D__USE_UNIX98
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+AINC = -I${LIBSRC_BASE}/libc/${MACHINE_ARCH} -I${.CURDIR}/sysdeps/${MACHINE_ARCH}
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+# Contents of the library.
+SRCS := _atomic_lock.S attr.c cancel.c clone.S condvar.c errno.c getgr_r.c \
+ join.c lclone.c libc_calls.c libc_spinlock.c libc_thread.c lockfile.c \
+ manager.c mutex.c pt-machine.c ptfork.c pthread.c ptlongjmp.c rwlock.c \
+ sched.c semaphore.c signals.c specific.c spinlock.c uthread_file.c \
+ weaks.c wrapsyscall.
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
+beforeinstall:
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+ ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 0755 \
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+ ${PREFIX}/include/pthread/linuxthreads
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${.CURDIR}/sysdeps/pthread/pthread.h \
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+ ${PREFIX}/include/pthread/linuxthreads/pthread.h
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${.CURDIR}/semaphore.h \
+ ${PREFIX}/include/pthread/linuxthreads/semaphore.h
+ ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 0755 \
+ ${PREFIX}/include/pthread/linuxthreads/bits
+.for hdr in libc-lock.h libc-tsd.h pthreadtypes.h stdio-lock.h
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${.CURDIR}/sysdeps/pthread/bits/$(hdr) \
+ ${PREFIX}/include/pthread/linuxthreads/bits/$(hdr)
+.endfor
+.for hdr in local_lim.h posix_opt.h sigthread.h
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${.CURDIR}/sysdeps/unix/sysv/linux/bits/$(hdr) \
+ ${PREFIX}/include/pthread/linuxthreads/bits/$(hdr)
+.endfor
+.for hdr in pt-machine.h useldt.h
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${.CURDIR}/sysdeps/i386/$(hdr) \
+ ${PREFIX}/include/pthread/linuxthreads/$(hdr)
+.endfor
+ ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 0755 ${PREFIX}/lib
-# The GNU C Library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-# The GNU C Library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-# You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-#
-# Sub-makefile for linuxthreads portion of the library.
-#
-subdir := linuxthreads
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-linuxthreads-version := $(shell sed -n 's/^.*$(subdir)-\([0-9.]*\).*$$/\1/p' \
- Banner)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-headers := pthread.h semaphore.h
-distribute := internals.h queue.h restart.h spinlock.h
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-routines := weaks no-tsd
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-extra-libs := libpthread
-extra-libs-others := $(extra-libs)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-libpthread-routines := attr cancel condvar join manager mutex ptfork \
- ptlongjmp pthread signals specific errno lockfile \
- semaphore spinlock wrapsyscall rwlock pt-machine \
- oldsemaphore
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-vpath %.c Examples
-tests = ex1 ex2 ex3 ex4 ex5 ex6
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-include ../Rules
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-CFLAGS-mutex.c += -D__NO_WEAK_PTHREAD_ALIASES
-CFLAGS-specific.c += -D__NO_WEAK_PTHREAD_ALIASES
-CFLAGS-pthread.c += -D__NO_WEAK_PTHREAD_ALIASES
-CFLAGS-ptfork.c += -D__NO_WEAK_PTHREAD_ALIASES
-CFLAGS-cancel.c += -D__NO_WEAK_PTHREAD_ALIASES
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
-
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
-# This ensures they will load libc.so for needed symbols if loaded by
-# a statically-linked program that hasn't already loaded it.
-$(objpfx)libpthread.so: $(common-objpfx)libc.so
-
-# Make sure we link with the thread library.
-ifeq ($(build-shared),yes)
-libpthread = $(objpfx)libpthread.so
-else
-libpthread = $(objpfx)libpthread.a
-endif
-
-$(objpfx)ex1: $(libpthread)
-$(objpfx)ex2: $(libpthread)
-$(objpfx)ex3: $(libpthread)
-$(objpfx)ex4: $(libpthread)
-$(objpfx)ex5: $(libpthread)
-$(objpfx)ex6: $(libpthread)
+
+.include <bsd.lib.mk>
Only in ../linuxthreads-2.1.2: Makefile~
Only in ../linuxthreads-2.1.2: _atomic_lock.S
diff -ru ./attr.c ../linuxthreads-2.1.2/attr.c
--- ./attr.c Tue Oct 27 05:51:54 1998
+++ ../linuxthreads-2.1.2/attr.c Mon Dec 6 13:01:21 1999
@@ -21,9 +21,9 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
#include "pthread.h"
#include "internals.h"
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-int __pthread_attr_init_2_1(pthread_attr_t *attr)
+int __pthread_attr_init(pthread_attr_t *attr)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- size_t ps = __getpagesize ();
+ size_t ps = getpagesize ();
attr->__detachstate = PTHREAD_CREATE_JOINABLE;
attr->__schedpolicy = SCHED_OTHER;
@@ -36,6 +36,7 @@
attr->__stacksize = STACK_SIZE - ps;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
return 0;
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+#if (0)
#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING
default_symbol_version (__pthread_attr_init_2_1, pthread_attr_init, GLIBC_2.1);
@@ -52,6 +53,7 @@
#else
strong_alias (__pthread_attr_init_2_1, pthread_attr_init)
#endif
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+#endif
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
int pthread_attr_destroy(pthread_attr_t *attr)
{
@@ -76,8 +78,8 @@
int pthread_attr_setschedparam(pthread_attr_t *attr,
const struct sched_param *param)
{
- int max_prio = __sched_get_priority_max(attr->__schedpolicy);
- int min_prio = __sched_get_priority_min(attr->__schedpolicy);
+ int max_prio = sched_get_priority_max(attr->__schedpolicy);
+ int min_prio = sched_get_priority_min(attr->__schedpolicy);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
if (param->sched_priority < min_prio || param->sched_priority > max_prio)
return EINVAL;
@@ -141,7 +143,7 @@
int __pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- size_t ps = __getpagesize ();
+ size_t ps = getpagesize ();
/* First round up the guard size. */
guardsize = roundup (guardsize, ps);
Only in ../linuxthreads-2.1.2: clone.S
Only in ../linuxthreads-2.1.2: clone.h
diff -ru ./condvar.c ../linuxthreads-2.1.2/condvar.c
--- ./condvar.c Thu Oct 29 06:34:17 1998
+++ ../linuxthreads-2.1.2/condvar.c Wed Dec 8 16:25:05 1999
@@ -77,7 +77,7 @@
__pthread_unlock(&cond->__c_lock);
pthread_mutex_unlock(mutex);
/* Set up a longjmp handler for the restart and cancel signals */
- if (sigsetjmp(jmpbuf, 1) == 0) {
+ if (__sigsetjmp(jmpbuf, 1) == 0) {
THREAD_SETMEM(self, p_signal_jmp, &jmpbuf);
THREAD_SETMEM(self, p_cancel_jmp, &jmpbuf);
THREAD_SETMEM(self, p_signal, 0);
@@ -91,7 +91,7 @@
sigaddset(&unblock, __pthread_sig_restart);
sigprocmask(SIG_UNBLOCK, &unblock, &initial_mask);
/* Sleep for the required duration */
- retsleep = __libc_nanosleep(reltime, NULL);
+ retsleep = _nanosleep(reltime, NULL);
/* Block the restart signal again */
sigprocmask(SIG_SETMASK, &initial_mask, NULL);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -132,7 +132,7 @@
struct timeval now;
struct timespec reltime;
/* Compute a time offset relative to now */
- __gettimeofday(&now, NULL);
+ gettimeofday(&now, NULL);
reltime.tv_sec = abstime->tv_sec - now.tv_sec;
reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
if (reltime.tv_nsec < 0) {
Only in ../linuxthreads-2.1.2: getgr_r.c
diff -ru ./internals.h ../linuxthreads-2.1.2/internals.h
--- ./internals.h Fri Jul 16 16:18:19 1999
+++ ../linuxthreads-2.1.2/internals.h Mon Dec 13 07:36:47 1999
@@ -16,15 +16,48 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Includes */
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+#ifndef __P
+# define __P(p) p
+#endif
+
+#ifndef __PMT
+# define __PMT(p) p
+#endif
+
#include <bits/libc-tsd.h> /* for _LIBC_TSD_KEY_N */
#include <limits.h>
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
#include <setjmp.h>
#include <signal.h>
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
#include <unistd.h>
#include <sys/types.h>
+#include <sys/queue.h>
#include "pt-machine.h"
+/* Hack to get rid of the glibc linker magic directives on FreeBSD. */
+#define weak_alias(a, b)
+#define strong_alias(a, b)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+/* Get around the fact that __builtin_expect is actually in glibc. */
+#define __builtin_expect(expr, val) (expr)
+
+/* XXX Who knows what this was supposed to do... */
+#define internal_function
+
+/* Linuxism --> FreeBSDism. */
+# define __WCLONE WLINUXCLONE
+
+int _close(int d);
+int _nanosleep(const struct timespec *rqtp, struct timespec *rmtp);
+ssize_t _read(int d, void *buf, size_t nbytes);
+int _sigaction(int sig, const struct sigaction *act, struct sigaction *oact);
+pid_t _waitpid(pid_t wpid, int *status, int options);
+ssize_t _write(int d, const void *buf, size_t nbytes);
+
+int __sigsetjmp(sigjmp_buf env, int savemask);
+void __siglongjmp(sigjmp_buf env, int val);
+void __longjmp (jmp_buf env, int val);
+
#ifndef THREAD_GETMEM
# define THREAD_GETMEM(descr, member) descr->member
#endif
@@ -100,6 +133,9 @@
char p_sigwaiting; /* true if a sigwait() is in progress */
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
struct pthread_start_args p_start_args; /* arguments for thread creation */
void ** p_specific[PTHREAD_KEY_1STLEVEL_SIZE]; /* thread-specific data */
+ TAILQ_ENTRY(_pthread_descr_struct) qe;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+ char time_buf[26];
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+ struct tm local_tm;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
void * p_libc_specific[_LIBC_TSD_KEY_N]; /* thread-specific data for libc */
int p_userstack; /* nonzero if the user provided the stack */
void *p_guardaddr; /* address of guard area or NULL */
@@ -228,7 +264,7 @@
/* The page size we can get from the system. This should likely not be
changed by the machine file but, you never know. */
#ifndef PAGE_SIZE
-#define PAGE_SIZE (sysconf (_SC_PAGE_SIZE))
+#define PAGE_SIZE (getpagesize())
#endif
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
/* The max size of the thread stack segments. If the default
diff -ru ./join.c ../linuxthreads-2.1.2/join.c
--- ./join.c Thu Oct 29 06:34:18 1998
+++ ../linuxthreads-2.1.2/join.c Wed Dec 8 11:14:08 1999
@@ -50,7 +50,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
if (self == __pthread_main_thread && __pthread_manager_request >= 0) {
request.req_thread = self;
request.req_kind = REQ_MAIN_THREAD_EXIT;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- __libc_write(__pthread_manager_request, (char *)&request, sizeof(request));
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+ _write(__pthread_manager_request, (char *)&request, sizeof(request));
suspend(self);
}
/* Exit the process (but don't flush stdio streams, and don't run
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -101,7 +101,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
request.req_thread = self;
request.req_kind = REQ_FREE;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
request.req_args.free.thread_id = thread_id;
- __libc_write(__pthread_manager_request,
+ _write(__pthread_manager_request,
(char *) &request, sizeof(request));
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
return 0;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -139,7 +139,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
request.req_thread = thread_self();
request.req_kind = REQ_FREE;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
request.req_args.free.thread_id = thread_id;
- __libc_write(__pthread_manager_request,
+ _write(__pthread_manager_request,
(char *) &request, sizeof(request));
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
return 0;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
Only in ../linuxthreads-2.1.2: lclone.c
Only in ../linuxthreads-2.1.2: libc_calls.c
Only in ../linuxthreads-2.1.2: libc_private.h
Only in ../linuxthreads-2.1.2: libc_spinlock.c
Only in ../linuxthreads-2.1.2: libc_spinlock.h
Only in ../linuxthreads-2.1.2: libc_thread.c
diff -ru ./lockfile.c ../linuxthreads-2.1.2/lockfile.c
--- ./lockfile.c Thu Jul 9 06:41:28 1998
+++ ../linuxthreads-2.1.2/lockfile.c Mon Dec 13 08:03:55 1999
@@ -25,11 +25,14 @@
#include "../libio/libioP.h"
#endif
+/* Hack to get rid of the glibc linker magic directives on FreeBSD. */
+#define weak_alias(a, b)
+
void
__flockfile (FILE *stream)
{
#ifdef USE_IN_LIBIO
- __pthread_mutex_lock (stream->_lock);
+ pthread_mutex_lock (stream->_lock);
#else
#endif
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -44,7 +47,7 @@
__funlockfile (FILE *stream)
{
#ifdef USE_IN_LIBIO
- __pthread_mutex_unlock (stream->_lock);
+ pthread_mutex_unlock (stream->_lock);
#else
#endif
}
@@ -59,8 +62,9 @@
__ftrylockfile (FILE *stream)
{
#ifdef USE_IN_LIBIO
- return __pthread_mutex_trylock (stream->_lock);
+ return pthread_mutex_trylock (stream->_lock);
#else
+ return 0;
#endif
}
#ifdef USE_IN_LIBIO
@@ -68,7 +72,7 @@
#endif
weak_alias (__ftrylockfile, ftrylockfile);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-
+#if (0)
void
__fresetlockfiles (void)
{
@@ -76,12 +80,13 @@
_IO_FILE *fp;
pthread_mutexattr_t attr;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- __pthread_mutexattr_init (&attr);
- __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP);
+ pthread_mutexattr_init (&attr);
+ pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
for (fp = _IO_list_all; fp != NULL; fp = fp->_chain)
- __pthread_mutex_init (fp->_lock, &attr);
+ pthread_mutex_init (fp->_lock, &attr);
- __pthread_mutexattr_destroy (&attr);
+ pthread_mutexattr_destroy (&attr);
#endif
}
+#endif
diff -ru ./manager.c ../linuxthreads-2.1.2/manager.c
--- ./manager.c Wed Jul 28 23:42:42 1999
+++ ../linuxthreads-2.1.2/manager.c Thu Dec 9 00:52:53 1999
@@ -32,6 +32,7 @@
#include "spinlock.h"
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
#include "restart.h"
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
#include "semaphore.h"
+#include "clone.h"
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Array of active threads. Entry 0 is reserved for the initial thread. */
struct pthread_handle_struct __pthread_handles[PTHREAD_THREADS_MAX] =
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -108,14 +109,14 @@
/* Raise our priority to match that of main thread */
__pthread_manager_adjust_prio(__pthread_main_thread->p_priority);
/* Synchronize debugging of the thread manager */
- n = __libc_read(reqfd, (char *)&request, sizeof(request));
+ n = _read(reqfd, (char *)&request, sizeof(request));
ASSERT(n == sizeof(request) && request.req_kind == REQ_DEBUG);
ufd.fd = reqfd;
ufd.events = POLLIN;
/* Enter server loop */
while(1) {
- n = __poll(&ufd, 1, 2000);
-
+ n = poll(&ufd, 1, 2000);
+
/* Check for termination of the main thread */
if (getppid() == 1) {
pthread_kill_all_threads(SIGKILL, 0);
@@ -128,7 +129,7 @@
}
/* Read and execute request */
if (n == 1 && (ufd.revents & POLLIN)) {
- n = __libc_read(reqfd, (char *)&request, sizeof(request));
+ n = _read(reqfd, (char *)&request, sizeof(request));
ASSERT(n == sizeof(request));
switch(request.req_kind) {
case REQ_CREATE:
@@ -176,36 +177,37 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
pthread_descr self = (pthread_descr) arg;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
struct pthread_request request;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
void * outcome;
+
/* Initialize special thread_self processing, if any. */
#ifdef INIT_THREAD_SELF
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
INIT_THREAD_SELF(self, self->p_nr);
#endif
/* Make sure our pid field is initialized, just in case we get there
before our father has initialized it. */
- THREAD_SETMEM(self, p_pid, __getpid());
+ THREAD_SETMEM(self, p_pid, getpid());
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Initial signal mask is that of the creating thread. (Otherwise,
we'd just inherit the mask of the thread manager.) */
sigprocmask(SIG_SETMASK, &self->p_start_args.mask, NULL);
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
/* Set the scheduling policy and priority for the new thread, if needed */
if (THREAD_GETMEM(self, p_start_args.schedpolicy) >= 0)
/* Explicit scheduling attributes were provided: apply them */
- __sched_setscheduler(THREAD_GETMEM(self, p_pid),
- THREAD_GETMEM(self, p_start_args.schedpolicy),
- &self->p_start_args.schedparam);
+ sched_setscheduler(THREAD_GETMEM(self, p_pid),
+ THREAD_GETMEM(self, p_start_args.schedpolicy),
+ &self->p_start_args.schedparam);
else if (__pthread_manager_thread.p_priority > 0)
/* Default scheduling required, but thread manager runs in realtime
scheduling: switch new thread to SCHED_OTHER policy */
{
struct sched_param default_params;
default_params.sched_priority = 0;
- __sched_setscheduler(THREAD_GETMEM(self, p_pid),
- SCHED_OTHER, &default_params);
+ sched_setscheduler(THREAD_GETMEM(self, p_pid),
+ SCHED_OTHER, &default_params);
}
/* Make gdb aware of new thread */
if (__pthread_threads_debug && __pthread_sig_debug > 0) {
request.req_thread = self;
request.req_kind = REQ_DEBUG;
- __libc_write(__pthread_manager_request,
+ _write(__pthread_manager_request,
(char *) &request, sizeof(request));
suspend(self);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -247,7 +249,7 @@
new_thread_bottom = (char *) new_thread - STACK_SIZE;
if (mmap((caddr_t)((char *)(new_thread + 1) - INITIAL_STACK_SIZE),
INITIAL_STACK_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
- MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED | MAP_GROWSDOWN,
+ MAP_PRIVATE | MAP_STACK | MAP_FIXED,
-1, 0) == MAP_FAILED)
/* Bad luck, this segment is already mapped. */
return -1;
@@ -303,7 +305,7 @@
pthread_t new_thread_id;
char *guardaddr = NULL;
size_t guardsize = 0;
- int pagesize = __getpagesize();
+ int pagesize = getpagesize();
/* First check whether we have to change the policy and if yes, whether
we can do this. Normally this should be done by examining the
@@ -356,8 +358,8 @@
sizeof (struct sched_param));
break;
case PTHREAD_INHERIT_SCHED:
- new_thread->p_start_args.schedpolicy = __sched_getscheduler(father_pid);
- __sched_getparam(father_pid, &new_thread->p_start_args.schedparam);
+ new_thread->p_start_args.schedpolicy = sched_getscheduler(father_pid);
+ sched_getparam(father_pid, &new_thread->p_start_args.schedparam);
break;
}
new_thread->p_priority =
@@ -371,7 +373,7 @@
__pthread_manager_adjust_prio(new_thread->p_priority);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Do the cloning */
pid = __clone(pthread_start_thread, (void **) new_thread,
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
+ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
__pthread_sig_cancel, new_thread);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Check if cloning succeeded */
if (pid == -1) {
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -469,7 +471,7 @@
pid_t pid;
int status;
- while ((pid = __libc_waitpid(-1, &status, WNOHANG | __WCLONE)) > 0) {
+ while ((pid = waitpid(-1, &status, WNOHANG | WLINUXCLONE)) > 0) {
pthread_exited(pid);
if (WIFSIGNALED(status)) {
/* If a thread died due to a signal, send the same signal to
@@ -566,8 +568,8 @@
if (thread_prio <= __pthread_manager_thread.p_priority) return;
param.sched_priority =
- thread_prio < __sched_get_priority_max(SCHED_FIFO)
+ thread_prio < sched_get_priority_max(SCHED_FIFO)
? thread_prio + 1 : thread_prio;
- __sched_setscheduler(__pthread_manager_thread.p_pid, SCHED_FIFO, &param);
+ sched_setscheduler(__pthread_manager_thread.p_pid, SCHED_FIFO, &param);
__pthread_manager_thread.p_priority = thread_prio;
}
diff -ru ./mutex.c ../linuxthreads-2.1.2/mutex.c
--- ./mutex.c Wed Nov 18 08:59:53 1998
+++ ../linuxthreads-2.1.2/mutex.c Wed Dec 8 00:15:40 1999
@@ -23,7 +23,7 @@
#include "queue.h"
#include "restart.h"
-int __pthread_mutex_init(pthread_mutex_t * mutex,
+int pthread_mutex_init(pthread_mutex_t * mutex,
const pthread_mutexattr_t * mutex_attr)
{
__pthread_init_lock(&mutex->__m_lock);
@@ -35,14 +35,14 @@
}
strong_alias (__pthread_mutex_init, pthread_mutex_init)
-int __pthread_mutex_destroy(pthread_mutex_t * mutex)
+int pthread_mutex_destroy(pthread_mutex_t * mutex)
{
if (mutex->__m_lock.__status != 0) return EBUSY;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
return 0;
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
strong_alias (__pthread_mutex_destroy, pthread_mutex_destroy)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-int __pthread_mutex_trylock(pthread_mutex_t * mutex)
+int pthread_mutex_trylock(pthread_mutex_t * mutex)
{
pthread_descr self;
int retcode;
@@ -75,7 +75,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
strong_alias (__pthread_mutex_trylock, pthread_mutex_trylock)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-int __pthread_mutex_lock(pthread_mutex_t * mutex)
+int pthread_mutex_lock(pthread_mutex_t * mutex)
{
pthread_descr self;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -105,7 +105,7 @@
}
strong_alias (__pthread_mutex_lock, pthread_mutex_lock)
-int __pthread_mutex_unlock(pthread_mutex_t * mutex)
+int pthread_mutex_unlock(pthread_mutex_t * mutex)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
switch (mutex->__m_kind) {
case PTHREAD_MUTEX_FAST_NP:
@@ -131,20 +131,20 @@
}
strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock)
-int __pthread_mutexattr_init(pthread_mutexattr_t *attr)
+int pthread_mutexattr_init(pthread_mutexattr_t *attr)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
attr->__mutexkind = PTHREAD_MUTEX_FAST_NP;
return 0;
}
strong_alias (__pthread_mutexattr_init, pthread_mutexattr_init)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-int __pthread_mutexattr_destroy(pthread_mutexattr_t *attr)
+int pthread_mutexattr_destroy(pthread_mutexattr_t *attr)
{
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
return 0;
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
strong_alias (__pthread_mutexattr_destroy, pthread_mutexattr_destroy)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-int __pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind)
+int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind)
{
if (kind != PTHREAD_MUTEX_FAST_NP
&& kind != PTHREAD_MUTEX_RECURSIVE_NP
@@ -157,7 +157,7 @@
strong_alias ( __pthread_mutexattr_settype, __pthread_mutexattr_setkind_np)
weak_alias (__pthread_mutexattr_setkind_np, pthread_mutexattr_setkind_np)
-int __pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *kind)
+int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *kind)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
*kind = attr->__mutexkind;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
return 0;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -173,7 +173,7 @@
enum { NEVER = 0, IN_PROGRESS = 1, DONE = 2 };
-int __pthread_once(pthread_once_t * once_control, void (*init_routine)(void))
+int pthread_once(pthread_once_t * once_control, void (*init_routine)(void))
{
/* Test without locking first for speed */
if (*once_control == DONE) return 0;
diff -ru ./ptfork.c ../linuxthreads-2.1.2/ptfork.c
--- ./ptfork.c Mon Sep 6 12:32:07 1999
+++ ../linuxthreads-2.1.2/ptfork.c Wed Dec 8 11:23:01 1999
@@ -73,9 +73,9 @@
for (/*nothing*/; list != NULL; list = list->next) (list->handler)();
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-extern int __libc_fork(void);
+extern int _fork(void);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-pid_t __fork(void)
+pid_t fork(void)
{
pid_t pid;
struct handler_list * prepare, * child, * parent;
@@ -86,7 +86,7 @@
parent = pthread_atfork_parent;
pthread_mutex_unlock(&pthread_atfork_lock);
pthread_call_handlers(prepare);
- pid = __libc_fork();
+ pid = _fork();
if (pid == 0) {
__pthread_reset_main_thread();
__fresetlockfiles();
@@ -98,8 +98,8 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
weak_alias (__fork, fork);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-pid_t __vfork(void)
+pid_t vfork(void)
{
- return __fork();
+ return _fork();
}
weak_alias (__vfork, vfork);
diff -ru ./pthread.c ../linuxthreads-2.1.2/pthread.c
--- ./pthread.c Fri Aug 20 12:00:47 1999
+++ ../linuxthreads-2.1.2/pthread.c Mon Dec 13 07:58:10 1999
@@ -19,7 +19,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
+#include <sys/time.h>
#include <unistd.h>
+#include <signal.h>
#include <fcntl.h>
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
#include <sys/wait.h>
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
#include <sys/resource.h>
@@ -27,6 +30,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
#include "internals.h"
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
#include "spinlock.h"
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
#include "restart.h"
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+#include "clone.h"
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Descriptor of the initial thread */
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -59,7 +63,11 @@
NULL, /* char * p_in_sighandler */
0, /* char p_sigwaiting */
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
PTHREAD_START_ARGS_INITIALIZER, /* struct pthread_start_args p_start_args */
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- {NULL}, /* void ** p_specific[PTHREAD_KEY_1STLEVEL_SIZE] */
+ {NULL}, /* void ** p_specific[PTHREAD_KEY_1STLEVEL_SIZE]
+ * */
+ {NULL, NULL}, /* TAILQ_ENTRY(_pthread_descr_struct) qe */
+ {NULL}, /* char timebuf[26] */
+ {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL}, /* struct tm local_tm */
{NULL}, /* void * p_libc_specific[_LIBC_TSD_KEY_N] */
0, /* int p_userstack */
NULL, /* void * p_guardaddr */
@@ -101,7 +109,11 @@
NULL, /* char * p_in_sighandler */
0, /* char p_sigwaiting */
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
PTHREAD_START_ARGS_INITIALIZER, /* struct pthread_start_args p_start_args */
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- {NULL}, /* void ** p_specific[PTHREAD_KEY_1STLEVEL_SIZE] */
+ {NULL}, /* void ** p_specific[PTHREAD_KEY_1STLEVEL_SIZE]
+ * */
+ {NULL, NULL}, /* TAILQ_ENTRY(_pthread_descr_struct) qe */
+ {NULL}, /* char timebuf[26] */
+ {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL}, /* struct tm local_tm */
{NULL}, /* void * p_libc_specific[_LIBC_TSD_KEY_N] */
0, /* int p_userstack */
NULL, /* void * p_guardaddr */
@@ -149,12 +161,12 @@
p_pid);
/* These variables are used by the setup code. */
-extern int _errno;
-extern int _h_errno;
+extern int errno;
+extern int h_errno;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Forward declarations */
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-static void pthread_exit_process(int retcode, void *arg);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+static void pthread_exit_process(void);
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
#ifndef __i386__
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
static void pthread_handle_sigcancel(int sig);
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
static void pthread_handle_sigrestart(int sig);
@@ -223,7 +235,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
/* Return number of available real-time signal with highest priority. */
int
-__libc_current_sigrtmin (void)
+current_sigrtmin (void)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
#ifdef __SIGRTMIN
if (!rtsigs_initialized)
@@ -234,7 +246,7 @@
/* Return number of available real-time signal with lowest priority. */
int
-__libc_current_sigrtmax (void)
+current_sigrtmax (void)
{
#ifdef __SIGRTMIN
if (!rtsigs_initialized)
@@ -247,7 +259,7 @@
priority. Please note that we don't use a lock since we assume
this function to be called at program start. */
int
-__libc_allocate_rtsig (int high)
+allocate_rtsig (int high)
{
#ifndef __SIGRTMIN
return -1;
@@ -293,21 +305,21 @@
beyond STACK_SIZE minus two pages (one page for the thread descriptor
immediately beyond, and one page to act as a guard page). */
getrlimit(RLIMIT_STACK, &limit);
- max_stack = STACK_SIZE - 2 * __getpagesize();
+ max_stack = STACK_SIZE - 2 * getpagesize();
if (limit.rlim_cur > max_stack) {
limit.rlim_cur = max_stack;
setrlimit(RLIMIT_STACK, &limit);
}
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Update the descriptor for the initial thread. */
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- __pthread_initial_thread.p_pid = __getpid();
+ __pthread_initial_thread.p_pid = getpid();
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* If we have special thread_self processing, initialize that for the
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
main thread now. */
#ifdef INIT_THREAD_SELF
INIT_THREAD_SELF(&__pthread_initial_thread, 0);
#endif
/* The errno/h_errno variable of the main thread are the global ones. */
- __pthread_initial_thread.p_errnop = &_errno;
- __pthread_initial_thread.p_h_errnop = &_h_errno;
+ __pthread_initial_thread.p_errnop = &errno;
+ __pthread_initial_thread.p_h_errnop = &h_errno;
#ifdef __SIGRTMIN
/* Initialize real-time signals. */
init_rtsigs ();
@@ -318,23 +330,23 @@
#ifndef __i386__
sa.sa_handler = pthread_handle_sigrestart;
#else
- sa.sa_handler = (__sighandler_t) pthread_handle_sigrestart;
+ sa.sa_handler = (void *) pthread_handle_sigrestart;
#endif
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
- __sigaction(__pthread_sig_restart, &sa, NULL);
+ _sigaction(__pthread_sig_restart, &sa, NULL);
#ifndef __i386__
sa.sa_handler = pthread_handle_sigcancel;
#else
- sa.sa_handler = (__sighandler_t) pthread_handle_sigcancel;
+ sa.sa_handler = (void *) pthread_handle_sigcancel;
#endif
sa.sa_flags = 0;
- __sigaction(__pthread_sig_cancel, &sa, NULL);
+ _sigaction(__pthread_sig_cancel, &sa, NULL);
if (__pthread_sig_debug > 0) {
sa.sa_handler = pthread_handle_sigdebug;
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
- __sigaction(__pthread_sig_debug, &sa, NULL);
+ _sigaction(__pthread_sig_debug, &sa, NULL);
}
/* Initially, block __pthread_sig_restart. Will be unblocked on demand. */
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
sigemptyset(&mask);
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -343,7 +355,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Register an exit function to kill all other threads. */
/* Do it early so that user-registered atexit functions are called
before pthread_exit_process. */
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- __on_exit(pthread_exit_process, NULL);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+ atexit(pthread_exit_process);
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
void __pthread_initialize(void)
@@ -376,8 +388,8 @@
, (void *)(long)manager_pipe[0]);
if (pid == -1) {
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
free(__pthread_manager_thread_bos);
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- __libc_close(manager_pipe[0]);
- __libc_close(manager_pipe[1]);
+ _close(manager_pipe[0]);
+ _close(manager_pipe[1]);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
return -1;
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
__pthread_manager_request = manager_pipe[1]; /* writing end */
@@ -393,14 +405,14 @@
}
/* Synchronize debugging of the thread manager */
request.req_kind = REQ_DEBUG;
- __libc_write(__pthread_manager_request, (char *) &request, sizeof(request));
+ _write(__pthread_manager_request, (char *) &request, sizeof(request));
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
return 0;
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
/* Thread creation */
-int __pthread_create_2_1(pthread_t *thread, const pthread_attr_t *attr,
- void * (*start_routine)(void *), void *arg)
+int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
+ void * (*start_routine)(void *), void *arg)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
pthread_descr self = thread_self();
struct pthread_request request;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -414,7 +426,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
request.req_args.create.arg = arg;
sigprocmask(SIG_SETMASK, (const sigset_t *) NULL,
&request.req_args.create.mask);
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- __libc_write(__pthread_manager_request, (char *) &request, sizeof(request));
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+ _write(__pthread_manager_request, (char *) &request, sizeof(request));
suspend(self);
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
if (THREAD_GETMEM(self, p_retcode) == 0)
*thread = (pthread_t) THREAD_GETMEM(self, p_retval);
@@ -496,7 +508,7 @@
return ESRCH;
}
th = handle->h_descr;
- if (__sched_setscheduler(th->p_pid, policy, param) == -1) {
+ if (sched_setscheduler(th->p_pid, policy, param) == -1) {
__pthread_unlock(&handle->h_lock);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
return errno;
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -520,16 +532,16 @@
}
pid = handle->h_descr->p_pid;
__pthread_unlock(&handle->h_lock);
- pol = __sched_getscheduler(pid);
+ pol = sched_getscheduler(pid);
if (pol == -1) return errno;
- if (__sched_getparam(pid, param) == -1) return errno;
+ if (sched_getparam(pid, param) == -1) return errno;
*policy = pol;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
return 0;
}
/* Process-wide exit() request */
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-static void pthread_exit_process(int retcode, void *arg)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+static void pthread_exit_process(void)
{
struct pthread_request request;
pthread_descr self = thread_self();
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -537,8 +549,8 @@
if (__pthread_manager_request >= 0) {
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
request.req_thread = self;
request.req_kind = REQ_PROCESS_EXIT;
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- request.req_args.exit.code = retcode;
- __libc_write(__pthread_manager_request,
+ request.req_args.exit.code = 0;
+ _write(__pthread_manager_request,
(char *) &request, sizeof(request));
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
suspend(self);
/* Main thread should accumulate times for thread manager and its
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -560,12 +572,12 @@
static void pthread_handle_sigrestart(int sig, struct sigcontext ctx)
{
pthread_descr self;
- asm volatile ("movw %w0,%%gs" : : "r" (ctx.gs));
+ asm volatile ("movw %w0,%%gs" : : "r" (ctx.sc_gs));
self = thread_self();
#endif
THREAD_SETMEM(self, p_signal, sig);
if (THREAD_GETMEM(self, p_signal_jmp) != NULL)
- siglongjmp(*THREAD_GETMEM(self, p_signal_jmp), 1);
+ __siglongjmp(*THREAD_GETMEM(self, p_signal_jmp), 1);
}
/* The handler for the CANCEL signal checks for cancellation
@@ -583,7 +595,7 @@
{
pthread_descr self;
sigjmp_buf * jmpbuf;
- asm volatile ("movw %w0,%%gs" : : "r" (ctx.gs));
+ asm volatile ("movw %w0,%%gs" : : "r" (ctx.sc_gs));
self = thread_self();
#endif
@@ -606,7 +618,7 @@
jmpbuf = THREAD_GETMEM(self, p_cancel_jmp);
if (jmpbuf != NULL) {
THREAD_SETMEM(self, p_cancel_jmp, NULL);
- siglongjmp(*jmpbuf, 1);
+ __siglongjmp(*jmpbuf, 1);
}
}
}
@@ -641,20 +653,20 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
free(__pthread_manager_thread_bos);
__pthread_manager_thread_bos = __pthread_manager_thread_tos = NULL;
/* Close the two ends of the pipe */
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- __libc_close(__pthread_manager_request);
- __libc_close(__pthread_manager_reader);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+ _close(__pthread_manager_request);
+ _close(__pthread_manager_reader);
__pthread_manager_request = __pthread_manager_reader = -1;
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Update the pid of the main thread */
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- THREAD_SETMEM(self, p_pid, __getpid());
+ THREAD_SETMEM(self, p_pid, getpid());
/* Make the forked thread the main thread */
__pthread_main_thread = self;
THREAD_SETMEM(self, p_nextlive, self);
THREAD_SETMEM(self, p_prevlive, self);
/* Now this thread modifies the global variables. */
- THREAD_SETMEM(self, p_errnop, &_errno);
- THREAD_SETMEM(self, p_h_errnop, &_h_errno);
+ THREAD_SETMEM(self, p_errnop, &errno);
+ THREAD_SETMEM(self, p_h_errnop, &h_errno);
}
/* Process-wide exec() request */
@@ -663,7 +675,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
struct sigaction sa;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
/* Terminate all other threads and thread manager */
- pthread_exit_process(0, NULL);
+ pthread_exit_process();
/* Make current thread the main thread in case the calling thread
changes its mind, does not exec(), and creates new threads instead. */
__pthread_reset_main_thread();
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -673,10 +685,10 @@
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
sa.sa_handler = SIG_DFL;
- __sigaction(__pthread_sig_restart, &sa, NULL);
- __sigaction(__pthread_sig_cancel, &sa, NULL);
+ _sigaction(__pthread_sig_restart, &sa, NULL);
+ _sigaction(__pthread_sig_cancel, &sa, NULL);
if (__pthread_sig_debug > 0)
- __sigaction(__pthread_sig_debug, &sa, NULL);
+ _sigaction(__pthread_sig_debug, &sa, NULL);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
weak_alias (__pthread_kill_other_threads_np, pthread_kill_other_threads_np)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -710,7 +722,7 @@
va_start(args, fmt);
vsnprintf(buffer + 8, sizeof(buffer) - 8, fmt, args);
va_end(args);
- __libc_write(2, buffer, strlen(buffer));
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+ _write(2, buffer, strlen(buffer));
}
#endif
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
diff -ru ./ptlongjmp.c ../linuxthreads-2.1.2/ptlongjmp.c
--- ./ptlongjmp.c Tue Oct 27 05:52:00 1998
+++ ../linuxthreads-2.1.2/ptlongjmp.c Thu Dec 9 01:01:05 1999
@@ -19,15 +19,16 @@
#include "pthread.h"
#include "internals.h"
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-/* These functions are not declared anywhere since they shouldn't be
- used at another place but here. */
-extern void __libc_siglongjmp (sigjmp_buf env, int val)
- __attribute__ ((noreturn));
-extern void __libc_longjmp (sigjmp_buf env, int val)
- __attribute__ ((noreturn));
+/* Test if longjmp to JMPBUF would unwind the frame
+ containing a local variable at ADDRESS. */
+#ifndef JB_SP
+# define JB_SP 4
+#endif
+#define _JMPBUF_UNWINDS(jmpbuf, address) \
+ ((void *) (address) < (void *) &(jmpbuf)[JB_SP])
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-static void pthread_cleanup_upto(__jmp_buf target)
+static void pthread_cleanup_upto(jmp_buf target)
{
pthread_descr self = thread_self();
struct _pthread_cleanup_buffer * c;
@@ -44,12 +45,12 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
void siglongjmp(sigjmp_buf env, int val)
{
- pthread_cleanup_upto(env->__jmpbuf);
- __libc_siglongjmp(env, val);
+ pthread_cleanup_upto((void *) env);
+ __siglongjmp(env, val);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
void longjmp(jmp_buf env, int val)
{
- pthread_cleanup_upto(env->__jmpbuf);
- __libc_longjmp(env, val);
+ pthread_cleanup_upto(env);
+ __longjmp(env, val);
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
Only in ../linuxthreads-2.1.2: sched.c
diff -ru ./semaphore.c ../linuxthreads-2.1.2/semaphore.c
--- ./semaphore.c Fri Jul 9 21:00:32 1999
+++ ../linuxthreads-2.1.2/semaphore.c Wed Dec 8 11:19:07 1999
@@ -22,7 +22,11 @@
#include "restart.h"
#include "queue.h"
-int __new_sem_init(sem_t *sem, int pshared, unsigned int value)
+#ifndef __set_errno
+# define __set_errno(val) errno = (val)
+#endif
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+int sem_init(sem_t *sem, int pshared, unsigned int value)
{
if (value > SEM_VALUE_MAX) {
errno = EINVAL;
@@ -38,7 +42,7 @@
return 0;
}
-int __new_sem_wait(sem_t * sem)
+int sem_wait(sem_t * sem)
{
volatile pthread_descr self = thread_self();
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -65,7 +69,7 @@
return 0;
}
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-int __new_sem_trywait(sem_t * sem)
+int sem_trywait(sem_t * sem)
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
int retval;
@@ -81,7 +85,7 @@
return retval;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-int __new_sem_post(sem_t * sem)
+int sem_post(sem_t * sem)
{
pthread_descr self = thread_self();
pthread_descr th;
@@ -114,19 +118,19 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
request.req_kind = REQ_POST;
request.req_args.post = sem;
- __libc_write(__pthread_manager_request,
+ _write(__pthread_manager_request,
(char *) &request, sizeof(request));
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
return 0;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
-int __new_sem_getvalue(sem_t * sem, int * sval)
+int sem_getvalue(sem_t * sem, int * sval)
{
*sval = sem->__sem_value;
return 0;
}
-int __new_sem_destroy(sem_t * sem)
+int sem_destroy(sem_t * sem)
{
if (sem->__sem_waiting != NULL) {
__set_errno (EBUSY);
diff -ru ./semaphore.h ../linuxthreads-2.1.2/semaphore.h
--- ./semaphore.h Thu Apr 15 06:50:56 1999
+++ ../linuxthreads-2.1.2/semaphore.h Mon Dec 6 13:10:40 1999
@@ -15,7 +15,7 @@
#ifndef _SEMAPHORE_H
#define _SEMAPHORE_H 1
-#include <features.h>
+/* #include <features.h> */
#include <sys/types.h>
#ifndef _PTHREAD_DESCR_DEFINED
diff -ru ./signals.c ../linuxthreads-2.1.2/signals.c
--- ./signals.c Mon Aug 23 10:46:35 1999
+++ ../linuxthreads-2.1.2/signals.c Thu Dec 9 01:04:22 1999
@@ -19,7 +19,14 @@
#include "pthread.h"
#include "internals.h"
#include "spinlock.h"
-#include <sigcontextinfo.h>
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+#ifndef SIGCONTEXT
+# define SIGCONTEXT struct sigcontext *
+#endif
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
+#ifndef SIGCONTEXT_EXTRA_ARGS
+# define SIGCONTEXT_EXTRA_ARGS
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+#endif
int pthread_sigmask(int how, const sigset_t * newmask, sigset_t * oldmask)
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -110,17 +117,17 @@
newact = *act;
if (act->sa_handler != SIG_IGN && act->sa_handler != SIG_DFL
&& sig > 0 && sig < NSIG)
- newact.sa_handler = (__sighandler_t) pthread_sighandler;
+ newact.sa_handler = (__sighandler_t *) pthread_sighandler;
newactp = &newact;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
else
newactp = NULL;
- if (__sigaction(sig, newactp, oact) == -1)
+ if (_sigaction(sig, newactp, oact) == -1)
return -1;
if (sig > 0 && sig < NSIG)
{
if (oact != NULL)
- oact->sa_handler = (__sighandler_t) sighandler[sig];
+ oact->sa_handler = (__sighandler_t *) sighandler[sig];
if (act)
sighandler[sig] = (arch_sighandler_t) act->sa_handler;
}
@@ -164,7 +171,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
/* Test for cancellation */
- if (sigsetjmp(jmpbuf, 1) == 0) {
+ if (__sigsetjmp(jmpbuf, 1) == 0) {
THREAD_SETMEM(self, p_cancel_jmp, &jmpbuf);
if (! (THREAD_GETMEM(self, p_canceled)
&& THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE)) {
diff -ru ./specific.c ../linuxthreads-2.1.2/specific.c
--- ./specific.c Wed Apr 14 16:48:13 1999
+++ ../linuxthreads-2.1.2/specific.c Wed Dec 8 17:48:46 1999
@@ -38,7 +38,7 @@
/* Create a new key */
-int __pthread_key_create(pthread_key_t * key, destr_function destr)
+int pthread_key_create(pthread_key_t * key, destr_function destr)
{
int i;
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
@@ -91,7 +91,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
/* Set the value of a key */
-int __pthread_setspecific(pthread_key_t key, const void * pointer)
+int pthread_setspecific(pthread_key_t key, const void * pointer)
{
pthread_descr self = thread_self();
unsigned int idx1st, idx2nd;
@@ -113,7 +113,7 @@
/* Get the value of a key */
-void * __pthread_getspecific(pthread_key_t key)
+void * pthread_getspecific(pthread_key_t key)
{
pthread_descr self = thread_self();
unsigned int idx1st, idx2nd;
diff -ru ./sysdeps/pthread/bits/pthreadtypes.h ../linuxthreads-2.1.2/sysdeps/pthread/bits/pthreadtypes.h
--- ./sysdeps/pthread/bits/pthreadtypes.h Thu Apr 15 06:52:26 1999
+++ ../linuxthreads-2.1.2/sysdeps/pthread/bits/pthreadtypes.h Thu Dec 9 01:07:02 1999
@@ -20,7 +20,6 @@
#define _BITS_PTHREADTYPES_H 1
#define __need_schedparam
-#include <bits/sched.h>
/* Fast locks (not abstract because mutexes and conditions aren't abstract). */
struct _pthread_fastlock
@@ -41,7 +40,7 @@
{
int __detachstate;
int __schedpolicy;
- struct __sched_param __schedparam;
+ struct sched_param __schedparam;
int __inheritsched;
int __scope;
size_t __guardsize;
diff -ru ./sysdeps/pthread/pthread.h ../linuxthreads-2.1.2/sysdeps/pthread/pthread.h
--- ./sysdeps/pthread/pthread.h Tue Dec 8 08:10:25 1998
+++ ../linuxthreads-2.1.2/sysdeps/pthread/pthread.h Thu Dec 9 01:15:48 1999
@@ -15,7 +15,7 @@
#ifndef _PTHREAD_H
#define _PTHREAD_H 1
-#include <features.h>
+/* #include <features.h> */
#include <sched.h>
#include <time.h>
@@ -23,6 +23,7 @@
#define __need_sigset_t
#include <signal.h>
#include <bits/pthreadtypes.h>
+#include <bits/local_lim.h>
__BEGIN_DECLS
@@ -46,6 +47,13 @@
/* Values for attributes. */
+/* pthread_attr_setscope() can return ENOTSUP, which is not listed in errno.h.
+ * EINVAL is 22, and ENOSYS is 78, so 42 is a safe (though arbitrary) value for
+ * ENOTSUP. */
+#ifndef ENOTSUP
+# define ENOTSUP 42
+#endif
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
+
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
enum
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
PTHREAD_CREATE_JOINABLE,
@@ -107,7 +115,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
struct _pthread_cleanup_buffer
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
{
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
- void (*__routine) __PMT ((void *)); /* Function to call. */
+ void (*__routine) __P ((void *)); /* Function to call. */
void *__arg; /* Its argument. */
int __canceltype; /* Saved cancellation type. */
struct _pthread_cleanup_buffer *__prev; /* Chaining of cleanup functions. */
diff -ru ./sysdeps/unix/sysv/linux/bits/local_lim.h ../linuxthreads-2.1.2/sysdeps/unix/sysv/linux/bits/local_lim.h
--- ./sysdeps/unix/sysv/linux/bits/local_lim.h Thu Nov 12 10:03:14 1998
+++ ../linuxthreads-2.1.2/sysdeps/unix/sysv/linux/bits/local_lim.h Thu Dec 9 01:16:53 1999
@@ -24,7 +24,7 @@
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
#endif
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
/* The kernel sources contain a file with all the needed information. */
-#include <linux/limits.h>
+#include <limits.h>
/* Have to remove NR_OPEN? */
#ifdef __undef_NR_OPEN
diff -ru ./sysdeps/unix/sysv/linux/bits/sigthread.h ../linuxthreads-2.1.2/sysdeps/unix/sysv/linux/bits/sigthread.h
--- ./sysdeps/unix/sysv/linux/bits/sigthread.h Sat Sep 12 14:33:14 1998
+++ ../linuxthreads-2.1.2/sysdeps/unix/sysv/linux/bits/sigthread.h Mon Dec 6 12:10:41 1999
@@ -28,8 +28,8 @@
/* Modify the signal mask for the calling thread. The arguments have
the same meaning as for sigprocmask(2). */
-extern int pthread_sigmask __P ((int __how, __const __sigset_t *__newmask,
- __sigset_t *__oldmask));
+extern int pthread_sigmask __P ((int __how, __const sigset_t *__newmask,
+ sigset_t *__oldmask));
/* Send signal SIGNO to the given thread. */
extern int pthread_kill __P ((pthread_t __thread, int __signo));
Only in ../linuxthreads-2.1.2: uthread_file.c
diff -ru ./weaks.c ../linuxthreads-2.1.2/weaks.c
--- ./weaks.c Fri Jul 24 05:57:24 1998
+++ ../linuxthreads-2.1.2/weaks.c Tue Dec 7 23:24:26 1999
@@ -21,6 +21,11 @@
#include <limits.h>
#include <stdlib.h>
+/* Hack to get rid of the glibc linker magic directives on FreeBSD. */
+#define weak_alias(a, b)
+#define strong_alias(a, b)
+#define weak_function
+
extern int __pthread_return_0 __P ((void));
extern int __pthread_return_1 __P ((void));
extern void __pthread_return_void __P ((void));
@@ -91,6 +96,7 @@
/* Those are pthread functions which return 1 if successful. */
weak_alias (__pthread_return_1, pthread_equal)
+#if (0)
/* pthread_exit () is a special case. */
void
weak_function
@@ -98,6 +104,7 @@
{
exit (EXIT_SUCCESS);
}
+#endif
int
__pthread_return_0 (void)
diff -ru ./wrapsyscall.c ../linuxthreads-2.1.2/wrapsyscall.c
--- ./wrapsyscall.c Tue Dec 1 11:34:20 1998
+++ ../linuxthreads-2.1.2/wrapsyscall.c Wed Dec 8 17:36:58 1999
@@ -30,6 +30,10 @@
#include <sys/wait.h>
#include <sys/socket.h>
+#define strong_alias(a, b)
+#define __SOCKADDR_ARG struct sockaddr *
+#define __CONST_SOCKADDR_ARG const struct sockaddr *
+#define __ptr_t void *
#ifndef PIC
/* We need a hook to force this file to be linked in when static
@@ -39,20 +43,20 @@
#define CANCELABLE_SYSCALL(res_type, name, param_list, params) \
-res_type __libc_##name param_list; \
+res_type _##name param_list; \
res_type \
name param_list \
{ \
res_type result; \
int oldtype; \
pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, &oldtype); \
- result = __libc_##name params; \
+ result = _##name params; \
pthread_setcanceltype (oldtype, NULL); \
return result; \
Reviewed by: Russell Carter Submitted by: "Richard Seaman, Jr." <dick@tar.com> Native FreeBSD port of the linuxthreads library Includes added files and stuff you need to add to the rest of your system. This is for -current I'm sure Richard's older version might be a good place to start for a 3.x version.
1999-11-30 09:07:29 +00:00
}
Update to the most recent release of LinuxThreads, glibc-linuxthreads-2.1.2, which is rather tightly coupled with GNU libc, unlike the older version of this port. LinuxThreads has added many features since it was integrated with GNU libc, which means that a number of interfaces that were borrowed from libc_r are no longer needed. This updated port required a lot of reworking of the port, so there are likely to be new bugs.
1999-12-24 01:12:08 +00:00
#define CANCELABLE_SYSCALL_VA(res_type, name, param_list, params, last_arg) \
-res_type __libc_##name param_list; \
+res_type _##name param_list; \
res_type \
name param_list \
{ \
@@ -61,7 +65,7 @@
va_list ap; \
pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, &oldtype); \
va_start (ap, last_arg); \
- result = __libc_##name params; \
+ result = _##name params; \
va_end (ap); \
pthread_setcanceltype (oldtype, NULL); \
return result; \
@@ -83,10 +87,12 @@
CANCELABLE_SYSCALL (int, fsync, (int fd), (fd))
+#if (0)
/* lseek(2). */
CANCELABLE_SYSCALL (off_t, lseek, (int fd, off_t offset, int whence),
(fd, offset, whence))
strong_alias (lseek, __lseek)
+#endif
/* msync(2). */
@@ -106,9 +112,10 @@
strong_alias (open, __open)
+#if (0)
/* pause(2). */
CANCELABLE_SYSCALL (int, pause, (void), ())
-
+#endif
/* read(2). */
CANCELABLE_SYSCALL (ssize_t, read, (int fd, void *buf, size_t count),
@@ -116,6 +123,7 @@
strong_alias (read, __read)
+#if (0)
/* system(3). */
CANCELABLE_SYSCALL (int, system, (const char *line), (line))
@@ -125,16 +133,16 @@
/* wait(2). */
-CANCELABLE_SYSCALL (__pid_t, wait, (__WAIT_STATUS_DEFN stat_loc), (stat_loc))
+CANCELABLE_SYSCALL (pid_t, wait, (int * stat_loc), (stat_loc))
strong_alias (wait, __wait)
/* waitpid(2). */
-CANCELABLE_SYSCALL (__pid_t, waitpid, (__pid_t pid, int *stat_loc,
- int options),
+CANCELABLE_SYSCALL (pid_t, waitpid, (pid_t pid, int *stat_loc,
+ int options),
(pid, stat_loc, options))
-
-
+#endif
+
/* write(2). */
CANCELABLE_SYSCALL (ssize_t, write, (int fd, const void *buf, size_t n),
(fd, buf, n))
@@ -155,9 +163,11 @@
(fd, addr, len))
strong_alias (connect, __connect)
+#if (0)
/* recv(2). */
CANCELABLE_SYSCALL (int, recv, (int fd, __ptr_t buf, size_t n, int flags),
(fd, buf, n, flags))
+#endif
/* recvfrom(2). */
CANCELABLE_SYSCALL (int, recvfrom, (int fd, __ptr_t buf, size_t n, int flags,
@@ -168,11 +178,13 @@
CANCELABLE_SYSCALL (int, recvmsg, (int fd, struct msghdr *message, int flags),
(fd, message, flags))
+#if (0)
/* send(2). */
CANCELABLE_SYSCALL (int, send, (int fd, const __ptr_t buf, size_t n,
int flags),
(fd, buf, n, flags))
strong_alias (send, __send)
+#endif
/* sendmsg(2). */
CANCELABLE_SYSCALL (int, sendmsg, (int fd, const struct msghdr *message,
Reference in New Issue Copy Permalink