diff options
| author | dim <dim@FreeBSD.org> | 2016-02-11 20:07:09 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-02-11 20:07:09 +0000 |
| commit | afa214d26dae14a294ff215b5a55e9acaf67d18f (patch) | |
| tree | d5418788f5368ac552e6ffa543d661830d835dbb /sys/dev/hwpmc/hwpmc_mod.c | |
| parent | 86bef0867f0389dc03d4cd4913f5dee79377226f (diff) | |
| parent | 5183fdd185bc8709354de8b0b88b8925644c2a4b (diff) | |
| download | FreeBSD-src-afa214d26dae14a294ff215b5a55e9acaf67d18f.zip FreeBSD-src-afa214d26dae14a294ff215b5a55e9acaf67d18f.tar.gz | |
Merge ^/head r295351 through r295543.
Diffstat (limited to 'sys/dev/hwpmc/hwpmc_mod.c')
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_mod.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 7f46573..3a1d52a 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -1009,14 +1009,14 @@ pmc_attach_one_process(struct proc *p, struct pmc *pm) /* issue an attach event to a configured log file */ if (pm->pm_owner->po_flags & PMC_PO_OWNS_LOGFILE) { - pmc_getfilename(p->p_textvp, &fullpath, &freepath); - if (p->p_flag & P_KTHREAD) { + if (p->p_flag & P_KPROC) { fullpath = kernelname; freepath = NULL; - } else + } else { + pmc_getfilename(p->p_textvp, &fullpath, &freepath); pmclog_process_pmcattach(pm, p->p_pid, fullpath); - if (freepath) - free(freepath, M_TEMP); + } + free(freepath, M_TEMP); if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) pmc_log_process_mappings(pm->pm_owner, p); } |
