aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-02-15 01:39:39 +0000
committerUlrich Drepper <drepper@redhat.com>2000-02-15 01:39:39 +0000
commita496e4ce9546e451567a601600847675a5e76fe8 (patch)
treee41061f1fa39a42a77ed779f7f6d870ea8a2a8b5
parent7c437eb80360ee1774ce5dbeaf983337b9ab8113 (diff)
downloadglibc-a496e4ce9546e451567a601600847675a5e76fe8.tar
glibc-a496e4ce9546e451567a601600847675a5e76fe8.tar.gz
glibc-a496e4ce9546e451567a601600847675a5e76fe8.tar.bz2
glibc-a496e4ce9546e451567a601600847675a5e76fe8.zip
Update.
* manual/job.texi: Fix typos. * manual/process.texi: Likewise. * manual/signal.texi: Likewise.
-rw-r--r--ChangeLog4
-rw-r--r--linuxthreads/condvar.c132
-rw-r--r--manual/job.texi4
-rw-r--r--manual/process.texi2
-rw-r--r--manual/signal.texi10
5 files changed, 57 insertions, 95 deletions
diff --git a/ChangeLog b/ChangeLog
index 93fa9ac8a8..bbfbaa4ad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2000-02-14 Ulrich Drepper <drepper@redhat.com>
+ * manual/job.texi: Fix typos.
+ * manual/process.texi: Likewise.
+ * manual/signal.texi: Likewise.
+
* sysdeps/powerpc/atomicity.h: Remove white space to avoid
compiler warning.
diff --git a/linuxthreads/condvar.c b/linuxthreads/condvar.c
index 2dd1e84027..6d54291de6 100644
--- a/linuxthreads/condvar.c
+++ b/linuxthreads/condvar.c
@@ -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)
diff --git a/manual/job.texi b/manual/job.texi
index d19a8d4cc6..fbc7ace2c2 100644
--- a/manual/job.texi
+++ b/manual/job.texi
@@ -675,8 +675,8 @@ stop together.
The foreground job may have left the terminal in a strange state, so the
shell should restore its own saved terminal modes before continuing. In
-case the job is merely been stopped, the shell should first save the
-current terminal modes so that it can restore them later if the job is
+case the job is merely stopped, the shell should first save the current
+terminal modes so that it can restore them later if the job is
continued. The functions for dealing with terminal modes are
@code{tcgetattr} and @code{tcsetattr}; these are described in
@ref{Terminal Modes}.
diff --git a/manual/process.texi b/manual/process.texi
index 14421b592f..08c880bc0e 100644
--- a/manual/process.texi
+++ b/manual/process.texi
@@ -63,7 +63,7 @@ possible to create the shell process, and otherwise is the status of the
shell process. @xref{Process Completion}, for details on how this
status code can be interpreted.
-If the @var{command} argument is a null pointer a non-zero return value
+If the @var{command} argument is a null pointer, a non-zero return value
indicates that a command processor is available and this function can be
used at all.
diff --git a/manual/signal.texi b/manual/signal.texi
index 08ee785c8c..4340ee7cbd 100644
--- a/manual/signal.texi
+++ b/manual/signal.texi
@@ -543,7 +543,7 @@ In fact, if @code{SIGKILL} fails to terminate a process, that by itself
constitutes an operating system bug which you should report.
The system will generate @code{SIGKILL} for a process itself under some
-unusual conditions where the program cannot possible continue to run
+unusual conditions where the program cannot possibly continue to run
(even to run a signal handler).
@end deftypevr
@cindex kill signal
@@ -1856,7 +1856,7 @@ blocks signals around each use, then you are safe.
There are a large number of library functions that return values in a
fixed object, always reusing the same object in this fashion, and all of
-them cause the same problem. Function descriptions in this manual
+them cause the same problem. Function descriptions in this manual
always mention this behavior.
@item
@@ -2031,8 +2031,8 @@ atomically.
In practice, you can assume that @code{int} and other integer types no
longer than @code{int} are atomic. You can also assume that pointer
-types are atomic; that is very convenient. Both of these assumptions
-are true on all of the machines that the GNU C library supports and on
+types are atomic; that is very convenient. Both of these assumptions
+are true on all of the machines that the GNU C library supports and on
all POSIX systems we know of.
@c ??? This might fail on a 386 that uses 64-bit pointers.
@@ -3011,7 +3011,7 @@ to terminate the process or invoke a signal handling function. In other
words, the program is effectively suspended until one of the signals that
is not a member of @var{set} arrives.
-If the process is woken up by deliver of a signal that invokes a handler
+If the process is woken up by delivery of a signal that invokes a handler
function, and the handler function returns, then @code{sigsuspend} also
returns.