From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755353AbaEORY2 (ORCPT ); Thu, 15 May 2014 13:24:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19535 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755237AbaEORYT (ORCPT ); Thu, 15 May 2014 13:24:19 -0400 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Arnaldo Carvalho de Melo , Corey Ashford , David Ahern , Frederic Weisbecker , Ingo Molnar , Jean Pihet , Namhyung Kim , Paul Mackerras , Peter Zijlstra Subject: [PATCH 12/14] perf tests: Add test interface for dso data fd limit Date: Thu, 15 May 2014 19:23:33 +0200 Message-Id: <1400174615-2121-13-git-send-email-jolsa@kernel.org> In-Reply-To: <1400174615-2121-1-git-send-email-jolsa@kernel.org> References: <1400174615-2121-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding a way to setup test dso limit by global variable test_dso_data__fd_limit. It'll be used in the dso data cache tests. Cc: Arnaldo Carvalho de Melo Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Jean Pihet Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Signed-off-by: Jiri Olsa --- tools/perf/util/dso.c | 5 +++++ tools/perf/util/dso.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 80b54e7..9310369 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -7,6 +7,8 @@ #include "util.h" #include "debug.h" +rlim_t test_dso_data__fd_limit; + char dso__symtab_origin(const struct dso *dso) { static const char origin[] = { @@ -262,6 +264,9 @@ static bool may_cache_fd(void) if (!limit) limit = get_fd_limit(); + if (unlikely(test_dso_data__fd_limit)) + limit = test_dso_data__fd_limit; + if (limit == RLIM_INFINITY) return true; diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index d713184..3807014 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -1,6 +1,7 @@ #ifndef __PERF_DSO #define __PERF_DSO +#include #include #include #include @@ -8,6 +9,8 @@ #include "map.h" #include "build-id.h" +extern rlim_t test_dso_data__fd_limit; + enum dso_binary_type { DSO_BINARY_TYPE__KALLSYMS = 0, DSO_BINARY_TYPE__GUEST_KALLSYMS, -- 1.8.3.1