On 13/08/13 05:33, Namhyung Kim wrote:
> On Wed, 7 Aug 2013 16:30:31 +0300, Adrian Hunter wrote:
>> Add a test for the newly added PERF_COUNT_SW_DUMMY event.
>> The test checks that tracking events continue when an
>> event is disabled but a dummy software event is not
>> disabled.
>
> [SNIP]
>
>> +int test__keep_tracking(void)
>> +{
>> + struct perf_record_opts opts = {
>> + .mmap_pages = UINT_MAX,
>> + .user_freq = UINT_MAX,
>> + .user_interval = ULLONG_MAX,
>> + .freq = 4000,
>> + .target = {
>> + .uses_mmap = true,
>> + },
>> + };
>> + struct thread_map *threads = NULL;
>> + struct cpu_map *cpus = NULL;
>> + struct perf_evlist *evlist = NULL;
>> + struct perf_evsel *evsel = NULL;
>> + int found, err = -1;
>> + const char *comm;
>> +
>> + threads = thread_map__new(-1, getpid(), UINT_MAX);
>> + CHECK_NOT_NULL__(threads);
>> +
>> + cpus = cpu_map__new(NULL);
>> + CHECK_NOT_NULL__(cpus);
>> +
>> + evlist = perf_evlist__new();
>> + CHECK_NOT_NULL__(evlist);
>> +
>> + perf_evlist__set_maps(evlist, cpus, threads);
>> +
>> + CHECK__(parse_events(evlist, "dummy:u"));
>> + CHECK__(parse_events(evlist, "cycles:u"));
>> +
>> + perf_evlist__config(evlist, &opts);
>> +
>> + evsel = perf_evlist__first(evlist);
>> +
>> + evsel->attr.comm = 1;
>> + evsel->attr.disabled = 1;
>> + evsel->attr.enable_on_exec = 0;
>> +
>> + CHECK__(perf_evlist__open(evlist));
>> +
>> + CHECK__(perf_evlist__mmap(evlist, UINT_MAX, false));
>> +
>> + /*
>> + * First, test that a 'comm' event can be found when the event is
>> + * enabled.
>> + */
>> +
>> + perf_evlist__enable(evlist);
>> +
>> + comm = "Test COMM 1";
>> + CHECK__(prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0));
>> +
>> + perf_evlist__disable(evlist);
>> +
>> + found = find_comm(evlist, comm);
>> + if (found != 1) {
>> + pr_debug("First time, failed to find tracking event.\n");
>> + goto out_err;
>> + }
>> +
>> + /*
>> + * Secondly, test that a 'comm' event can be found when the event is
>> + * disabled with the dummy event still enabled.
>> + */
>> +
>> + perf_evlist__enable(evlist);
>> +
>> + evsel = perf_evlist__last(evlist);
>> +
>> + CHECK__(perf_evlist__disable_event(evlist, evsel));
>> +
>> + comm = "Test COMM 2";
>> + CHECK__(prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0));
>> +
>> + perf_evlist__disable(evlist);
>> +
>> + found = find_comm(evlist, comm);
>> + if (found != 1) {
>> + pr_debug("Seconf time, failed to find tracking event.\n");
>> + goto out_err;
>> + }
>> +
>> + err = 0;
>> +
>> +out_err:
>> + if (evlist) {
>> + perf_evlist__disable(evlist);
>
> It seems the both of goto out_err already called perf_evlist__disable().
There are more "goto out_err"s in the CHECK__ macro
>
> Thanks,
> Namhyung
>
>
>> + perf_evlist__munmap(evlist);
>> + perf_evlist__close(evlist);
>> + perf_evlist__delete(evlist);
>> + }
>> + if (cpus)
>> + cpu_map__delete(cpus);
>> + if (threads)
>> + thread_map__delete(threads);
>> +
>> + return err;
>> +}
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
