|
@@ -819,10 +819,36 @@ void perf_pmu__set_format(unsigned long *bits, long from, long to)
|
|
|
set_bit(b, bits);
|
|
|
}
|
|
|
|
|
|
+static int sub_non_neg(int a, int b)
|
|
|
+{
|
|
|
+ if (b > a)
|
|
|
+ return 0;
|
|
|
+ return a - b;
|
|
|
+}
|
|
|
+
|
|
|
static char *format_alias(char *buf, int len, struct perf_pmu *pmu,
|
|
|
struct perf_pmu_alias *alias)
|
|
|
{
|
|
|
- snprintf(buf, len, "%s/%s/", pmu->name, alias->name);
|
|
|
+ struct parse_events_term *term;
|
|
|
+ int used = snprintf(buf, len, "%s/%s", pmu->name, alias->name);
|
|
|
+
|
|
|
+ list_for_each_entry(term, &alias->terms, list) {
|
|
|
+ if (term->type_val == PARSE_EVENTS__TERM_TYPE_STR)
|
|
|
+ used += snprintf(buf + used, sub_non_neg(len, used),
|
|
|
+ ",%s=%s", term->config,
|
|
|
+ term->val.str);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (sub_non_neg(len, used) > 0) {
|
|
|
+ buf[used] = '/';
|
|
|
+ used++;
|
|
|
+ }
|
|
|
+ if (sub_non_neg(len, used) > 0) {
|
|
|
+ buf[used] = '\0';
|
|
|
+ used++;
|
|
|
+ } else
|
|
|
+ buf[len - 1] = '\0';
|
|
|
+
|
|
|
return buf;
|
|
|
}
|
|
|
|