aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man3/pthread_setcancelstate.33
-rw-r--r--man7/pthreads.76
2 files changed, 6 insertions, 3 deletions
diff --git a/man3/pthread_setcancelstate.3 b/man3/pthread_setcancelstate.3
index 1a6fe45bfd..a516fde665 100644
--- a/man3/pthread_setcancelstate.3
+++ b/man3/pthread_setcancelstate.3
@@ -78,7 +78,8 @@ A cancellation request is deferred until the thread next calls
a function that is a cancellation point (see
.BR pthreads (7)).
This is the default cancelability type in all new threads,
-including the initial thread. Even with deferred cancellation a
+including the initial thread.
+Even with deferred cancellation a
cancellation point in an asynchronous signal handler may still
be acted upon and the effect is as-if it was an asynchronous
cancellation.
diff --git a/man7/pthreads.7 b/man7/pthreads.7
index b39236c398..aa56589432 100644
--- a/man7/pthreads.7
+++ b/man7/pthreads.7
@@ -569,9 +569,11 @@ any nonstandard function that may block as a cancellation point.
It should be noted that even if an application is not using
asynchronous cancellation, that calling a function from the above list
from an asynchronous signal handler may cause the equivalent of
-asynchronous cancellation. The underlying user code may not expect
+asynchronous cancellation.
+The underlying user code may not expect
asynchronous cancellation and the state of the user data may become
-inconsistent. Therefore signals should be used with caution when
+inconsistent.
+Therefore signals should be used with caution when
entering a region of deferred cancellation.
.\" So, scanning "cancellation point" comments in the glibc 2.8 header
.\" files, it looks as though at least the following nonstandard