mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

* semaphore.h: Use struct _pthread_fastlock as an element of

Browse Source 
sem_t instead of an identical struct.
	* rwlock.c: Remove casts.
	* semaphore.c: Likewise.
This commit is contained in:
Ulrich Drepper 2001-06-13 23:12:19 +00:00
parent b50a2c3f96
commit bad6065c97
4 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
linuxthreads/ChangeLog
View File

@ -1,3 +1,10 @@
2001-02-02 John S. Marvin <jsm@udlkern.fc.hp.com>
* semaphore.h: Use struct _pthread_fastlock as an element of
sem_t instead of an identical struct.
* rwlock.c: Remove casts.
* semaphore.c: Likewise.
2001-04-30 Alan Modra <amodra@one.net.au>
* sysdeps/unix/sysv/linux/hppa/pt-initfini.c: New.

8
linuxthreads/rwlock.c
View File

@ -36,9 +36,9 @@ static int rwlock_rd_extricate_func(void *obj, pthread_descr th)
pthread_rwlock_t *rwlock = obj;
int did_remove = 0;
__pthread_lock((struct _pthread_fastlock *) &rwlock->__rw_lock, NULL);
__pthread_lock(&rwlock->__rw_lock, NULL);
did_remove = remove_from_queue(&rwlock->__rw_read_waiting, th);
__pthread_unlock((struct _pthread_fastlock *) &rwlock->__rw_lock);
__pthread_unlock(&rwlock->__rw_lock);
return did_remove;
}
@ -48,9 +48,9 @@ static int rwlock_wr_extricate_func(void *obj, pthread_descr th)
pthread_rwlock_t *rwlock = obj;
int did_remove = 0;
__pthread_lock((struct _pthread_fastlock *) &rwlock->__rw_lock, NULL);
__pthread_lock(&rwlock->__rw_lock, NULL);
did_remove = remove_from_queue(&rwlock->__rw_write_waiting, th);
__pthread_unlock((struct _pthread_fastlock *) &rwlock->__rw_lock);
__pthread_unlock(&rwlock->__rw_lock);
return did_remove;
}

36
linuxthreads/semaphore.c
View File

@ -33,7 +33,7 @@ int __new_sem_init(sem_t *sem, int pshared, unsigned int value)
errno = ENOSYS;
return -1;
}
__pthread_init_lock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_init_lock(&sem->__sem_lock);
sem->__sem_value = value;
sem->__sem_waiting = NULL;
return 0;
@ -48,9 +48,9 @@ static int new_sem_extricate_func(void *obj, pthread_descr th)
sem_t *sem = obj;
int did_remove = 0;
__pthread_lock((struct _pthread_fastlock *) &sem->__sem_lock, self);
__pthread_lock(&sem->__sem_lock, self);
did_remove = remove_from_queue(&sem->__sem_waiting, th);
__pthread_unlock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
return did_remove;
}
@ -66,10 +66,10 @@ int __new_sem_wait(sem_t * sem)
extr.pu_object = sem;
extr.pu_extricate_func = new_sem_extricate_func;
__pthread_lock((struct _pthread_fastlock *) &sem->__sem_lock, self);
__pthread_lock(&sem->__sem_lock, self);
if (sem->__sem_value > 0) {
sem->__sem_value--;
__pthread_unlock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
return 0;
}
/* Register extrication interface */
@ -81,7 +81,7 @@ int __new_sem_wait(sem_t * sem)
enqueue(&sem->__sem_waiting, self);
else
already_canceled = 1;
__pthread_unlock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
if (already_canceled) {
__pthread_set_own_extricate_if(self, 0);
@ -121,7 +121,7 @@ int __new_sem_trywait(sem_t * sem)
{
int retval;
__pthread_lock((struct _pthread_fastlock *) &sem->__sem_lock, NULL);
__pthread_lock(&sem->__sem_lock, NULL);
if (sem->__sem_value == 0) {
errno = EAGAIN;
retval = -1;
@ -129,7 +129,7 @@ int __new_sem_trywait(sem_t * sem)
sem->__sem_value--;
retval = 0;
}
__pthread_unlock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
return retval;
}
@ -140,19 +140,19 @@ int __new_sem_post(sem_t * sem)
struct pthread_request request;
if (THREAD_GETMEM(self, p_in_sighandler) == NULL) {
__pthread_lock((struct _pthread_fastlock *) &sem->__sem_lock, self);
__pthread_lock(&sem->__sem_lock, self);
if (sem->__sem_waiting == NULL) {
if (sem->__sem_value >= SEM_VALUE_MAX) {
/* Overflow */
errno = ERANGE;
__pthread_unlock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
return -1;
}
sem->__sem_value++;
__pthread_unlock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
} else {
th = dequeue(&sem->__sem_waiting);
__pthread_unlock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
th->p_sem_avail = 1;
WRITE_MEMORY_BARRIER();
restart(th);
@ -214,17 +214,17 @@ int sem_timedwait(sem_t *sem, const struct timespec *abstime)
int already_canceled = 0;
int spurious_wakeup_count;
__pthread_lock((struct _pthread_fastlock *) &sem->__sem_lock, self);
__pthread_lock(&sem->__sem_lock, self);
if (sem->__sem_value > 0) {
--sem->__sem_value;
__pthread_unlock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
return 0;
}
if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) {
/* The standard requires that if the function would block and the
time value is illegal, the function returns with an error. */
__pthread_unlock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
return EINVAL;
}
@ -241,7 +241,7 @@ int sem_timedwait(sem_t *sem, const struct timespec *abstime)
enqueue(&sem->__sem_waiting, self);
else
already_canceled = 1;
__pthread_unlock((struct _pthread_fastlock *) &sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
if (already_canceled) {
__pthread_set_own_extricate_if(self, 0);
@ -257,9 +257,9 @@ int sem_timedwait(sem_t *sem, const struct timespec *abstime)
/* __pthread_lock will queue back any spurious restarts that
may happen to it. */
__pthread_lock((struct _pthread_fastlock *)&sem->__sem_lock, self);
__pthread_lock(&sem->__sem_lock, self);
was_on_queue = remove_from_queue(&sem->__sem_waiting, self);
__pthread_unlock((struct _pthread_fastlock *)&sem->__sem_lock);
__pthread_unlock(&sem->__sem_lock);
if (was_on_queue) {
__pthread_set_own_extricate_if(self, 0);

6
linuxthreads/semaphore.h
View File

@ -31,11 +31,7 @@ typedef struct _pthread_descr_struct *_pthread_descr;
/* System specific semaphore definition. */
typedef struct
{
struct
{
long int __status;
int __spinlock;
} __sem_lock;
struct _pthread_fastlock __sem_lock;
int __sem_value;
_pthread_descr __sem_waiting;
} sem_t;