From owner-svn-src-all@freebsd.org  Mon Sep 24 19:06:09 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D04FC10B4D9E;
 Mon, 24 Sep 2018 19:06:09 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 881428EA1A;
 Mon, 24 Sep 2018 19:06:09 +0000 (UTC)
 (envelope-from mmacy@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 82F061D701;
 Mon, 24 Sep 2018 19:06:09 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8OJ696W071533;
 Mon, 24 Sep 2018 19:06:09 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8OJ69eG071532;
 Mon, 24 Sep 2018 19:06:09 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201809241906.w8OJ69eG071532@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Mon, 24 Sep 2018 19:06:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338918 - head/usr.sbin/pmccontrol
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: head/usr.sbin/pmccontrol
X-SVN-Commit-Revision: 338918
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.27
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Sep 2018 19:06:10 -0000

Author: mmacy
Date: Mon Sep 24 19:06:09 2018
New Revision: 338918
URL: https://svnweb.freebsd.org/changeset/base/338918

Log:
  restore pmccontrol -L behavior on x86
  
  When I updated counter definition handling for x86 I broke
  'pmccontrol -L' listing counter names. This just changes
  pmccontrol to call the library function on x86.
  
  PR:	230984
  Approved by:	re (kib@)

Modified:
  head/usr.sbin/pmccontrol/pmccontrol.c

Modified: head/usr.sbin/pmccontrol/pmccontrol.c
==============================================================================
--- head/usr.sbin/pmccontrol/pmccontrol.c	Mon Sep 24 18:41:32 2018	(r338917)
+++ head/usr.sbin/pmccontrol/pmccontrol.c	Mon Sep 24 19:06:09 2018	(r338918)
@@ -282,9 +282,17 @@ pmcc_do_list_state(void)
 	return 0;
 }
 
+#if defined(__i386__) || defined(__amd64__)
 static int
 pmcc_do_list_events(void)
 {
+	pmc_pmu_print_counters(NULL);
+	return (0);
+}
+#else
+static int
+pmcc_do_list_events(void)
+{
 	enum pmc_class c;
 	unsigned int i, j, nevents;
 	const char **eventnamelist;
@@ -311,6 +319,7 @@ pmcc_do_list_events(void)
 	}
 	return 0;
 }
+#endif
 
 static int
 pmcc_show_statistics(void)