From owner-p4-projects@FreeBSD.ORG Tue Nov 10 12:40:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A7E3106568F; Tue, 10 Nov 2009 12:40:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F678106566C for ; Tue, 10 Nov 2009 12:40:32 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 13F978FC0C for ; Tue, 10 Nov 2009 12:40:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAACeV7n065628 for ; Tue, 10 Nov 2009 12:40:31 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAACeVn1065626 for perforce@freebsd.org; Tue, 10 Nov 2009 12:40:31 GMT (envelope-from mav@freebsd.org) Date: Tue, 10 Nov 2009 12:40:31 GMT Message-Id: <200911101240.nAACeVn1065626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 12:40:32 -0000 http://p4web.freebsd.org/chv.cgi?CH=170437 Change 170437 by mav@mav_mavbook on 2009/11/10 12:39:55 Move xpt_schedule_dev_sendq() from header to source file. Move delayed queue shrinking to more logical place - when queue freed. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#122 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#13 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#122 (text+ko) ==== @@ -299,12 +299,6 @@ int retval; if (dev->ccbq.devq_openings > 0) { - if ((dev->flags & CAM_DEV_RESIZE_QUEUE_NEEDED) != 0) { - cam_ccbq_resize(&dev->ccbq, - dev->ccbq.dev_openings - + dev->ccbq.dev_active); - dev->flags &= ~CAM_DEV_RESIZE_QUEUE_NEEDED; - } /* * The priority of a device waiting for CCB resources * is that of the the highest priority peripheral driver @@ -321,6 +315,27 @@ } static __inline int +xpt_schedule_dev_sendq(struct cam_eb *bus, struct cam_ed *dev) +{ + int retval; + + if (dev->ccbq.dev_openings > 0) { + /* + * The priority of a device waiting for controller + * resources is that of the the highest priority CCB + * enqueued. + */ + retval = + xpt_schedule_dev(&bus->sim->devq->send_queue, + &dev->send_ccb_entry.pinfo, + CAMQ_GET_HEAD(&dev->ccbq.queue)->priority); + } else { + retval = 0; + } + return (retval); +} + +static __inline int periph_is_queued(struct cam_periph *periph) { return (periph->pinfo.index != CAM_UNQUEUED_INDEX); @@ -3747,6 +3762,11 @@ mtx_assert(sim->mtx, MA_OWNED); cam_ccbq_release_opening(&device->ccbq); + if (device->flags & CAM_DEV_RESIZE_QUEUE_NEEDED) { + device->flags &= ~CAM_DEV_RESIZE_QUEUE_NEEDED; + cam_ccbq_resize(&device->ccbq, + device->ccbq.dev_openings + device->ccbq.dev_active); + } if (sim->ccb_count > sim->max_ccbs) { xpt_free_ccb(free_ccb); sim->ccb_count--; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#13 (text+ko) ==== @@ -177,29 +177,6 @@ u_int32_t new_priority); u_int32_t xpt_dev_ccbq_resize(struct cam_path *path, int newopenings); - - -static __inline int -xpt_schedule_dev_sendq(struct cam_eb *bus, struct cam_ed *dev) -{ - int retval; - - if (dev->ccbq.dev_openings > 0) { - /* - * The priority of a device waiting for controller - * resources is that of the the highest priority CCB - * enqueued. - */ - retval = - xpt_schedule_dev(&bus->sim->devq->send_queue, - &dev->send_ccb_entry.pinfo, - CAMQ_GET_HEAD(&dev->ccbq.queue)->priority); - } else { - retval = 0; - } - return (retval); -} - MALLOC_DECLARE(M_CAMXPT); #endif