d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When a process is de-configuring a log file, also stop all of its

Browse Source 
PMCs that require a log file to operate.  This change should fix
PR 90269.

PR:		kern/90269
MFC after:	1 week
This commit is contained in:
Joseph Koshy 2006-03-09 02:08:12 +00:00
parent c53e537a13
commit fc9a2b80c4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/hwpmc/hwpmc_logging.c
View File

@ -619,10 +619,8 @@ pmclog_deconfigure_log(struct pmc_owner *po)
if ((po->po_flags & PMC_PO_OWNS_LOGFILE) == 0)
return EINVAL;
/* remove this owner from the global SS pmc owner list */
if (po->po_sscount)
LIST_REMOVE(po, po_ssnext);
KASSERT(po->po_sscount == 0,
("[pmc,%d] po=%p still owning SS PMCs", __LINE__, po));
KASSERT(po->po_file != NULL,
("[pmc,%d] po=%p no log file", __LINE__, po));

7
sys/dev/hwpmc/hwpmc_mod.c
View File

@ -2408,6 +2408,7 @@ pmc_syscall_handler(struct thread *td, void *syscall_args)
case PMC_OP_CONFIGURELOG:
{
struct pmc *pm;
struct pmc_owner *po;
struct pmc_op_configurelog cl;
struct proc *p;
@ -2436,8 +2437,12 @@ pmc_syscall_handler(struct thread *td, void *syscall_args)
else if (po->po_flags & PMC_PO_OWNS_LOGFILE) {
pmclog_process_closelog(po);
error = pmclog_flush(po);
if (error == 0)
if (error == 0) {
LIST_FOREACH(pm, &po->po_pmcs, pm_next)
if (pm->pm_flags & PMC_F_NEEDS_LOGFILE)
pmc_stop(pm);
error = pmclog_deconfigure_log(po);
}
} else
error = EINVAL;
}