svn commit: r200009 - stable/7/sys/dev/hwpmc
Fabien Thomas
fabient at FreeBSD.org
Tue Dec 1 23:01:59 UTC 2009
Author: fabient
Date: Tue Dec 1 23:01:59 2009
New Revision: 200009
URL: http://svn.freebsd.org/changeset/base/200009
Log:
MFC 198343:
Handle the case where there is only one PMC in the system.
Modified:
stable/7/sys/dev/hwpmc/hwpmc_mod.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/hwpmc/hwpmc_mod.c
==============================================================================
--- stable/7/sys/dev/hwpmc/hwpmc_mod.c Tue Dec 1 23:01:29 2009 (r200008)
+++ stable/7/sys/dev/hwpmc/hwpmc_mod.c Tue Dec 1 23:01:59 2009 (r200009)
@@ -793,7 +793,7 @@ pmc_link_target_process(struct pmc *pm,
KASSERT(PMC_IS_VIRTUAL_MODE(PMC_TO_MODE(pm)),
("[pmc,%d] Attaching a non-process-virtual pmc=%p to pid=%d",
__LINE__, pm, pp->pp_proc->p_pid));
- KASSERT(pp->pp_refcnt >= 0 && pp->pp_refcnt < ((int) md->pmd_npmc - 1),
+ KASSERT(pp->pp_refcnt >= 0 && pp->pp_refcnt <= ((int) md->pmd_npmc - 1),
("[pmc,%d] Illegal reference count %d for process record %p",
__LINE__, pp->pp_refcnt, (void *) pp));
@@ -846,7 +846,7 @@ pmc_unlink_target_process(struct pmc *pm
KASSERT(pm != NULL && pp != NULL,
("[pmc,%d] Null pm %p or pp %p", __LINE__, pm, pp));
- KASSERT(pp->pp_refcnt >= 1 && pp->pp_refcnt < (int) md->pmd_npmc,
+ KASSERT(pp->pp_refcnt >= 1 && pp->pp_refcnt <= (int) md->pmd_npmc,
("[pmc,%d] Illegal ref count %d on process record %p",
__LINE__, pp->pp_refcnt, (void *) pp));
@@ -1113,7 +1113,7 @@ pmc_detach_one_process(struct proc *p, s
* descriptor from the target hash table and unset the P_HWPMC
* flag in the struct proc.
*/
- KASSERT(pp->pp_refcnt >= 0 && pp->pp_refcnt < (int) md->pmd_npmc,
+ KASSERT(pp->pp_refcnt >= 0 && pp->pp_refcnt <= (int) md->pmd_npmc,
("[pmc,%d] Illegal refcnt %d for process struct %p",
__LINE__, pp->pp_refcnt, pp));
@@ -1788,7 +1788,7 @@ pmc_hook_handler(struct thread *td, int
pmc_detach_one_process(td->td_proc,
pm, PMC_FLAG_NONE);
- KASSERT(pp->pp_refcnt >= 0 && pp->pp_refcnt < (int) md->pmd_npmc,
+ KASSERT(pp->pp_refcnt >= 0 && pp->pp_refcnt <= (int) md->pmd_npmc,
("[pmc,%d] Illegal ref count %d on pp %p", __LINE__,
pp->pp_refcnt, pp));
More information about the svn-src-stable-7
mailing list