lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-12-24 17:51:17 +03:00
Code Activity

Update.

Browse Source 
* manual/job.texi: Fix typos.
	* manual/process.texi: Likewise.
	* manual/signal.texi: Likewise.
This commit is contained in:
Ulrich Drepper
2000-02-15 01:39:39 +00:00
parent 7c437eb803
commit a496e4ce95
5 changed files with 57 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
linuxthreads/condvar.c
View File

@@ -26,13 +26,13 @@
#include "restart.h"
static int pthread_cond_timedwait_relative_old(pthread_cond_t *,
pthread_mutex_t *, struct timespec *);
pthread_mutex_t *, const struct timespec *);
static int pthread_cond_timedwait_relative_new(pthread_cond_t *,
pthread_mutex_t *, struct timespec *);
pthread_mutex_t *, const struct timespec *);
static int (*pthread_cond_tw_rel)(pthread_cond_t *, pthread_mutex_t *,
struct timespec *) = pthread_cond_timedwait_relative_old;
const struct timespec *) = pthread_cond_timedwait_relative_old;
/* initialize this module */
void __pthread_init_condvar(int rt_sig_available)
@@ -130,29 +130,15 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
static int
pthread_cond_timedwait_relative_old(pthread_cond_t *cond,
pthread_mutex_t *mutex,
struct timespec * reltime)
const struct timespec * abstime)
{
volatile pthread_descr self = thread_self();
sigset_t unblock, initial_mask;
#ifdef NANOSLEEP_WORKS
int already_canceled = 0;
int was_signalled = 0;
#else
int retsleep;
int already_canceled;
int was_signalled;
#endif
sigjmp_buf jmpbuf;
pthread_extricate_if extr;
#ifndef NANOSLEEP_WORKS
requeue_and_wait_again:
retsleep = 0;
already_canceled = 0;
was_signalled = 0;
#endif
/* Set up extrication interface */
extr.pu_object = cond;
extr.pu_extricate_func = cond_extricate_func;
@@ -187,22 +173,30 @@ pthread_cond_timedwait_relative_old(pthread_cond_t *cond,
sigemptyset(&unblock);
sigaddset(&unblock, __pthread_sig_restart);
sigprocmask(SIG_UNBLOCK, &unblock, &initial_mask);
#ifdef NANOSLEEP_WORKS
/* Sleep for the required duration. If woken by a signal, resume waiting
as required by Single Unix Specification. */
while (__libc_nanosleep(reltime, reltime) != 0)
;
#else
/* Sleep for the required duration */
retsleep = __libc_nanosleep(reltime, NULL);
#endif
while (1) {
struct timeval now;
struct timespec reltime;
/* Compute a time offset relative to now. */
__gettimeofday (&now, NULL);
reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
reltime.tv_sec = abstime->tv_sec - now.tv_sec;
if (reltime.tv_nsec < 0) {
reltime.tv_nsec += 1000000000;
reltime.tv_sec -= 1;
}
/* Sleep for the required duration. If woken by a signal,
resume waiting as required by Single Unix Specification. */
if (reltime.tv_sec < 0 || __libc_nanosleep(&reltime, NULL) == 0)
break;
}
/* Block the restart signal again */
sigprocmask(SIG_SETMASK, &initial_mask, NULL);
was_signalled = 0;
} else {
#ifndef NANOSLEEP_WORKS
retsleep = -1;
#endif
was_signalled = 1;
}
THREAD_SETMEM(self, p_signal_jmp, NULL);
@@ -234,15 +228,7 @@ pthread_cond_timedwait_relative_old(pthread_cond_t *cond,
if (was_on_queue) {
__pthread_set_own_extricate_if(self, 0);
pthread_mutex_lock(mutex);
#ifdef NANOSLEEP_WORKS
return ETIMEDOUT;
#else
if (retsleep == 0)
return ETIMEDOUT;
/* Woken by a signal: resume waiting as required by Single Unix
Specification. */
goto requeue_and_wait_again;
#endif
}
suspend(self);
@@ -275,28 +261,14 @@ pthread_cond_timedwait_relative_new(pthread_cond_t *cond,
{
volatile pthread_descr self = thread_self();
sigset_t unblock, initial_mask;
#ifdef NANOSLEEP_WORKS
int already_canceled = 0;
int was_signalled = 0;
#else
int retsleep;
int already_canceled;
int was_signalled;
#endif
sigjmp_buf jmpbuf;
pthread_extricate_if extr;
already_canceled = 0;
was_signalled = 0;
#ifndef NANOSLEEP_WORKS
requeue_and_wait_again:
retsleep = 0;
already_canceled = 0;
was_signalled = 0;
#endif
/* Set up extrication interface */
extr.pu_object = cond;
extr.pu_extricate_func = cond_extricate_func;
@@ -330,22 +302,30 @@ pthread_cond_timedwait_relative_new(pthread_cond_t *cond,
sigemptyset(&unblock);
sigaddset(&unblock, __pthread_sig_restart);
sigprocmask(SIG_UNBLOCK, &unblock, &initial_mask);
#ifdef NANOSLEEP_WORKS
/* Sleep for the required duration. If woken by a signal, resume waiting
as required by Single Unix Specification. */
while (__libc_nanosleep(reltime, reltime) != 0)
;
#else
/* Sleep for the required duration */
retsleep = __libc_nanosleep(reltime, NULL);
#endif
while (1) {
struct timeval now;
struct timespec reltime;
/* Compute a time offset relative to now. */
__gettimeofday (&now, NULL);
reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
reltime.tv_sec = abstime->tv_sec - now.tv_sec;
if (reltime.tv_nsec < 0) {
reltime.tv_nsec += 1000000000;
reltime.tv_sec -= 1;
}
/* Sleep for the required duration. If woken by a signal,
resume waiting as required by Single Unix Specification. */
if (reltime.tv_sec < 0 || __libc_nanosleep(&reltime, NULL) == 0)
break;
}
/* Block the restart signal again */
sigprocmask(SIG_SETMASK, &initial_mask, NULL);
was_signalled = 0;
} else {
#ifndef NANOSLEEP_WORKS
retsleep = -1;
#endif
was_signalled = 1;
}
THREAD_SETMEM(self, p_signal_jmp, NULL);
@@ -374,15 +354,7 @@ pthread_cond_timedwait_relative_new(pthread_cond_t *cond,
if (was_on_queue) {
__pthread_set_own_extricate_if(self, 0);
pthread_mutex_lock(mutex);
#ifdef NANOSLEEP_WORKS
return ETIMEDOUT;
#else
if (retsleep == 0)
return ETIMEDOUT;
/* Woken by a signal: resume waiting as required by Single Unix
Specification. */
goto requeue_and_wait_again;
#endif
}
/* Eat the outstanding restart() from the signaller */
@@ -408,22 +380,8 @@ pthread_cond_timedwait_relative_new(pthread_cond_t *cond,
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
const struct timespec * abstime)
{
struct timeval now;
struct timespec reltime;
/* Compute a time offset relative to now. */
__gettimeofday (&now, NULL);
reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
reltime.tv_sec = abstime->tv_sec - now.tv_sec;
if (reltime.tv_nsec < 0) {
reltime.tv_nsec += 1000000000;
reltime.tv_sec -= 1;
}
if (reltime.tv_sec < 0)
return ETIMEDOUT;
/* Indirect call through pointer! */
return pthread_cond_tw_rel(cond, mutex, &reltime);
return pthread_cond_tw_rel(cond, mutex, abstime);
}
int pthread_cond_signal(pthread_cond_t *cond)