From owner-svn-src-all@FreeBSD.ORG  Sat May  1 22:04:59 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 932E2106566B;
	Sat,  1 May 2010 22:04:59 +0000 (UTC)
	(envelope-from rstone@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 82DBB8FC15;
	Sat,  1 May 2010 22:04:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o41M4xgv060671;
	Sat, 1 May 2010 22:04:59 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o41M4wZ5060669;
	Sat, 1 May 2010 22:04:58 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201005012204.o41M4wZ5060669@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Sat, 1 May 2010 22:04:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207484 - head/sys/dev/hwpmc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 01 May 2010 22:04:59 -0000

Author: rstone
Date: Sat May  1 22:04:58 2010
New Revision: 207484
URL: http://svn.freebsd.org/changeset/base/207484

Log:
  When configuring a system-wide couting PMC, hwpmc was incorrectly logging process mappings for that PMC.  Nothing ever reads pmc logs out of a counting PMC, so the log buffers were leaked when the PMC was deconfigured.  The process mappings are only useful for sampling PMCs anyway, so only log the mappings if the PMC is a sampling PMC.
  
  This bug would cause allocating sample-mode PMCs to fail with ENOMEM after allocating several counting-mode PMCs.
  
  Approved by:	jkoshy (mentor)
  MFC after:	2 weeks

Modified:
  head/sys/dev/hwpmc/hwpmc_mod.c

Modified: head/sys/dev/hwpmc/hwpmc_mod.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_mod.c	Sat May  1 22:00:28 2010	(r207483)
+++ head/sys/dev/hwpmc/hwpmc_mod.c	Sat May  1 22:04:58 2010	(r207484)
@@ -2675,16 +2675,16 @@ pmc_start(struct pmc *pm)
 			PMCDBG(PMC,OPS,1, "po=%p in global list", po);
 		}
 		po->po_sscount++;
-	}
 
-	/*
-	 * Log mapping information for all existing processes in the
-	 * system.  Subsequent mappings are logged as they happen;
-	 * see pmc_process_mmap().
-	 */
-	if (po->po_logprocmaps == 0) {
-		pmc_log_all_process_mappings(po);
-		po->po_logprocmaps = 1;
+		/*
+		 * Log mapping information for all existing processes in the
+		 * system.  Subsequent mappings are logged as they happen;
+		 * see pmc_process_mmap().
+		 */
+		if (po->po_logprocmaps == 0) {
+			pmc_log_all_process_mappings(po);
+			po->po_logprocmaps = 1;
+		}
 	}
 
 	/*