svn commit: r333512 - head/sys/dev/hwpmc

[Matt Macy]

Author: mmacy
Date: Sat May 12 03:45:30 2018
New Revision: 333512
URL: https://svnweb.freebsd.org/changeset/base/333512

Log:
  hwpmc(9): clear remaining sample work for hardclock
  
  - fix last minute change in 333509 where by runcount references
    to a pmc would remaining causing us to pause loop forever
  
  Approved by:	sbruno

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

Modified: head/sys/dev/hwpmc/hwpmc_logging.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_logging.c	Sat May 12 01:55:24 2018	(r333511)
+++ head/sys/dev/hwpmc/hwpmc_logging.c	Sat May 12 03:45:30 2018	(r333512)
@@ -837,7 +837,8 @@ pmclog_schedule_one_cond(void *arg)
 
 	spinlock_enter();
 	/* tell hardclock not to run again */
-	DPCPU_SET(pmc_sampled, 0);
+	if (PMC_CPU_HAS_SAMPLES(PCPU_GET(cpuid)))
+		PMC_CALL_HOOK_UNLOCKED(curthread, PMC_FN_DO_SAMPLES, NULL);
 	plb = po->po_curbuf[curcpu];
 	if (plb && plb->plb_ptr != plb->plb_base)
 		pmclog_schedule_io(po);