diff options
author | fabient <fabient@FreeBSD.org> | 2010-04-14 21:53:27 +0000 |
---|---|---|
committer | fabient <fabient@FreeBSD.org> | 2010-04-14 21:53:27 +0000 |
commit | d7c34a15b8684c6d9333e40ee8de208dfd3ae3e3 (patch) | |
tree | 0f2ef86dfd8880d12e16350481d03b612494a973 /usr.sbin/pmcstat | |
parent | 3afd1296580997857731527a83ee786bce434ff5 (diff) | |
download | FreeBSD-src-d7c34a15b8684c6d9333e40ee8de208dfd3ae3e3.zip FreeBSD-src-d7c34a15b8684c6d9333e40ee8de208dfd3ae3e3.tar.gz |
Move fatal error at the right place.
Fix exit from top mode when checking if PMC is available.
MFC after: 3 days
Diffstat (limited to 'usr.sbin/pmcstat')
-rw-r--r-- | usr.sbin/pmcstat/pmcpl_callgraph.c | 2 | ||||
-rw-r--r-- | usr.sbin/pmcstat/pmcpl_gprof.c | 2 | ||||
-rw-r--r-- | usr.sbin/pmcstat/pmcstat_log.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/pmcstat/pmcpl_callgraph.c b/usr.sbin/pmcstat/pmcpl_callgraph.c index 53d342b..d948b77 100644 --- a/usr.sbin/pmcstat/pmcpl_callgraph.c +++ b/usr.sbin/pmcstat/pmcpl_callgraph.c @@ -581,6 +581,8 @@ pmcpl_cg_topdisplay(void) struct pmcstat_pmcrecord *pmcr; pmcr = pmcstat_pmcindex_to_pmcr(pmcstat_pmcinfilter); + if (!pmcr) + err(EX_SOFTWARE, "ERROR: invalid pmcindex"); /* * We pull out all callgraph nodes in the top-level hash table diff --git a/usr.sbin/pmcstat/pmcpl_gprof.c b/usr.sbin/pmcstat/pmcpl_gprof.c index 9327eb9..2027ecf 100644 --- a/usr.sbin/pmcstat/pmcpl_gprof.c +++ b/usr.sbin/pmcstat/pmcpl_gprof.c @@ -171,6 +171,8 @@ pmcstat_gmon_create_name(const char *samplesdir, struct pmcstat_image *image, char fullpath[PATH_MAX]; pmcname = pmcstat_pmcid_to_name(pmcid); + if (!pmcname) + err(EX_SOFTWARE, "ERROR: cannot find pmcid"); (void) snprintf(fullpath, sizeof(fullpath), "%s/%s/%s", samplesdir, pmcname, diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c index 51f66ca..6d8c57a 100644 --- a/usr.sbin/pmcstat/pmcstat_log.c +++ b/usr.sbin/pmcstat/pmcstat_log.c @@ -1050,7 +1050,6 @@ pmcstat_pmcid_to_name(pmc_id_t pmcid) if (pr->pr_pmcid == pmcid) return (pmcstat_string_unintern(pr->pr_pmcname)); - err(EX_SOFTWARE, "ERROR: cannot find pmcid"); return NULL; } @@ -1083,7 +1082,6 @@ pmcstat_pmcindex_to_pmcr(int pmcin) if (pr->pr_pmcin == pmcin) return pr; - err(EX_SOFTWARE, "ERROR: invalid pmcindex"); return NULL; } |