From owner-svn-src-all@FreeBSD.ORG  Thu May  8 07:04:13 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 E1A7C716;
 Thu,  8 May 2014 07:04:13 +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 CDF05775;
 Thu,  8 May 2014 07:04:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4874DGF049846;
 Thu, 8 May 2014 07:04:13 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4874DN2049845;
 Thu, 8 May 2014 07:04:13 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201405080704.s4874DN2049845@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 8 May 2014 07:04:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r265637 - stable/10/sys/cam/ctl
X-SVN-Group: stable-10
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.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 May 2014 07:04:14 -0000

Author: mav
Date: Thu May  8 07:04:13 2014
New Revision: 265637
URL: http://svnweb.freebsd.org/changeset/base/265637

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

Modified:
  stable/10/sys/cam/ctl/ctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c	Thu May  8 07:02:46 2014	(r265636)
+++ stable/10/sys/cam/ctl/ctl.c	Thu May  8 07:04:13 2014	(r265637)
@@ -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;