From ec9defc2912e86a7e682ec6e37aac102fa69d94d Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 20 Mar 2006 11:31:36 +0000 Subject: 2006-03-20 Thomas Schwinge * DEVELOPMENT: Document the NORMA removal. 2006-03-20 Leonardo Lopes Pereira Remove unused and unsupported code. Consult the file `DEVELOPMENT' for details. [patch #4982] * bogus/norma_device.h: Remove file. * bogus/norma_ether.h: Likewise. * bogus/norma_ipc.h: Likewise. * bogus/norma_task.h: Likewise. * bogus/norma_vm.h: Likewise. * include/mach/mach_norma.defs: Likewise. * include/mach/norma_task.defs: Likewise. * include/mach/norma_special_ports.h: Likewise. * Makefile.in (bogus-files): Remove `norma_device.h', `norma_ether.h', `norma_ipc.h', `norma_task.h' and `norma_vm.h'. (mach-headers): Remove `mach_norma.defs', `norma_task.defs' and `norma_special_ports.h'. * device/ds_routines.c: Don't include anymore and adopt all users of NORMA_DEVICE as if it were always defined to `0'. * device/net_io.c: Likewise for , NORMA_ETHER. * kern/machine.c: Likewise. * ddb/db_command.c: Likevise for , NORMA_IPC. * ipc/ipc_init.c: Likewise. * ipc/ipc_kmsg.c: Likewise. * ipc/ipc_kmsg.h: Likewise. * ipc/ipc_mqueue.c: Likewise. * ipc/ipc_notify.c: Likewise. * ipc/ipc_port.c: Likewise. * ipc/ipc_port.h: Likewise. * ipc/ipc_space.c: Likewise. * ipc/ipc_space.h: Likewise. * ipc/mach_msg.c: Likewise. * kern/ast.c: Likewise. * kern/debug.c: Likewise. * kern/exception.c: Likewise. * kern/startup.c: Likewise. * vm/memory_object.c: Likewise. * vm/vm_map.c: Likewise. * kern/ipc_kobject.c: Likewise for , NORMA_TASK. * kern/task.c: Likewise. * kern/task.h: Likewise. * ddb/db_command.c: Likewise for , NORMA_VM. * device/dev_pager.c: Likewise. * include/mach/mach_types.defs: Likewise. * include/mach/mach_types.h: Likewise. * include/mach/memory_object_default.defs: Likewise. * include/mach/memory_object.defs: Likewise. * ipc/ipc_kmsg.c: Likewise. * kern/ipc_kobject.c: Likewise. * kern/ipc_mig.c: Likewise. * kern/startup.c: Likewise. * vm/memory_object.c: Likewise. * vm/vm_object.c: Likewise. * vm/vm_object.h: Likewise. * vm/vm_pageout.c: Likewise. --- ipc/ipc_mqueue.c | 65 -------------------------------------------------------- 1 file changed, 65 deletions(-) (limited to 'ipc/ipc_mqueue.c') diff --git a/ipc/ipc_mqueue.c b/ipc/ipc_mqueue.c index 17af1ff8..e0ebc860 100644 --- a/ipc/ipc_mqueue.c +++ b/ipc/ipc_mqueue.c @@ -34,8 +34,6 @@ * Functions to manipulate IPC message queues. */ -#include - #include #include #include @@ -53,14 +51,6 @@ -#if NORMA_IPC -extern ipc_mqueue_t norma_ipc_handoff_mqueue; -extern ipc_kmsg_t norma_ipc_handoff_msg; -extern mach_msg_size_t norma_ipc_handoff_max_size; -extern mach_msg_size_t norma_ipc_handoff_msg_size; -extern ipc_kmsg_t norma_ipc_kmsg_accept(); -#endif /* NORMA_IPC */ - /* * Routine: ipc_mqueue_init * Purpose: @@ -212,16 +202,6 @@ ipc_mqueue_send(kmsg, option, time_out) return MACH_MSG_SUCCESS; } -#if NORMA_IPC - if (IP_NORMA_IS_PROXY(port)) { - mach_msg_return_t mr; - - mr = norma_ipc_send(kmsg); - ip_unlock(port); - return mr; - } -#endif /* NORMA_IPC */ - for (;;) { ipc_thread_t self; @@ -242,10 +222,6 @@ ipc_mqueue_send(kmsg, option, time_out) ip_release(port); ip_check_unlock(port); kmsg->ikm_header.msgh_remote_port = MACH_PORT_NULL; -#if NORMA_IPC - /* XXX until ipc_kmsg_destroy is fixed... */ - norma_ipc_finish_receiving(&kmsg); -#endif /* NORMA_IPC */ ipc_kmsg_destroy(kmsg); return MACH_MSG_SUCCESS; } @@ -329,10 +305,6 @@ ipc_mqueue_send(kmsg, option, time_out) /* don't allow the creation of a circular loop */ -#if NORMA_IPC - /* XXX until ipc_kmsg_destroy is fixed... */ - norma_ipc_finish_receiving(&kmsg); -#endif /* NORMA_IPC */ ipc_kmsg_destroy(kmsg); return MACH_MSG_SUCCESS; } @@ -370,16 +342,6 @@ ipc_mqueue_send(kmsg, option, time_out) /* check for a receiver for the message */ -#if NORMA_IPC - if (mqueue == norma_ipc_handoff_mqueue) { - norma_ipc_handoff_msg = kmsg; - if (kmsg->ikm_header.msgh_size <= norma_ipc_handoff_max_size) { - imq_unlock(mqueue); - return MACH_MSG_SUCCESS; - } - norma_ipc_handoff_msg_size = kmsg->ikm_header.msgh_size; - } -#endif /* NORMA_IPC */ for (;;) { receiver = ipc_thread_queue_first(receivers); if (receiver == ITH_NULL) { @@ -572,30 +534,6 @@ ipc_mqueue_receive( for (;;) { kmsg = ipc_kmsg_queue_first(kmsgs); -#if NORMA_IPC - /* - * It may be possible to make this work even when a timeout - * is specified. - * - * Netipc_replenish should be moved somewhere else. - */ - if (kmsg == IKM_NULL && ! (option & MACH_RCV_TIMEOUT)) { - netipc_replenish(FALSE); - *kmsgp = IKM_NULL; - kmsg = norma_ipc_kmsg_accept(mqueue, max_size, - (mach_msg_size_t *)kmsgp); - if (kmsg != IKM_NULL) { - port = (ipc_port_t) - kmsg->ikm_header.msgh_remote_port; - seqno = port->ip_seqno++; - break; - } - if (*kmsgp) { - imq_unlock(mqueue); - return MACH_RCV_TOO_LARGE; - } - } -#endif /* NORMA_IPC */ if (kmsg != IKM_NULL) { /* check space requirements */ @@ -745,9 +683,6 @@ ipc_mqueue_receive( ip_unlock(port); } -#if NORMA_IPC - norma_ipc_finish_receiving(&kmsg); -#endif /* NORMA_IPC */ *kmsgp = kmsg; *seqnop = seqno; return MACH_MSG_SUCCESS; -- cgit v1.2.3