aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-05-31 07:50:12 +0000
committerUlrich Drepper <drepper@redhat.com>2003-05-31 07:50:12 +0000
commit49b650430eb51350cc96adf7dd621560eb40af04 (patch)
treea92d6034074c3d710e835d64088beb65c38216e1 /nptl
parent5d4f57bd9398d5b4d0ed26af9d4bf6e65c28c73c (diff)
downloadglibc-49b650430eb51350cc96adf7dd621560eb40af04.tar
glibc-49b650430eb51350cc96adf7dd621560eb40af04.tar.gz
glibc-49b650430eb51350cc96adf7dd621560eb40af04.tar.bz2
glibc-49b650430eb51350cc96adf7dd621560eb40af04.zip
Update.
2003-05-31 Ulrich Drepper <drepper@redhat.com> * libio/fileops.c (_IO_file_open): Don't mark as inline. * sysdeps/ia64/elf/initfini.c ((gmon_initializer): Mark with attribute used.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog16
-rw-r--r--nptl/cleanup.c2
-rw-r--r--nptl/cleanup_defer.c2
-rw-r--r--nptl/descr.h4
-rw-r--r--nptl/sysdeps/pthread/posix-timer.h22
-rw-r--r--nptl/sysdeps/pthread/timer_create.c2
-rw-r--r--nptl/unwind.c2
7 files changed, 24 insertions, 26 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index ede59262fd..1f9c523137 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,19 @@
+2003-05-31 Ulrich Drepper <drepper@redhat.com>
+
+ * posix-timer.h: Remove old, unused timer_id2ptr and timer_ptr2id
+ definitions.
+
+ * sysdeps/pthread/timer_create.c (timer_create): In case
+ evp==NULL, assign timer ID to sival_ptr.
+
+ * descr.h (struct pthread_unwind_buf): Change type of prev element to
+ struct pthread_unwind_buf *.
+ (struct pthread): Likewise for cleanup_jmp_buf element.
+
+ * cleanup.c (__pthread_register_cancel): Add cast to avoid warning.
+ * cleanup_defer.c (__pthread_register_cancel_defer): Likewise.
+ * unwind.c (__pthread_unwind_next): Likewise.
+
2003-05-30 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/ia64/lowlevellock.h
diff --git a/nptl/cleanup.c b/nptl/cleanup.c
index 2029fe2141..5bf85398e4 100644
--- a/nptl/cleanup.c
+++ b/nptl/cleanup.c
@@ -33,7 +33,7 @@ __pthread_register_cancel (__pthread_unwind_buf_t *buf)
ibuf->priv.data.cleanup = THREAD_GETMEM (self, cleanup);
/* Store the new cleanup handler info. */
- THREAD_SETMEM (self, cleanup_jmp_buf, buf);
+ THREAD_SETMEM (self, cleanup_jmp_buf, (struct pthread_unwind_buf *) buf);
}
diff --git a/nptl/cleanup_defer.c b/nptl/cleanup_defer.c
index 4c67813d4e..498d9557df 100644
--- a/nptl/cleanup_defer.c
+++ b/nptl/cleanup_defer.c
@@ -55,7 +55,7 @@ __pthread_register_cancel_defer (__pthread_unwind_buf_t *buf)
: PTHREAD_CANCEL_DEFERRED);
/* Store the new cleanup handler info. */
- THREAD_SETMEM (self, cleanup_jmp_buf, buf);
+ THREAD_SETMEM (self, cleanup_jmp_buf, (struct pthread_unwind_buf *) buf);
}
diff --git a/nptl/descr.h b/nptl/descr.h
index efb25c7479..6004a26a83 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -77,7 +77,7 @@ struct pthread_unwind_buf
struct
{
/* Pointer to the previous cleanup buffer. */
- __pthread_unwind_buf_t *prev;
+ struct pthread_unwind_buf *prev;
/* Backward compatibility: state of the old-style cleanup
handler at the time of the previous new-style cleanup handler
@@ -124,7 +124,7 @@ struct pthread
struct _pthread_cleanup_buffer *cleanup;
/* Unwind information. */
- __pthread_unwind_buf_t *cleanup_jmp_buf;
+ struct pthread_unwind_buf *cleanup_jmp_buf;
#define HAVE_CLEANUP_JMP_BUF
/* Flags determining processing of cancellation. */
diff --git a/nptl/sysdeps/pthread/posix-timer.h b/nptl/sysdeps/pthread/posix-timer.h
index bfa8f65c40..5a58b5a814 100644
--- a/nptl/sysdeps/pthread/posix-timer.h
+++ b/nptl/sysdeps/pthread/posix-timer.h
@@ -101,26 +101,8 @@ extern struct thread_node __timer_signal_thread_tclk;
/* Return pointer to timer structure corresponding to ID. */
-#if 0
-static inline struct timer_node *
-timer_id2ptr (timer_t timerid)
-{
- if (timerid >= 0 && timerid < TIMER_MAX)
- return &__timer_array[timerid];
-
- return NULL;
-}
-
-/* Return ID of TIMER. */
-static inline int
-timer_ptr2id (struct timer_node *timer)
-{
- return timer - __timer_array;
-}
-#else
-# define timer_id2ptr(timerid) ((struct timer_node *) timerid)
-# define timer_ptr2id(timerid) ((void *) timerid)
-#endif
+#define timer_id2ptr(timerid) ((struct timer_node *) timerid)
+#define timer_ptr2id(timerid) ((void *) timerid)
/* Check whether timer is valid; global mutex must be held. */
static inline int
diff --git a/nptl/sysdeps/pthread/timer_create.c b/nptl/sysdeps/pthread/timer_create.c
index 795f94c7d2..4ee0966f4e 100644
--- a/nptl/sysdeps/pthread/timer_create.c
+++ b/nptl/sysdeps/pthread/timer_create.c
@@ -81,7 +81,7 @@ timer_create (clock_id, evp, timerid)
{
newtimer->event.sigev_notify = SIGEV_SIGNAL;
newtimer->event.sigev_signo = SIGALRM;
- newtimer->event.sigev_value.sival_int = timer_ptr2id (newtimer);
+ newtimer->event.sigev_value.sival_ptr = timer_ptr2id (newtimer);
newtimer->event.sigev_notify_function = 0;
}
diff --git a/nptl/unwind.c b/nptl/unwind.c
index 4769e0d823..a7855c386c 100644
--- a/nptl/unwind.c
+++ b/nptl/unwind.c
@@ -119,5 +119,5 @@ __pthread_unwind_next (__pthread_unwind_buf_t *buf)
{
struct pthread_unwind_buf *ibuf = (struct pthread_unwind_buf *) buf;
- __pthread_unwind (ibuf->priv.data.prev);
+ __pthread_unwind ((__pthread_unwind_buf_t *) ibuf->priv.data.prev);
}