From owner-svn-src-all@FreeBSD.ORG Mon Jul 1 18:41:08 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9970A303; Mon, 1 Jul 2013 18:41:08 +0000 (UTC) (envelope-from trociny@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8C9D21AFC; Mon, 1 Jul 2013 18:41:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r61If8l3013289; Mon, 1 Jul 2013 18:41:08 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r61If8Vh013286; Mon, 1 Jul 2013 18:41:08 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201307011841.r61If8Vh013286@svn.freebsd.org> From: Mikolaj Golub Date: Mon, 1 Jul 2013 18:41:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r252472 - in head/sbin: hastctl hastd X-SVN-Group: head 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.14 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: Mon, 01 Jul 2013 18:41:08 -0000 Author: trociny Date: Mon Jul 1 18:41:07 2013 New Revision: 252472 URL: http://svnweb.freebsd.org/changeset/base/252472 Log: Make hastctl(1) ('list' command) output a worker pid. Reviewed by: pjd MFC after: 3 days Modified: head/sbin/hastctl/hastctl.c head/sbin/hastd/control.c Modified: head/sbin/hastctl/hastctl.c ============================================================================== --- head/sbin/hastctl/hastctl.c Mon Jul 1 17:57:22 2013 (r252471) +++ head/sbin/hastctl/hastctl.c Mon Jul 1 18:41:07 2013 (r252472) @@ -293,6 +293,7 @@ control_set_role(struct nv *nv, const ch static int control_list(struct nv *nv) { + pid_t pid; unsigned int ii; const char *str; int error, ret; @@ -331,6 +332,9 @@ control_list(struct nv *nv) str = nv_get_string(nv, "status%u", ii); if (str != NULL) printf(" status: %s\n", str); + pid = nv_get_int32(nv, "workerpid%u", ii); + if (pid != 0) + printf(" workerpid: %d\n", pid); printf(" dirty: %ju (%NB)\n", (uintmax_t)nv_get_uint64(nv, "dirty%u", ii), (intmax_t)nv_get_uint64(nv, "dirty%u", ii)); Modified: head/sbin/hastd/control.c ============================================================================== --- head/sbin/hastd/control.c Mon Jul 1 17:57:22 2013 (r252471) +++ head/sbin/hastd/control.c Mon Jul 1 18:41:07 2013 (r252472) @@ -271,6 +271,7 @@ control_status(struct hastd_config *cfg, nv_add_string(nvout, compression_name(res->hr_compression), "compression%u", no); nv_add_string(nvout, role2str(res->hr_role), "role%u", no); + nv_add_int32(nvout, res->hr_workerpid, "workerpid%u", no); switch (res->hr_role) { case HAST_ROLE_PRIMARY: