From owner-svn-src-all@freebsd.org Thu Aug 20 17:14:46 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 491093C2EFC; Thu, 20 Aug 2020 17:14:46 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BXWVF3tqyz3RY1; Thu, 20 Aug 2020 17:14:45 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB20C17E0E; Thu, 20 Aug 2020 17:14:44 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07KHEi4T007201; Thu, 20 Aug 2020 17:14:44 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07KHEilY007200; Thu, 20 Aug 2020 17:14:44 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202008201714.07KHEilY007200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 20 Aug 2020 17:14:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364429 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 364429 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2020 17:14:46 -0000 Author: imp Date: Thu Aug 20 17:14:44 2020 New Revision: 364429 URL: https://svnweb.freebsd.org/changeset/base/364429 Log: Move from TAILQ to STAILQ because the nodes are a bit smaller. Modified: head/sys/kern/subr_bus.c Modified: head/sys/kern/subr_bus.c ============================================================================== --- head/sys/kern/subr_bus.c Thu Aug 20 17:14:39 2020 (r364428) +++ head/sys/kern/subr_bus.c Thu Aug 20 17:14:44 2020 (r364429) @@ -408,10 +408,10 @@ static struct cdevsw dev_cdevsw = { struct dev_event_info { char *dei_data; - TAILQ_ENTRY(dev_event_info) dei_link; + STAILQ_ENTRY(dev_event_info) dei_link; }; -TAILQ_HEAD(devq, dev_event_info); +STAILQ_HEAD(devq, dev_event_info); static struct dev_softc { @@ -444,7 +444,7 @@ devinit(void) UID_ROOT, GID_WHEEL, 0600, "devctl"); mtx_init(&devsoftc.mtx, "dev mtx", "devd", MTX_DEF); cv_init(&devsoftc.cv, "dev cv"); - TAILQ_INIT(&devsoftc.devq); + STAILQ_INIT(&devsoftc.devq); knlist_init_mtx(&devsoftc.sel.si_note, &devsoftc.mtx); devctl2_init(); } @@ -491,7 +491,7 @@ devread(struct cdev *dev, struct uio *uio, int ioflag) int rv; mtx_lock(&devsoftc.mtx); - while (TAILQ_EMPTY(&devsoftc.devq)) { + while (STAILQ_EMPTY(&devsoftc.devq)) { if (devsoftc.nonblock) { mtx_unlock(&devsoftc.mtx); return (EAGAIN); @@ -505,8 +505,8 @@ devread(struct cdev *dev, struct uio *uio, int ioflag) return (rv); } } - n1 = TAILQ_FIRST(&devsoftc.devq); - TAILQ_REMOVE(&devsoftc.devq, n1, dei_link); + n1 = STAILQ_FIRST(&devsoftc.devq); + STAILQ_REMOVE_HEAD(&devsoftc.devq, dei_link); devsoftc.queued--; mtx_unlock(&devsoftc.mtx); rv = uiomove(n1->dei_data, strlen(n1->dei_data), uio); @@ -554,7 +554,7 @@ devpoll(struct cdev *dev, int events, struct thread *t mtx_lock(&devsoftc.mtx); if (events & (POLLIN | POLLRDNORM)) { - if (!TAILQ_EMPTY(&devsoftc.devq)) + if (!STAILQ_EMPTY(&devsoftc.devq)) revents = events & (POLLIN | POLLRDNORM); else selrecord(td, &devsoftc.sel); @@ -629,13 +629,13 @@ devctl_queue_data_f(char *data, int flags) } /* Leave at least one spot in the queue... */ while (devsoftc.queued > devctl_queue_length - 1) { - n2 = TAILQ_FIRST(&devsoftc.devq); - TAILQ_REMOVE(&devsoftc.devq, n2, dei_link); + n2 = STAILQ_FIRST(&devsoftc.devq); + STAILQ_REMOVE_HEAD(&devsoftc.devq, dei_link); free(n2->dei_data, M_BUS); free(n2, M_BUS); devsoftc.queued--; } - TAILQ_INSERT_TAIL(&devsoftc.devq, n1, dei_link); + STAILQ_INSERT_TAIL(&devsoftc.devq, n1, dei_link); devsoftc.queued++; cv_broadcast(&devsoftc.cv); KNOTE_LOCKED(&devsoftc.sel.si_note, 0); @@ -811,9 +811,9 @@ sysctl_devctl_disable(SYSCTL_HANDLER_ARGS) if (mtx_initialized(&devsoftc.mtx)) mtx_lock(&devsoftc.mtx); if (dis) { - while (!TAILQ_EMPTY(&devsoftc.devq)) { - n1 = TAILQ_FIRST(&devsoftc.devq); - TAILQ_REMOVE(&devsoftc.devq, n1, dei_link); + while (!STAILQ_EMPTY(&devsoftc.devq)) { + n1 = STAILQ_FIRST(&devsoftc.devq); + STAILQ_REMOVE_HEAD(&devsoftc.devq, dei_link); free(n1->dei_data, M_BUS); free(n1, M_BUS); } @@ -843,8 +843,8 @@ sysctl_devctl_queue(SYSCTL_HANDLER_ARGS) mtx_lock(&devsoftc.mtx); devctl_queue_length = q; while (devsoftc.queued > devctl_queue_length) { - n1 = TAILQ_FIRST(&devsoftc.devq); - TAILQ_REMOVE(&devsoftc.devq, n1, dei_link); + n1 = STAILQ_FIRST(&devsoftc.devq); + STAILQ_REMOVE_HEAD(&devsoftc.devq, dei_link); free(n1->dei_data, M_BUS); free(n1, M_BUS); devsoftc.queued--;