From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756917Ab3HMCd7 (ORCPT <rfc822;w@1wt.eu>);
	Mon, 12 Aug 2013 22:33:59 -0400
Received: from LGEMRELSE1Q.lge.com ([156.147.1.111]:43180 "EHLO
	LGEMRELSE1Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756737Ab3HMCd6 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 12 Aug 2013 22:33:58 -0400
X-AuditID: 9c93016f-b7cf0ae00000518f-6a-52099b1460fe
From: Namhyung Kim <namhyung@kernel.org>
To: Adrian Hunter <adrian.hunter@intel.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>, Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
        linux-kernel@vger.kernel.org, David Ahern <dsahern@gmail.com>,
        Frederic Weisbecker <fweisbec@gmail.com>, Jiri Olsa <jolsa@redhat.com>,
        Mike Galbraith <efault@gmx.de>, Paul Mackerras <paulus@samba.org>,
        Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH 3/3] perf tools: add 'keep tracking' test
References: <1375882231-18339-1-git-send-email-adrian.hunter@intel.com>
	<1375882231-18339-4-git-send-email-adrian.hunter@intel.com>
Date: Tue, 13 Aug 2013 11:33:56 +0900
In-Reply-To: <1375882231-18339-4-git-send-email-adrian.hunter@intel.com>
	(Adrian Hunter's message of "Wed, 7 Aug 2013 16:30:31 +0300")
Message-ID: <87iozawc8b.fsf@sejong.aot.lge.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Brightmail-Tracker: AAAAAA==
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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().

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