Simplify sytem call renaming. Instead of _foo() <-- _libc_foo <-- foo(),

just use _foo() <-- foo().  In the case of a libpthread that doesn't do
call conversion (such as linuxthreads and our upcoming libpthread), this
is adequate.  In the case of libc_r, we still need three names, which are
now _thread_sys_foo() <-- _foo() <-- foo().

Convert all internal libc usage of: aio_suspend(), close(), fsync(), msync(),
nanosleep(), open(), fcntl(), read(), and write() to _foo() instead of foo().

Remove all internal libc usage of: creat(), pause(), sleep(), system(),
tcdrain(), wait(), and waitpid().

Make thread cancellation fully POSIX-compliant.

Suggested by:	deischen

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/libpthread/thread/thr_cond.c b/lib/libpthread/thread/thr_cond.c
index ced48e3..d236607 100644
--- a/lib/libpthread/thread/thr_cond.c
+++ b/lib/libpthread/thread/thr_cond.c
@@ -160,6 +160,8 @@ pthread_cond_wait(pthread_cond_t * cond, pthread_mutex_t * mutex)
 	int	rval = 0;
 	int	interrupted = 0;
 
+	_thread_enter_cancellation_point();
+	
 	if (cond == NULL)
 		rval = EINVAL;
 
@@ -286,6 +288,8 @@ pthread_cond_wait(pthread_cond_t * cond, pthread_mutex_t * mutex)
 		_thread_leave_cancellation_point();
 	}
 
+	_thread_leave_cancellation_point();
+
 	/* Return the completion status: */
 	return (rval);
 }
@@ -297,12 +301,15 @@ pthread_cond_timedwait(pthread_cond_t * cond, pthread_mutex_t * mutex,
 	int	rval = 0;
 	int	interrupted = 0;
 
+	_thread_enter_cancellation_point();
+	
 	if (cond == NULL || abstime == NULL)
 		rval = EINVAL;
 
 	if (abstime->tv_sec < 0 || 
 		abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) {
 		errno = EINVAL;
+		_thread_leave_cancellation_point();
 		return (-1);
 	}
 
@@ -448,6 +455,8 @@ pthread_cond_timedwait(pthread_cond_t * cond, pthread_mutex_t * mutex,
 		_thread_leave_cancellation_point();
 	}
 
+	_thread_leave_cancellation_point();
+	
 	/* Return the completion status: */
 	return (rval);
 }