mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
1999-09-24 Ulrich Drepper <drepper@cygnus.com> * nis/nss_nisplus/nisplus-parser.c (_nss_nisplus_parse_grent): Do not ovverwrite last group member with NULL pointer. Reported by Thomas Winder <thomas.winder@newlogic.at>.
This commit is contained in:
@ -1,3 +1,8 @@
|
||||
1999-09-25 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* condvar.c (pthread_cond_timedwait_relative): Never return with
|
||||
EINTR. Patch by Andreas Schwab.
|
||||
|
||||
1999-09-19 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* signals.c (sigaction): Correct last patch. Don't select
|
||||
|
@ -76,6 +76,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
|
||||
enqueue(&cond->__c_waiting, self);
|
||||
__pthread_unlock(&cond->__c_lock);
|
||||
pthread_mutex_unlock(mutex);
|
||||
continue_waiting:
|
||||
/* Set up a longjmp handler for the restart and cancel signals */
|
||||
if (sigsetjmp(jmpbuf, 1) == 0) {
|
||||
THREAD_SETMEM(self, p_signal_jmp, &jmpbuf);
|
||||
@ -113,13 +114,16 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
|
||||
pthread_mutex_lock(mutex);
|
||||
pthread_exit(PTHREAD_CANCELED);
|
||||
}
|
||||
/* If not signaled: also remove ourselves and return an error code */
|
||||
/* If not signaled: also remove ourselves and return an error code, but
|
||||
only if the timeout has elapsed. If not, jsut continue waiting. */
|
||||
if (THREAD_GETMEM(self, p_signal) == 0) {
|
||||
if (retsleep != 0)
|
||||
goto continue_waiting;
|
||||
__pthread_lock(&cond->__c_lock, self);
|
||||
remove_from_queue(&cond->__c_waiting, self);
|
||||
__pthread_unlock(&cond->__c_lock);
|
||||
pthread_mutex_lock(mutex);
|
||||
return retsleep == 0 ? ETIMEDOUT : EINTR;
|
||||
return ETIMEDOUT;
|
||||
}
|
||||
/* Otherwise, return normally */
|
||||
pthread_mutex_lock(mutex);
|
||||
|
Reference in New Issue
Block a user