From owner-svn-src-stable@FreeBSD.ORG Fri Sep 20 07:45:38 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D01FED18; Fri, 20 Sep 2013 07:45:38 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A47A724A5; Fri, 20 Sep 2013 07:45:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8K7jcsa071752; Fri, 20 Sep 2013 07:45:38 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8K7jcMc071749; Fri, 20 Sep 2013 07:45:38 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201309200745.r8K7jcMc071749@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 20 Sep 2013 07:45:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r255729 - in stable/9/sys: kern sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Sep 2013 07:45:38 -0000 Author: kib Date: Fri Sep 20 07:45:37 2013 New Revision: 255729 URL: http://svnweb.freebsd.org/changeset/base/255729 Log: MFC r255527: Use TAILQ instead of STAILQ for kqeueue filedescriptors to ensure constant time removal on kqueue close. Modified: stable/9/sys/kern/kern_event.c stable/9/sys/sys/event.h stable/9/sys/sys/eventvar.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/sys/kern/kern_event.c ============================================================================== --- stable/9/sys/kern/kern_event.c Fri Sep 20 07:35:08 2013 (r255728) +++ stable/9/sys/kern/kern_event.c Fri Sep 20 07:45:37 2013 (r255729) @@ -707,7 +707,7 @@ sys_kqueue(struct thread *td, struct kqu TASK_INIT(&kq->kq_task, 0, kqueue_task, kq); FILEDESC_XLOCK(fdp); - SLIST_INSERT_HEAD(&fdp->fd_kqlist, kq, kq_list); + TAILQ_INSERT_HEAD(&fdp->fd_kqlist, kq, kq_list); FILEDESC_XUNLOCK(fdp); finit(fp, FREAD | FWRITE, DTYPE_KQUEUE, kq, &kqueueops); @@ -1708,7 +1708,7 @@ kqueue_close(struct file *fp, struct thr KQ_UNLOCK(kq); FILEDESC_XLOCK(fdp); - SLIST_REMOVE(&fdp->fd_kqlist, kq, kqueue, kq_list); + TAILQ_REMOVE(&fdp->fd_kqlist, kq, kq_list); FILEDESC_XUNLOCK(fdp); seldrain(&kq->kq_sel); @@ -2044,7 +2044,7 @@ knote_fdclose(struct thread *td, int fd) * We shouldn't have to worry about new kevents appearing on fd * since filedesc is locked. */ - SLIST_FOREACH(kq, &fdp->fd_kqlist, kq_list) { + TAILQ_FOREACH(kq, &fdp->fd_kqlist, kq_list) { KQ_LOCK(kq); again: Modified: stable/9/sys/sys/event.h ============================================================================== --- stable/9/sys/sys/event.h Fri Sep 20 07:35:08 2013 (r255728) +++ stable/9/sys/sys/event.h Fri Sep 20 07:45:37 2013 (r255729) @@ -134,7 +134,7 @@ struct kevent { struct knote; SLIST_HEAD(klist, knote); struct kqueue; -SLIST_HEAD(kqlist, kqueue); +TAILQ_HEAD(kqlist, kqueue); struct knlist { struct klist kl_list; void (*kl_lock)(void *); /* lock function */ Modified: stable/9/sys/sys/eventvar.h ============================================================================== --- stable/9/sys/sys/eventvar.h Fri Sep 20 07:35:08 2013 (r255728) +++ stable/9/sys/sys/eventvar.h Fri Sep 20 07:45:37 2013 (r255729) @@ -41,7 +41,7 @@ struct kqueue { struct mtx kq_lock; int kq_refcnt; - SLIST_ENTRY(kqueue) kq_list; + TAILQ_ENTRY(kqueue) kq_list; TAILQ_HEAD(, knote) kq_head; /* list of pending event */ int kq_count; /* number of pending events */ struct selinfo kq_sel;