mirror of
https://sourceware.org/git/glibc.git
synced 2025-09-02 16:01:20 +03:00
Update.
2003-01-02 Ulrich Drepper <drepper@redhat.com> * sysdeps/pthread/bits/pthreadtypes.h (pthread_cond_t): Add padding. * condvar.c: Add symbol versioning. The compatibility versions are the same as the change in the interface does not effect this implementation. * Versions [libpthread]: Add definitions for new pthread_cond_* interfaces for version GLIBC_2.3.2.
This commit is contained in:
@@ -1,3 +1,12 @@
|
||||
2003-01-02 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/pthread/bits/pthreadtypes.h (pthread_cond_t): Add padding.
|
||||
* condvar.c: Add symbol versioning. The compatibility versions
|
||||
are the same as the change in the interface does not effect this
|
||||
implementation.
|
||||
* Versions [libpthread]: Add definitions for new pthread_cond_*
|
||||
interfaces for version GLIBC_2.3.2.
|
||||
|
||||
2002-12-31 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/fork.h: Add libc_hidden_proto for
|
||||
|
@@ -156,6 +156,12 @@ libpthread {
|
||||
# Cancellation wrapper
|
||||
__nanosleep;
|
||||
}
|
||||
GLIBC_2.3.2 {
|
||||
# Changed pthread_cond_t.
|
||||
pthread_cond_init; pthread_cond_destroy;
|
||||
pthread_cond_wait; pthread_cond_timedwait;
|
||||
pthread_cond_signal; pthread_cond_broadcast;
|
||||
}
|
||||
GLIBC_PRIVATE {
|
||||
# Internal libc interface to libpthread
|
||||
__pthread_kill_other_threads_np;
|
||||
|
@@ -24,6 +24,7 @@
|
||||
#include "spinlock.h"
|
||||
#include "queue.h"
|
||||
#include "restart.h"
|
||||
#include <shlib-compat.h>
|
||||
|
||||
int __pthread_cond_init(pthread_cond_t *cond,
|
||||
const pthread_condattr_t *cond_attr)
|
||||
@@ -32,14 +33,26 @@ int __pthread_cond_init(pthread_cond_t *cond,
|
||||
cond->__c_waiting = NULL;
|
||||
return 0;
|
||||
}
|
||||
strong_alias (__pthread_cond_init, pthread_cond_init)
|
||||
versioned_symbol (libpthread, __pthread_cond_init, pthread_cond_init,
|
||||
GLIBC_2_3_2);
|
||||
#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
|
||||
strong_alias (__pthread_cond_init, __old_pthread_cond_init)
|
||||
compat_symbol (libpthread, __old_pthread_cond_init, pthread_cond_init,
|
||||
GLIBC_2_0);
|
||||
#endif
|
||||
|
||||
int __pthread_cond_destroy(pthread_cond_t *cond)
|
||||
{
|
||||
if (cond->__c_waiting != NULL) return EBUSY;
|
||||
return 0;
|
||||
}
|
||||
strong_alias (__pthread_cond_destroy, pthread_cond_destroy)
|
||||
versioned_symbol (libpthread, __pthread_cond_destroy, pthread_cond_destroy,
|
||||
GLIBC_2_3_2);
|
||||
#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
|
||||
strong_alias (__pthread_cond_destroy, __old_pthread_cond_destroy)
|
||||
compat_symbol (libpthread, __old_pthread_cond_destroy, pthread_cond_destroy,
|
||||
GLIBC_2_0);
|
||||
#endif
|
||||
|
||||
/* Function called by pthread_cancel to remove the thread from
|
||||
waiting on a condition variable queue. */
|
||||
@@ -134,7 +147,13 @@ int __pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
|
||||
pthread_mutex_lock(mutex);
|
||||
return 0;
|
||||
}
|
||||
strong_alias (__pthread_cond_wait, pthread_cond_wait)
|
||||
versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
|
||||
GLIBC_2_3_2);
|
||||
#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
|
||||
strong_alias (__pthread_cond_wait, __old_pthread_cond_wait)
|
||||
compat_symbol (libpthread, __old_pthread_cond_wait, pthread_cond_wait,
|
||||
GLIBC_2_0);
|
||||
#endif
|
||||
|
||||
static int
|
||||
pthread_cond_timedwait_relative(pthread_cond_t *cond,
|
||||
@@ -230,12 +249,19 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
||||
const struct timespec * abstime)
|
||||
int __pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
||||
const struct timespec * abstime)
|
||||
{
|
||||
/* Indirect call through pointer! */
|
||||
return pthread_cond_timedwait_relative(cond, mutex, abstime);
|
||||
}
|
||||
versioned_symbol (libpthread, __pthread_cond_timedwait, pthread_cond_timedwait,
|
||||
GLIBC_2_3_2);
|
||||
#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
|
||||
strong_alias (__pthread_cond_timedwait, __old_pthread_cond_timedwait)
|
||||
compat_symbol (libpthread, __old_pthread_cond_timedwait,
|
||||
pthread_cond_timedwait, GLIBC_2_0);
|
||||
#endif
|
||||
|
||||
int __pthread_cond_signal(pthread_cond_t *cond)
|
||||
{
|
||||
@@ -251,7 +277,13 @@ int __pthread_cond_signal(pthread_cond_t *cond)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
strong_alias (__pthread_cond_signal, pthread_cond_signal)
|
||||
versioned_symbol (libpthread, __pthread_cond_signal, pthread_cond_signal,
|
||||
GLIBC_2_3_2);
|
||||
#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
|
||||
strong_alias (__pthread_cond_signal, __old_pthread_cond_signal)
|
||||
compat_symbol (libpthread, __old_pthread_cond_signal, pthread_cond_signal,
|
||||
GLIBC_2_0);
|
||||
#endif
|
||||
|
||||
int __pthread_cond_broadcast(pthread_cond_t *cond)
|
||||
{
|
||||
@@ -270,7 +302,13 @@ int __pthread_cond_broadcast(pthread_cond_t *cond)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
strong_alias (__pthread_cond_broadcast, pthread_cond_broadcast)
|
||||
versioned_symbol (libpthread, __pthread_cond_broadcast, pthread_cond_broadcast,
|
||||
GLIBC_2_3_2);
|
||||
#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
|
||||
strong_alias (__pthread_cond_broadcast, __old_pthread_cond_broadcast)
|
||||
compat_symbol (libpthread, __old_pthread_cond_broadcast,
|
||||
pthread_cond_broadcast, GLIBC_2_0);
|
||||
#endif
|
||||
|
||||
int __pthread_condattr_init(pthread_condattr_t *attr)
|
||||
{
|
||||
|
@@ -57,6 +57,8 @@ typedef struct
|
||||
{
|
||||
struct _pthread_fastlock __c_lock; /* Protect against concurrent access */
|
||||
_pthread_descr __c_waiting; /* Threads waiting on this condition */
|
||||
char __padding[48 - sizeof (struct _pthread_fastlock)
|
||||
- sizeof (_pthread_descr)];
|
||||
} pthread_cond_t;
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user