← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to tools/perf/util/parse-events.c

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/perf/util/parse-events.c
277
277
 
278
278
        event_attr_init(attr);
279
279
 
280
 
        evsel = perf_evsel__new(attr, (*idx)++);
 
280
        evsel = perf_evsel__new_idx(attr, (*idx)++);
281
281
        if (!evsel)
282
282
                return -ENOMEM;
283
283
 
378
378
{
379
379
        struct perf_evsel *evsel;
380
380
 
381
 
        evsel = perf_evsel__newtp(sys_name, evt_name, (*idx)++);
 
381
        evsel = perf_evsel__newtp_idx(sys_name, evt_name, (*idx)++);
382
382
        if (!evsel)
383
383
                return -ENOMEM;
384
384
 
998
998
        char evt_path[MAXPATHLEN];
999
999
        char dir_path[MAXPATHLEN];
1000
1000
 
1001
 
        if (debugfs_valid_mountpoint(tracing_events_path))
 
1001
        if (debugfs_valid_mountpoint(tracing_events_path)) {
 
1002
                printf("  [ Tracepoints not available: %s ]\n", strerror(errno));
1002
1003
                return;
 
1004
        }
1003
1005
 
1004
1006
        sys_dir = opendir(tracing_events_path);
1005
1007
        if (!sys_dir)
1095
1097
                .threads = { 0 },
1096
1098
        };
1097
1099
 
1098
 
        evsel = perf_evsel__new(&attr, 0);
 
1100
        evsel = perf_evsel__new(&attr);
1099
1101
        if (evsel) {
1100
1102
                ret = perf_evsel__open(evsel, NULL, &tmap.map) >= 0;
1101
1103
                perf_evsel__delete(evsel);