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

libpmc: Match on the cpuid with a regex

Browse Source 
The CPUID is, or can be, a regex to be matched.
Use regex from libc instead of strcmp

Tested-by:	gallatin
MFC after:	1 week
This commit is contained in:
Emmanuel Vadot 2019-11-08 16:56:48 +00:00
parent 854e90da4e
commit a0ac5706af
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libpmc/libpmc_pmu_util.c
View File

@ -165,8 +165,11 @@ struct pmu_event_desc {
static const struct pmu_events_map *
pmu_events_map_get(const char *cpuid)
{
size_t s;
regex_t re;
regmatch_t pmatch[1];
size_t s, len;
char buf[64];
int match;
const struct pmu_events_map *pme;
if (cpuid != NULL) {
@ -179,9 +182,20 @@ pmu_events_map_get(const char *cpuid)
(void *)NULL, 0) == -1)
return (NULL);
}
for (pme = pmu_events_map; pme->cpuid != NULL; pme++)
if (strcmp(buf, pme->cpuid) == 0)
return (pme);
for (pme = pmu_events_map; pme->cpuid != NULL; pme++) {
if (regcomp(&re, pme->cpuid, REG_EXTENDED) != 0) {
printf("regex '%s' failed to compile, ignoring\n",
pme->cpuid);
continue;
}
match = regexec(&re, buf, 1, pmatch, 0);
regfree(&re);
if (match == 0) {
len = pmatch[0].rm_eo - pmatch[0].rm_so;
if(len == strlen(buf))
return (pme);
}
}
return (NULL);
}