D10912.id29565.diff
No OneTemporary
Actions

Size

757 B

Referenced Files

None

Subscribers

None

D10912.id29565.diff
View Options

	Index: head/sys/dev/hwpmc/hwpmc_mod.c
	===================================================================
	--- head/sys/dev/hwpmc/hwpmc_mod.c
	+++ head/sys/dev/hwpmc/hwpmc_mod.c
	@@ -4224,7 +4224,8 @@
	ps_end = psb->ps_write;
	do {
	#ifdef INVARIANTS
	- if (ps->ps_pmc->pm_state != PMC_STATE_RUNNING)
	+ if ((ps->ps_pmc == NULL) \|\|
	+ (ps->ps_pmc->pm_state != PMC_STATE_RUNNING))
	nfree++;
	#endif
	if (ps->ps_nsamples != PMC_SAMPLE_INUSE)
	@@ -4262,9 +4263,11 @@
	ps = psb->ps_samples;
	} while (ps != ps_end);

	+#ifdef INVARIANTS
	KASSERT(ncallchains > 0 \|\| nfree > 0,
	("[pmc,%d] cpu %d didn't find a sample to collect", __LINE__,
	cpu));
	+#endif

	KASSERT(td->td_pinned == 1,
	("[pmc,%d] invalid td_pinned value", __LINE__));