Page MenuHomeFreeBSD
Files F106139424

D958.diff
No OneTemporary
Actions

D958.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
@@ -192,6 +192,7 @@
static int pmc_detach_one_process(struct proc *p, struct pmc *pm,
int flags);
static void pmc_destroy_owner_descriptor(struct pmc_owner *po);
+static void pmc_destroy_pmc_descriptor(struct pmc *pm);
static struct pmc_owner *pmc_find_owner_descriptor(struct proc *p);
static int pmc_find_pmc(pmc_id_t pmcid, struct pmc **pm);
static struct pmc *pmc_find_pmc_descriptor_in_process(struct pmc_owner *po,
@@ -748,6 +749,7 @@
("[pmc,%d] owner %p != po %p", __LINE__, pm->pm_owner, po));
pmc_release_pmc_descriptor(pm); /* will unlink from the list */
+ pmc_destroy_pmc_descriptor(pm);
}
KASSERT(po->po_sscount == 0,
@@ -2160,9 +2162,7 @@
static void
pmc_destroy_pmc_descriptor(struct pmc *pm)
{
- (void) pm;
-#ifdef DEBUG
KASSERT(pm->pm_state == PMC_STATE_DELETED ||
pm->pm_state == PMC_STATE_FREE,
("[pmc,%d] destroying non-deleted PMC", __LINE__));
@@ -2173,7 +2173,8 @@
KASSERT(pm->pm_runcount == 0,
("[pmc,%d] pmc has non-zero run count %d", __LINE__,
pm->pm_runcount));
-#endif
+
+ free(pm, M_PMC);
}
static void
@@ -2206,10 +2207,10 @@
* - detaches the PMC from hardware
* - unlinks all target threads that were attached to it
* - removes the PMC from its owner's list
- * - destroy's the PMC private mutex
+ * - destroys the PMC private mutex
*
- * Once this function completes, the given pmc pointer can be safely
- * FREE'd by the caller.
+ * Once this function completes, the given pmc pointer can be freed by
+ * calling pmc_destroy_pmc_descriptor().
*/
static void
@@ -2359,8 +2360,6 @@
LIST_REMOVE(pm, pm_next);
pm->pm_owner = NULL;
}
-
- pmc_destroy_pmc_descriptor(pm);
}
/*
@@ -3367,7 +3366,6 @@
if (n == (int) md->pmd_npmc) {
pmc_destroy_pmc_descriptor(pmc);
- free(pmc, M_PMC);
pmc = NULL;
error = EINVAL;
break;
@@ -3403,7 +3401,6 @@
(error = pcd->pcd_config_pmc(cpu, adjri, pmc)) != 0) {
(void) pcd->pcd_release_pmc(cpu, adjri, pmc);
pmc_destroy_pmc_descriptor(pmc);
- free(pmc, M_PMC);
pmc = NULL;
pmc_restore_cpu_binding(&pb);
error = EPERM;
@@ -3431,7 +3428,7 @@
if ((error =
pmc_register_owner(curthread->td_proc, pmc)) != 0) {
pmc_release_pmc_descriptor(pmc);
- free(pmc, M_PMC);
+ pmc_destroy_pmc_descriptor(pmc);
pmc = NULL;
break;
}
@@ -3674,8 +3671,7 @@
po = pm->pm_owner;
pmc_release_pmc_descriptor(pm);
pmc_maybe_remove_owner(po);
-
- free(pm, M_PMC);
+ pmc_destroy_pmc_descriptor(pm);
}
break;

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 1:24 AM (12 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15609849
Default Alt Text
D958.diff (2 KB)

Event Timeline