aboutsummaryrefslogtreecommitdiff
path: root/mach/msg.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-02-19 00:22:30 +0000
committerRoland McGrath <roland@gnu.org>2002-02-19 00:22:30 +0000
commit3a2832a07f0b5b72d457c788e2268232f22a1a67 (patch)
tree8e9f55d68d02df8bf654a1f4f74dfea987025654 /mach/msg.c
parent21297437bb37c5f1aedb615fd41e93efc12f556a (diff)
downloadglibc-3a2832a07f0b5b72d457c788e2268232f22a1a67.tar
glibc-3a2832a07f0b5b72d457c788e2268232f22a1a67.tar.gz
glibc-3a2832a07f0b5b72d457c788e2268232f22a1a67.tar.bz2
glibc-3a2832a07f0b5b72d457c788e2268232f22a1a67.zip
* sysdeps/mach/hurd/times.c: Fix typo in last change.
* sysdeps/mach/hurd/setpriority.c [POLICY_TIMESHARE_BASE_COUNT]: Use task_policy in place of task_priority. * sysdeps/generic/bits/mman.h (MS_ASYNC, MS_SYNC, MS_INVALIDATE): New macros. * sysdeps/mach/msync.c: New file. * sysdeps/mach/powerpc/syscall.S: New file. * mach/msg.c [MACH_MSG_OVERWRITE] (__mach_msg_trap, __mach_msg_overwrite): New functions. * mach/Versions (libc: GLIBC_2.0): Add mach_msg_overwrite and __ name. * sysdeps/mach/configure.in: Check for clock.defs to put into mach_interface_list. * sysdeps/mach/configure: Regenerated. * mach/Makefile (mach-machine): New variable, set from $(base-machine). ($(objpfx)mach-syscalls.mk): Use it in place of $(base-machine). ($(mach-syscalls:%=$(objpfx)%.S) static pattern rule): Use <mach/machine/syscall_sw.h> instead of <sysdep.h>. (mach-shortcuts): Add device_read_overwrite_request, device_read_overwrite, vm_read_overwrite, thread_switch. * configure.in (base_machine): Set to $machine by default. * configure: Regenerated.
Diffstat (limited to 'mach/msg.c')
-rw-r--r--mach/msg.c85
1 files changed, 74 insertions, 11 deletions
diff --git a/mach/msg.c b/mach/msg.c
index ece110868d..bccad7fd26 100644
--- a/mach/msg.c
+++ b/mach/msg.c
@@ -1,31 +1,94 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989, 1995 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
#include <mach/port.h>
#include <mach/message.h>
+#ifdef MACH_MSG_OVERWRITE
+/* In variants with this feature, the actual system call is
+ __mach_msg_overwrite_trap. */
+mach_msg_return_t
+__mach_msg_trap (mach_msg_header_t *msg,
+ mach_msg_option_t option,
+ mach_msg_size_t send_size,
+ mach_msg_size_t rcv_size,
+ mach_port_t rcv_name,
+ mach_msg_timeout_t timeout,
+ mach_port_t notify)
+{
+ return __mach_msg_overwrite_trap (msg, option, send_size,
+ rcv_size, rcv_name, timeout, notify,
+ MACH_MSG_NULL, 0);
+}
+weak_alias (__mach_msg_trap, mach_msg_trap)
+
+/* See comments below in __mach_msg. */
+mach_msg_return_t
+__mach_msg_overwrite (mach_msg_header_t *msg,
+ mach_msg_option_t option,
+ mach_msg_size_t send_size,
+ mach_msg_size_t rcv_size,
+ mach_port_t rcv_name,
+ mach_msg_timeout_t timeout,
+ mach_port_t notify,
+ mach_msg_header_t *rcv_msg,
+ mach_msg_size_t rcv_msg_size)
+
+{
+ mach_msg_return_t ret;
+
+ /* Consider the following cases:
+ 1. Errors in pseudo-receive (eg, MACH_SEND_INTERRUPTED
+ plus special bits).
+ 2. Use of MACH_SEND_INTERRUPT/MACH_RCV_INTERRUPT options.
+ 3. RPC calls with interruptions in one/both halves.
+ */
+
+ ret = __mach_msg_overwrite_trap (msg, option, send_size,
+ rcv_size, rcv_name, timeout, notify,
+ rcv_msg, rcv_msg_size);
+ if (ret == MACH_MSG_SUCCESS)
+ return MACH_MSG_SUCCESS;
+
+ if (!(option & MACH_SEND_INTERRUPT))
+ while (ret == MACH_SEND_INTERRUPTED)
+ ret = __mach_msg_overwrite_trap (msg, option, send_size,
+ rcv_size, rcv_name, timeout, notify,
+ rcv_msg, rcv_msg_size);
+
+ if (!(option & MACH_RCV_INTERRUPT))
+ while (ret == MACH_RCV_INTERRUPTED)
+ ret = __mach_msg_overwrite_trap (msg, option & ~MACH_SEND_MSG,
+ 0, rcv_size, rcv_name, timeout, notify,
+ rcv_msg, rcv_msg_size);
+
+ return ret;
+}
+weak_alias (__mach_msg_overwrite, mach_msg_overwrite)
+#endif
+
mach_msg_return_t
__mach_msg (mach_msg_header_t *msg,
mach_msg_option_t option,
@@ -36,29 +99,29 @@ __mach_msg (mach_msg_header_t *msg,
mach_port_t notify)
{
mach_msg_return_t ret;
-
+
/* Consider the following cases:
1. Errors in pseudo-receive (eg, MACH_SEND_INTERRUPTED
plus special bits).
2. Use of MACH_SEND_INTERRUPT/MACH_RCV_INTERRUPT options.
3. RPC calls with interruptions in one/both halves.
*/
-
+
ret = __mach_msg_trap (msg, option, send_size,
rcv_size, rcv_name, timeout, notify);
if (ret == MACH_MSG_SUCCESS)
return MACH_MSG_SUCCESS;
-
+
if (!(option & MACH_SEND_INTERRUPT))
while (ret == MACH_SEND_INTERRUPTED)
ret = __mach_msg_trap (msg, option, send_size,
rcv_size, rcv_name, timeout, notify);
-
+
if (!(option & MACH_RCV_INTERRUPT))
while (ret == MACH_RCV_INTERRUPTED)
ret = __mach_msg_trap (msg, option & ~MACH_SEND_MSG,
0, rcv_size, rcv_name, timeout, notify);
-
+
return ret;
}
weak_alias (__mach_msg, mach_msg)