aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-01-05 17:54:30 +0000
committerUlrich Drepper <drepper@redhat.com>2000-01-05 17:54:30 +0000
commit2ba3c8362a2fa1d6f12b0cc5bcb436460e8f0c0a (patch)
treef4df7237d81b2e62b406eda3834261d6c5a16183 /linuxthreads
parentd569d3331fa1497cf177c03f912e5154dac8e204 (diff)
downloadglibc-2ba3c8362a2fa1d6f12b0cc5bcb436460e8f0c0a.tar
glibc-2ba3c8362a2fa1d6f12b0cc5bcb436460e8f0c0a.tar.gz
glibc-2ba3c8362a2fa1d6f12b0cc5bcb436460e8f0c0a.tar.bz2
glibc-2ba3c8362a2fa1d6f12b0cc5bcb436460e8f0c0a.zip
* pthread.c (__pthread_initial_thread, pthread_manager_thread):
Adjust initializers for struct _pthread_descr_struct change.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog2
-rw-r--r--linuxthreads/pthread.c24
2 files changed, 16 insertions, 10 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index b84ceb0cd6..0355a861dc 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,7 @@
2000-01-05 Ulrich Drepper <drepper@cygnus.com>
+ * pthread.c (__pthread_initial_thread, pthread_manager_thread):
+ Adjust initializers for struct _pthread_descr_struct change.
* internals.h (struct _pthread_descr_struct): Move new elements to
the end.
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index f082e95478..34d1de180c 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -43,7 +43,6 @@ struct _pthread_descr_struct __pthread_initial_thread = {
0, /* int p_priority */
&__pthread_handles[0].h_lock, /* struct _pthread_fastlock * p_lock */
0, /* int p_signal */
- ATOMIC_INITIALIZER, /* struct pthread_atomic p_resume_count */
NULL, /* sigjmp_buf * p_signal_buf */
NULL, /* sigjmp_buf * p_cancel_buf */
0, /* char p_terminated */
@@ -56,8 +55,6 @@ struct _pthread_descr_struct __pthread_initial_thread = {
0, /* char p_cancelstate */
0, /* char p_canceltype */
0, /* char p_canceled */
- 0, /* char p_woken_by_cancel */
- NULL, /* struct pthread_extricate_if *p_extricate */
NULL, /* int *p_errnop */
0, /* int p_errno */
NULL, /* int *p_h_errnop */
@@ -72,7 +69,12 @@ struct _pthread_descr_struct __pthread_initial_thread = {
NULL, /* void * p_guardaddr */
0, /* size_t p_guardsize */
&__pthread_initial_thread, /* pthread_descr p_self */
- 0 /* Always index 0 */
+ 0, /* Always index 0 */
+ 0, /* int p_report_events */
+ {{{0, }}, 0, NULL}, /* td_eventbuf_t p_eventbuf */
+ ATOMIC_INITIALIZER, /* struct pthread_atomic p_resume_count */
+ 0, /* char p_woken_by_cancel */
+ NULL /* struct pthread_extricate_if *p_extricate */
};
/* Descriptor of the manager thread; none of this is used but the error
@@ -89,7 +91,6 @@ struct _pthread_descr_struct __pthread_manager_thread = {
0, /* int p_priority */
&__pthread_handles[1].h_lock, /* struct _pthread_fastlock * p_lock */
0, /* int p_signal */
- ATOMIC_INITIALIZER, /* struct pthread_atomic p_resume_count */
NULL, /* sigjmp_buf * p_signal_buf */
NULL, /* sigjmp_buf * p_cancel_buf */
0, /* char p_terminated */
@@ -102,8 +103,6 @@ struct _pthread_descr_struct __pthread_manager_thread = {
0, /* char p_cancelstate */
0, /* char p_canceltype */
0, /* char p_canceled */
- 0, /* char p_woken_by_cancel */
- NULL, /* struct pthread_extricate_if *p_extricate */
&__pthread_manager_thread.p_errno, /* int *p_errnop */
0, /* int p_errno */
NULL, /* int *p_h_errnop */
@@ -118,7 +117,12 @@ struct _pthread_descr_struct __pthread_manager_thread = {
NULL, /* void * p_guardaddr */
0, /* size_t p_guardsize */
&__pthread_manager_thread, /* pthread_descr p_self */
- 1 /* Always index 1 */
+ 1, /* Always index 1 */
+ 0, /* int p_report_events */
+ {{{0, }}, 0, NULL}, /* td_eventbuf_t p_eventbuf */
+ ATOMIC_INITIALIZER, /* struct pthread_atomic p_resume_count */
+ 0, /* char p_woken_by_cancel */
+ NULL /* struct pthread_extricate_if *p_extricate */
};
/* Pointer to the main thread (the father of the thread manager thread) */
@@ -150,7 +154,7 @@ char *__pthread_manager_thread_tos = NULL;
int __pthread_exit_requested = 0;
int __pthread_exit_code = 0;
-/* Pointers that select new or old suspend/resume functions
+/* Pointers that select new or old suspend/resume functions
based on availability of rt signals. */
void (*__pthread_restart)(pthread_descr) = __pthread_restart_old;
@@ -813,7 +817,7 @@ void __pthread_wait_for_restart_signal(pthread_descr self)
Since the restart signal does not queue, we use an atomic counter to create
queuing semantics. This is needed to resolve a rare race condition in
pthread_cond_timedwait_relative. */
-
+
void __pthread_restart_old(pthread_descr th)
{
if (atomic_increment(&th->p_resume_count) == -1)