From owner-trustedbsd-cvs@FreeBSD.ORG Sun Jan 21 22:40:46 2007 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F0EF16A402 for ; Sun, 21 Jan 2007 22:40:46 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id 6C6B213C474 for ; Sun, 21 Jan 2007 22:40:45 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id AC74E47FF9 for ; Sun, 21 Jan 2007 17:40:42 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id 524F892C0B; Sun, 21 Jan 2007 22:35:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A525716A591; Sun, 21 Jan 2007 22:35:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6320C16A507 for ; Sun, 21 Jan 2007 22:35:34 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5116E13C471 for ; Sun, 21 Jan 2007 22:35:34 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LMZYSU064168 for ; Sun, 21 Jan 2007 22:35:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMZYAu064164 for perforce@freebsd.org; Sun, 21 Jan 2007 22:35:34 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:35:34 GMT Message-Id: <200701212235.l0LMZYAu064164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 113285 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jan 2007 22:40:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=113285 Change 113285 by millert@millert_macbook on 2007/01/21 22:35:16 Remove old debugging printfs. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.c#6 (text+ko) ==== @@ -914,9 +914,6 @@ port = (ipc_port_t) kmsg->ikm_header->msgh_remote_port; assert(IP_VALID(port)); - if ((option & ~(MACH_SEND_TIMEOUT|MACH_SEND_ALWAYS)) != 0) - printf("ipc_kmsg_send: bad option 0x%x\n", option); - ip_lock(port); if (port->ip_receiver == ipc_space_kernel) { @@ -2171,7 +2168,6 @@ ipc_port_request_index_t request; if (!space->is_active) { - printf("ipc_kmsg_copyout_header: dead space\n"); is_write_unlock(space); return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_SPACE); @@ -2181,7 +2177,6 @@ notify_port = ipc_port_lookup_notify(space, notify); if (notify_port == IP_NULL) { - printf("ipc_kmsg_copyout_header: no notify port\n"); is_write_unlock(space); return MACH_RCV_INVALID_NOTIFY; } @@ -2236,15 +2231,12 @@ if (kr != KERN_SUCCESS) { /* space is unlocked */ - if (kr == KERN_RESOURCE_SHORTAGE) { - printf("ipc_kmsg_copyout_header: can't grow kernel ipc space\n"); + if (kr == KERN_RESOURCE_SHORTAGE) return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_KERNEL); - } else { - printf("ipc_kmsg_copyout_header: can't grow user ipc space\n"); + else return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_SPACE); - } } /* space is locked again; start over */ @@ -2282,11 +2274,9 @@ kr = ipc_port_dngrow(reply, ITS_SIZE_NONE); /* port is unlocked */ - if (kr != KERN_SUCCESS) { - printf("ipc_kmsg_copyout_header: can't grow kernel ipc space2\n"); + if (kr != KERN_SUCCESS) return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_KERNEL); - } is_write_lock(space); continue; @@ -2323,7 +2313,6 @@ is_read_lock(space); if (!space->is_active) { - printf("ipc_kmsg_copyout_header: dead space2\n"); is_read_unlock(space); return MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE; } @@ -2334,13 +2323,11 @@ /* must check notify even though it won't be used */ if ((entry = ipc_entry_lookup(space, notify)) == IE_NULL) { - printf("ipc_kmsg_copyout_header: ipc_entry_lookup failed\n"); is_read_unlock(space); return MACH_RCV_INVALID_NOTIFY; } if ((entry->ie_bits & MACH_PORT_TYPE_RECEIVE) == 0) { - printf("ipc_kmsg_copyout_header: MACH_PORT_TYPE_RECEIVE not set!\n"); is_read_unlock(space); return MACH_RCV_INVALID_NOTIFY; } @@ -2922,10 +2909,8 @@ mach_msg_return_t mr; mr = ipc_kmsg_copyout_header(kmsg->ikm_header, space, notify); - if (mr != MACH_MSG_SUCCESS) { - printf("ipc_kmsg_copyout: ipc_kmsg_copyout_header failed: %d\n", mr); + if (mr != MACH_MSG_SUCCESS) return mr; - } if (kmsg->ikm_header->msgh_bits & MACH_MSGH_BITS_COMPLEX) { mr = ipc_kmsg_copyout_body(kmsg, space, map, slist);