From owner-svn-src-head@FreeBSD.ORG  Sun Apr 13 11:10:37 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 ESMTPS id 487DCA60;
 Sun, 13 Apr 2014 11:10:37 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 35B4E12BB;
 Sun, 13 Apr 2014 11:10:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3DBAb6C095372;
 Sun, 13 Apr 2014 11:10:37 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3DBAbb2095371;
 Sun, 13 Apr 2014 11:10:37 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201404131110.s3DBAbb2095371@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 13 Apr 2014 11:10:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264407 - head/sys/cam/ctl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Apr 2014 11:10:37 -0000

Author: mav
Date: Sun Apr 13 11:10:36 2014
New Revision: 264407
URL: http://svnweb.freebsd.org/changeset/base/264407

Log:
  Join CTL worker threads into one process for convenience.
  Report their idle state as "-".

Modified:
  head/sys/cam/ctl/ctl.c

Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c	Sun Apr 13 11:08:57 2014	(r264406)
+++ head/sys/cam/ctl/ctl.c	Sun Apr 13 11:10:36 2014	(r264407)
@@ -1112,8 +1112,8 @@ ctl_init(void)
 	}
 
 	for (i = 0; i < worker_threads; i++) {
-		error = kproc_create(ctl_work_thread, softc, &softc->work_thread, 0, 0,
-				"ctl_thrd%d", i);
+		error = kproc_kthread_add(ctl_work_thread, softc,
+		    &softc->work_thread, NULL, 0, 0, "ctl", "work%d", i);
 		if (error != 0) {
 			printf("error creating CTL work thread!\n");
 			mtx_lock(&softc->ctl_lock);
@@ -13380,7 +13380,7 @@ ctl_work_thread(void *arg)
 
 		/* XXX KDM use the PDROP flag?? */
 		/* Sleep until we have something to do. */
-		mtx_sleep(softc, &softc->ctl_lock, PRIBIO, "ctl_work", 0);
+		mtx_sleep(softc, &softc->ctl_lock, PRIBIO, "-", 0);
 
 		/* Back to the top of the loop to see what woke us up. */
 		continue;