Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Aug 2002 03:47:16 -0700 (PDT)
From:      Jonathan Mini <mini@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 16150 for review
Message-ID:  <200208171047.g7HAlGx6008548@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16150

Change 16150 by mini@mini_stylus on 2002/08/17 03:47:14

	Remove additional wrappers.

Affected files ...

.. //depot/projects/kse/lib/libc_r/uthread/uthread_msync.c#3 edit
.. //depot/projects/kse/lib/libc_r/uthread/uthread_wait4.c#3 edit

Differences ...

==== //depot/projects/kse/lib/libc_r/uthread/uthread_msync.c#3 (text+ko) ====

@@ -14,16 +14,6 @@
 __weak_reference(__msync, msync);
 
 int
-_msync(void *addr, size_t len, int flags)
-{
-	int ret;
-
-	ret = __sys_msync(addr, len, flags);
-
-	return (ret);
-}
-
-int
 __msync(void *addr, size_t len, int flags)
 {
 	int	ret;
@@ -35,7 +25,7 @@
 	 * a cancellation point, as per the standard. sigh.
 	 */
 	_thread_enter_cancellation_point();
-	ret = _msync(addr, len, flags);
+	ret = __sys_msync(addr, len, flags);
 	_thread_leave_cancellation_point();
 
 	return ret;

==== //depot/projects/kse/lib/libc_r/uthread/uthread_wait4.c#3 (text+ko) ====

@@ -41,35 +41,6 @@
 __weak_reference(__wait4, wait4);
 
 pid_t
-_wait4(pid_t pid, int *istat, int options, struct rusage * rusage)
-{
-	struct pthread	*curthread = _get_curthread();
-	pid_t	ret;
-
-	_thread_kern_sig_defer();
-
-	/* Perform a non-blocking wait4 syscall: */
-	while ((ret = __sys_wait4(pid, istat, options | WNOHANG, rusage)) == 0 && (options & WNOHANG) == 0) {
-		/* Reset the interrupted operation flag: */
-		curthread->interrupted = 0;
-
-		/* Schedule the next thread while this one waits: */
-		_thread_kern_sched_state(PS_WAIT_WAIT, __FILE__, __LINE__);
-
-		/* Check if this call was interrupted by a signal: */
-		if (curthread->interrupted) {
-			errno = EINTR;
-			ret = -1;
-			break;
-		}
-	}
-
-	_thread_kern_sig_undefer();
-
-	return (ret);
-}
-
-pid_t
 __wait4(pid_t pid, int *istat, int options, struct rusage *rusage)
 {
 	pid_t ret;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200208171047.g7HAlGx6008548>