From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E256DC4321A for ; Tue, 11 Jun 2019 19:04:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA2CE217D6 for ; Tue, 11 Jun 2019 19:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560279877; bh=Q1atFUoQS2pRqri6DZIJ1w4j3BQXi1mYeMgS2dJtx/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=INCDeJ7EIU32xig7roRrbslcGWMeqDzsWy6b7y1vYCGl3ZH25CF6DwJw8D4OvL2Uo V1lcjaW46Gondy5oUtnAtj1qeWiz6a/2vXVgOD+Dbp8hIWldhhIA5R/5NnEBkvmFDE phYncfVN9LbkAFK2/ZZqFk9FBArM/8FvINLS/ufM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407305AbfFKTEh (ORCPT ); Tue, 11 Jun 2019 15:04:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:40762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405412AbfFKTEd (ORCPT ); Tue, 11 Jun 2019 15:04:33 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.35.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E38BC2184B; Tue, 11 Jun 2019 19:04:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560279872; bh=Q1atFUoQS2pRqri6DZIJ1w4j3BQXi1mYeMgS2dJtx/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tetL2HuAuG0wuowwfXIfCT+hdfOcPHuI2Rp4WSk8mShBaFbF3N/1tNHM1CprbMPdB n5kwIJOJKLYgey320dnW/iI1Ehb264nSovOuRMxh31qTnwg/cdJ8Yyi2o4ygoBhAX2 laY9MI0I4fqleRrvMgBUAv4AQD8jFlPXfJx34cG0= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Adrian Hunter , Jin Yao , Jiri Olsa , Arnaldo Carvalho de Melo Subject: [PATCH 74/85] perf time-utils: Treat time ranges consistently Date: Tue, 11 Jun 2019 15:59:00 -0300 Message-Id: <20190611185911.11645-75-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190611185911.11645-1-acme@kernel.org> References: <20190611185911.11645-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Adrian Hunter Currently, options allow only 1 explicit (non-percentage) time range. In preparation for adding support for multiple explicit time ranges, treat time ranges consistently. Instead of treating some time ranges as inclusive and some as excluding the end time, treat all time ranges as inclusive. This is only a 1 nanosecond change but is necessary to treat multiple explicit time ranges in a consistent manner. Note, there is a later patch that adds a test for time-utils. Signed-off-by: Adrian Hunter Cc: Jin Yao Cc: Jiri Olsa Link: http://lkml.kernel.org/r/20190604130017.31207-13-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/time-utils.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/time-utils.c b/tools/perf/util/time-utils.c index 20663a460df3..1d67cf1216c7 100644 --- a/tools/perf/util/time-utils.c +++ b/tools/perf/util/time-utils.c @@ -389,13 +389,12 @@ bool perf_time__ranges_skip_sample(struct perf_time_interval *ptime_buf, ptime = &ptime_buf[i]; if (timestamp >= ptime->start && - ((timestamp < ptime->end && i < num - 1) || - (timestamp <= ptime->end && i == num - 1))) { - break; + (timestamp <= ptime->end || !ptime->end)) { + return false; } } - return (i == num) ? true : false; + return true; } int perf_time__parse_for_ranges(const char *time_str, -- 2.20.1