From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756577AbcAIQd5 (ORCPT ); Sat, 9 Jan 2016 11:33:57 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42062 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755717AbcAIQd4 (ORCPT ); Sat, 9 Jan 2016 11:33:56 -0500 Date: Sat, 9 Jan 2016 08:33:42 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@redhat.com, acme@redhat.com, adrian.hunter@intel.com, tglx@linutronix.de, dsahern@gmail.com, namhyung@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, wangnan0@huawei.com Reply-To: hpa@zytor.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, mingo@kernel.org, namhyung@kernel.org, dsahern@gmail.com, adrian.hunter@intel.com, tglx@linutronix.de, jolsa@redhat.com, acme@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf test: Use "dummy" events in the PERF_RECORD_ test Git-Commit-ID: 69ef8f475586974d3921c4799bfa75b8fef877a8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 69ef8f475586974d3921c4799bfa75b8fef877a8 Gitweb: http://git.kernel.org/tip/69ef8f475586974d3921c4799bfa75b8fef877a8 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 7 Jan 2016 13:17:00 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 7 Jan 2016 13:17:00 -0300 perf test: Use "dummy" events in the PERF_RECORD_ test As we're test just the !PERF_RECORD_SAMPLE records. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-qp8radcz3il4q9wbnseh337d@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/perf-record.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c index 9d5f0b5..8dc0bab 100644 --- a/tools/perf/tests/perf-record.c +++ b/tools/perf/tests/perf-record.c @@ -45,7 +45,7 @@ int test__PERF_RECORD(int subtest __maybe_unused) }; cpu_set_t cpu_mask; size_t cpu_mask_size = sizeof(cpu_mask); - struct perf_evlist *evlist = perf_evlist__new_default(); + struct perf_evlist *evlist = perf_evlist__new_dummy(); struct perf_evsel *evsel; struct perf_sample sample; const char *cmd = "sleep"; @@ -61,6 +61,9 @@ int test__PERF_RECORD(int subtest __maybe_unused) int total_events = 0, nr_events[PERF_RECORD_MAX] = { 0, }; char sbuf[STRERR_BUFSIZE]; + if (evlist == NULL) /* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */ + evlist = perf_evlist__new_default(); + if (evlist == NULL || argv == NULL) { pr_debug("Not enough memory to create evlist\n"); goto out;