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

Move fatal error at the right place.

Browse Source 
Fix exit from top mode when checking if PMC is available.

MFC after: 3 days
This commit is contained in:
Fabien Thomas 2010-04-14 21:53:27 +00:00
parent f6b93040fd
commit 410c766274
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=206635
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/pmcstat/pmcpl_callgraph.c
View File

@ -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

2
usr.sbin/pmcstat/pmcpl_gprof.c
View File

@ -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,

2
usr.sbin/pmcstat/pmcstat_log.c
View File

@ -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;
}