aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog9
-rw-r--r--nptl/forward.c2
-rw-r--r--nptl/pthread_create.c2
-rw-r--r--nptl/sysdeps/generic/td_ta_map_lwp2thr.c45
-rw-r--r--nptl/sysdeps/i386/td_ta_map_lwp2thr.c48
5 files changed, 104 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 45a7b34c9a..154851a16b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-04 Roland McGrath <roland@redhat.com>
+
+ * forward.c (pthread_self): Use FORWARD3 macro to correct return type.
+
+ * sysdeps/i386/td_ta_map_lwp2thr.c: Moved from ../nptl_db.
+ * sysdeps/generic/td_ta_map_lwp2thr.c: New file.
+
+ * pthread_create.c (start_thread): Add missing & on __nptl_last_event.
+
2002-12-04 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h: Make pthread_t
diff --git a/nptl/forward.c b/nptl/forward.c
index 29f291d555..491e0caed8 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -139,7 +139,7 @@ FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0);
FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0);
-FORWARD (pthread_self, (void), (), 0);
+FORWARD3 (pthread_self, pthread_t, (void), (), return 0, GLIBC_2_0);
FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 5fef400ee4..033c0783ea 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -233,7 +233,7 @@ start_thread (void *arg)
do
pd->nextevent = __nptl_last_event;
- while (atomic_compare_and_exchange_acq (__nptl_last_event, pd,
+ while (atomic_compare_and_exchange_acq (&__nptl_last_event, pd,
pd->nextevent) != 0);
}
diff --git a/nptl/sysdeps/generic/td_ta_map_lwp2thr.c b/nptl/sysdeps/generic/td_ta_map_lwp2thr.c
new file mode 100644
index 0000000000..126673e9af
--- /dev/null
+++ b/nptl/sysdeps/generic/td_ta_map_lwp2thr.c
@@ -0,0 +1,45 @@
+/* Which thread is running on an LWP? Stub version.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include "thread_dbP.h"
+#include <tls.h>
+#include <sys/reg.h>
+
+
+td_err_e
+td_ta_map_lwp2thr (const td_thragent_t *ta, lwpid_t lwpid, td_thrhandle_t *th)
+{
+ LOG ("td_ta_map_lwp2thr");
+
+ /* Test whether the TA parameter is ok. */
+ if (! ta_ok (ta))
+ return TD_BADTA;
+
+ prgregset_t regs;
+ if (ps_lgetregs (ta->ph, lwpid, regs) != PS_OK)
+ return TD_ERR;
+
+# error port this file
+ // th->th_unique = thread register;
+
+ /* Found it. Now complete the `td_thrhandle_t' object. */
+ th->th_ta_p = (td_thragent_t *) ta;
+
+ return TD_OK;
+}
diff --git a/nptl/sysdeps/i386/td_ta_map_lwp2thr.c b/nptl/sysdeps/i386/td_ta_map_lwp2thr.c
new file mode 100644
index 0000000000..94f6d34987
--- /dev/null
+++ b/nptl/sysdeps/i386/td_ta_map_lwp2thr.c
@@ -0,0 +1,48 @@
+/* Which thread is running on an LWP? i386 version.
+ Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 1999.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include "thread_dbP.h"
+#include <tls.h>
+#include <sys/reg.h>
+
+
+td_err_e
+td_ta_map_lwp2thr (const td_thragent_t *ta, lwpid_t lwpid, td_thrhandle_t *th)
+{
+ LOG ("td_ta_map_lwp2thr");
+
+ /* Test whether the TA parameter is ok. */
+ if (! ta_ok (ta))
+ return TD_BADTA;
+
+ prgregset_t regs;
+ if (ps_lgetregs (ta->ph, lwpid, regs) != PS_OK)
+ return TD_ERR;
+
+ /* Get the thread area for the addressed thread. */
+ if (ps_get_thread_area (ta->ph, lwpid, regs[GS] >> 3, &th->th_unique)
+ != PS_OK)
+ return TD_ERR; /* XXX Other error value? */
+
+ /* Found it. Now complete the `td_thrhandle_t' object. */
+ th->th_ta_p = (td_thragent_t *) ta;
+
+ return TD_OK;
+}