From patchwork Mon Feb 5 13:00:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Raspl X-Patchwork-Id: 10200357 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 689DD60247 for ; Mon, 5 Feb 2018 13:00:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A9C128771 for ; Mon, 5 Feb 2018 13:00:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5923428778; Mon, 5 Feb 2018 13:00:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57AF828779 for ; Mon, 5 Feb 2018 13:00:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752994AbeBENAV (ORCPT ); Mon, 5 Feb 2018 08:00:21 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:45964 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752743AbeBENAM (ORCPT ); Mon, 5 Feb 2018 08:00:12 -0500 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w15CxOAC032975 for ; Mon, 5 Feb 2018 08:00:12 -0500 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0a-001b2d01.pphosted.com with ESMTP id 2fxnxdvkk8-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 05 Feb 2018 08:00:11 -0500 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 5 Feb 2018 13:00:09 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 5 Feb 2018 13:00:06 -0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w15D06lZ44564494; Mon, 5 Feb 2018 13:00:06 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9E59711C05B; Mon, 5 Feb 2018 12:53:30 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 97D5F11C06F; Mon, 5 Feb 2018 12:53:30 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 5 Feb 2018 12:53:30 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (localhost [127.0.0.1]) by tuxmaker.boeblingen.de.ibm.com (Postfix) with ESMTP id 8EF2D20F6CE; Mon, 5 Feb 2018 14:00:05 +0100 (CET) From: Stefan Raspl To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, rkrcmar@redhat.com, frankja@linux.vnet.ibm.com Subject: [PATCH 5/8] tools/kvm_stat: cache compiled regular expression Date: Mon, 5 Feb 2018 14:00:01 +0100 X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180205130004.29691-1-raspl@linux.vnet.ibm.com> References: <20180205130004.29691-1-raspl@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18020513-0020-0000-0000-000003F26CF5 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18020513-0021-0000-0000-00004284E029 Message-Id: <20180205130004.29691-6-raspl@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-02-05_03:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802050167 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Stefan Raspl Should save us a couple of cycles. Signed-off-by: Stefan Raspl --- tools/kvm/kvm_stat/kvm_stat | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/kvm/kvm_stat/kvm_stat b/tools/kvm/kvm_stat/kvm_stat index 185a642288c3..8bdbd14c5bb6 100755 --- a/tools/kvm/kvm_stat/kvm_stat +++ b/tools/kvm/kvm_stat/kvm_stat @@ -480,7 +480,7 @@ class Provider(object): """Indicate whether field is valid according to fields_filter.""" if not fields_filter: return True - return re.match(fields_filter, field) is not None + return fields_filter.match(field) is not None @staticmethod def walkdir(path): @@ -811,9 +811,10 @@ class Stats(object): """ def __init__(self, options): - self.providers = self.__get_providers(options) self._pid_filter = options.pid self._fields_filter = options.fields + self._fields_filter_comp = re.compile(options.fields) + self.providers = self.__get_providers(options) self.values = {} def __get_providers(self, options): @@ -821,10 +822,12 @@ class Stats(object): providers = [] if options.debugfs: - providers.append(DebugfsProvider(options.pid, options.fields, + providers.append(DebugfsProvider(self._pid_filter, + self._fields_filter_comp, options.dbgfs_include_past)) if options.tracepoints or not providers: - providers.append(TracepointProvider(options.pid, options.fields)) + providers.append(TracepointProvider(self._pid_filter, + self._fields_filter_comp)) return providers @@ -834,7 +837,7 @@ class Stats(object): # also clear the cache of old values. self.values = {} for provider in self.providers: - provider.update_fields(self._fields_filter) + provider.update_fields(self._fields_filter_comp) def reset(self): self.values = {} @@ -849,6 +852,7 @@ class Stats(object): def fields_filter(self, fields_filter): if fields_filter != self._fields_filter: self._fields_filter = fields_filter + self._fields_filter_comp = re.compile(fields_filter) self.__update_provider_filters() @property @@ -1040,7 +1044,7 @@ class Tui(object): self.stats.fields_filter = DEFAULT_REGEX elif self.stats.fields_filter == DEFAULT_REGEX: - self.stats.fields_filter = None + self.stats.fields_filter = '' def __update_pid(self, pid): """Propagates pid selection to stats object.""" @@ -1548,7 +1552,7 @@ def main(): stats = Stats(options) if options.fields == 'help': - stats.fields_filter = None + stats.fields_filter = '' event_list = [] for key in stats.get().keys(): event_list.append(key.split('(', 1)[0])