give msync a cancellation point

3 files changed, 66 insertions, 2 deletions

diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile
index 3dac1b5362b..aa0154fe0ef 100644
--- a/lib/libc_r/Makefile
+++ b/lib/libc_r/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 1999/01/08 05:45:27 d Exp $
+#	$OpenBSD: Makefile,v 1.5 1999/01/17 23:43:17 d Exp $
 #
 # All library objects contain sccsid strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -34,7 +34,7 @@ HIDDEN_SYSCALLS= accept.o bind.o close.o connect.o dup.o dup2.o \
 	execve.o fchflags.o fchmod.o fchown.o fcntl.o \
 	flock.o fpathconf.o fstat.o fstatfs.o fsync.o getdirentries.o \
 	getpeername.o getsockname.o getsockopt.o ioctl.o listen.o \
-	nanosleep.o open.o poll.o read.o readv.o recvfrom.o \
+	msync.o nanosleep.o open.o poll.o read.o readv.o recvfrom.o \
 	recvmsg.o sched_yield.o select.o sendmsg.o sendto.o \
 	setsockopt.o shutdown.o sigaction.o sigaltstack.o \
 	socket.o socketpair.o wait4.o write.o writev.o \
diff --git a/lib/libc_r/uthread/uthread_msync.c b/lib/libc_r/uthread/uthread_msync.c
new file mode 100644
index 00000000000..246cdde7226
--- /dev/null
+++ b/lib/libc_r/uthread/uthread_msync.c
@@ -0,0 +1,32 @@
+/*
+ * David Leonard <d@openbsd.org>, 1999. Public Domain.
+ *
+ * $OpenBSD: uthread_msync.c,v 1.1 1999/01/17 23:43:18 d Exp $
+ */
+
+#include <sys/types.h>
+#include <sys/mman.h>
+#ifdef _THREAD_SAFE
+#include <pthread.h>
+#include "pthread_private.h"
+
+int
+msync(addr, len, flags)
+	void *addr;
+	size_t len;
+	int flags;
+{
+	int ret;
+
+	/*
+	 * XXX This is quite pointless unless we know how to get the
+	 * file descriptor associated with the memory, and lock it for
+	 * write. The only real use of this wrapper is to guarantee
+	 * a cancellation point, as per the standard. sigh.
+	 */
+	_thread_enter_cancellation_point();
+	ret = _thread_sys_msync(addr, len, flags);
+	_thread_leave_cancellation_point();
+	return (ret);
+}
+#endif
diff --git a/lib/libpthread/uthread/uthread_msync.c b/lib/libpthread/uthread/uthread_msync.c
new file mode 100644
index 00000000000..246cdde7226
--- /dev/null
+++ b/lib/libpthread/uthread/uthread_msync.c
@@ -0,0 +1,32 @@
+/*
+ * David Leonard <d@openbsd.org>, 1999. Public Domain.
+ *
+ * $OpenBSD: uthread_msync.c,v 1.1 1999/01/17 23:43:18 d Exp $
+ */
+
+#include <sys/types.h>
+#include <sys/mman.h>
+#ifdef _THREAD_SAFE
+#include <pthread.h>
+#include "pthread_private.h"
+
+int
+msync(addr, len, flags)
+	void *addr;
+	size_t len;
+	int flags;
+{
+	int ret;
+
+	/*
+	 * XXX This is quite pointless unless we know how to get the
+	 * file descriptor associated with the memory, and lock it for
+	 * write. The only real use of this wrapper is to guarantee
+	 * a cancellation point, as per the standard. sigh.
+	 */
+	_thread_enter_cancellation_point();
+	ret = _thread_sys_msync(addr, len, flags);
+	_thread_leave_cancellation_point();
+	return (ret);
+}
+#endif