From patchwork Wed Jan 26 12:31:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 12725013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E528DC2BA4C for ; Wed, 26 Jan 2022 12:31:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234588AbiAZMb0 (ORCPT ); Wed, 26 Jan 2022 07:31:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234212AbiAZMb0 (ORCPT ); Wed, 26 Jan 2022 07:31:26 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6A17C06161C for ; Wed, 26 Jan 2022 04:31:25 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id s5so38610103ejx.2 for ; Wed, 26 Jan 2022 04:31:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gCxDvsK6oc+9L4sgNfgtCrTWxyTRN7lIZF/ZMGj4Ug8=; b=HnEJzRbt7UkWTzPcgaVzDsl93H81FzGGHeG41yL8z1pGxnpn2AvM2Qm7IC0UyrZXZk 4tDYTJtQkcYxvYf2bcrBRuwrIYQTzJ668ljuDlkAGsA0ZvvSFzsIaxVOML5CaWcfGsMf 4ARX1iLekC3tC7WhtHhfmKLjY9LdH4lRhBRYbv/Q2gXeGnxOzQCblLjIEwiMjtZlLaCR YZZWJz55oYnZA7Nbb6rTGK5KXE2l8oDzp43ZDi7Xc43UT4K4vIj52CqIBMvuUdOMm649 Q+IvT6MTz0zj6bQ/Tkhdr4LPnKHCu7nAUNN1/PV0zLinoVwhLTu7ZuWmzO5P10XTmJJC n8OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gCxDvsK6oc+9L4sgNfgtCrTWxyTRN7lIZF/ZMGj4Ug8=; b=Th9sqP/Kqab8+mO8/KTTy2XAO8wTx6wOqjjbHgzLAEuwlUyMZhQVY/FZqmYk2RNv0A 8mguOxXxrYqFGRO8slhFG8iD0+uGtl8wVjWra2ii1gROiInBJA8FoQtpDrhwQPRfR09d 4X0luonhPim9znrRlXCdKcCF9BYiQxr/4JGnJ1zghQbG6QEJcCh/ow6RGseMe7fbea40 xZrWhWSRlZRsfeLkINLZDjmJz3ReR08QUXQHIhsUd1rW/ps/tljZnUI30ltdeIDaUX3i mIMvMOdCzkGOKLBuOvZLbcJkJMxYg9t5KC33s+usSJb2ztN2K4K9HMsik07JmyyU6lZJ 8wIQ== X-Gm-Message-State: AOAM530Lj58r1i5j3m4sxT9OSVbhTgxjp99nqhVVy6KKZLwTSR5gbN5R 7v6EGkD8B4RkbP5JzYakNoESRpVaeW8= X-Google-Smtp-Source: ABdhPJxq0/sk2V1Obtp3YitHnI6KbhKbru+EYjvRhhqiXKpRCq5fLr6DPNpr1lp2pIyuOigpEtcxRQ== X-Received: by 2002:a17:907:86ab:: with SMTP id qa43mr13058601ejc.215.1643200283770; Wed, 26 Jan 2022 04:31:23 -0800 (PST) Received: from crow.. ([95.87.219.163]) by smtp.gmail.com with ESMTPSA id cz6sm4315611edb.4.2022.01.26.04.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 04:31:23 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: linux-trace-devel@vger.kernel.org Cc: "Yordan Karadzhov (VMware)" Subject: [PATCH 1/2] trace-cruncher: Cleanup in class event Date: Wed, 26 Jan 2022 14:31:13 +0200 Message-Id: <20220126123114.214956-1-y.karadz@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The 'instance_list' field of the class event is a legacy from an old implementation of the cleanup that was done in the destructor of the class. Currently this field is useless and has to be removed. Signed-off-by: Yordan Karadzhov (VMware) --- tracecruncher/ft_utils.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tracecruncher/ft_utils.py b/tracecruncher/ft_utils.py index ed4bdcd..e1126ad 100644 --- a/tracecruncher/ft_utils.py +++ b/tracecruncher/ft_utils.py @@ -43,7 +43,6 @@ class event: """ self.system = system self.name = name - self.instance_list = [] if static: self.evt_id = find_event_id(system, name) if self.evt_id < 0: @@ -61,22 +60,16 @@ class event: """ if instance is None: ft.enable_event(system=self.system, event=self.name) - self.instance_list.append('top') else: ft.enable_event(instance=instance, system=self.system, event=self.name) - self.instance_list.append(instance) - - self.instance_list = list(set(self.instance_list)) def disable(self, instance=None): """ Disable this event. """ if instance is None: ft.disable_event(system=self.system, event=self.name) - self.instance_list.remove('top') else: ft.disable_event(instance=instance,system=self.system, event=self.name) - self.instance_list.remove(instance) def set_filter(self, filter, instance=None): """ Define a filter for this event. From patchwork Wed Jan 26 12:31:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 12725014 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E4BDC28CF5 for ; Wed, 26 Jan 2022 12:31:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241319AbiAZMb1 (ORCPT ); Wed, 26 Jan 2022 07:31:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234212AbiAZMb0 (ORCPT ); Wed, 26 Jan 2022 07:31:26 -0500 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63696C06161C for ; Wed, 26 Jan 2022 04:31:26 -0800 (PST) Received: by mail-ej1-x62f.google.com with SMTP id p15so38674274ejc.7 for ; Wed, 26 Jan 2022 04:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jz08dxnwMrlPAGxWpBGb6n4dnX7dafT5OlBTjmCfWVI=; b=PFx2W0nDHbWoumMHbFKpIZnzKV+VVlMD+bEECjnxrSH2z+QW2es64ykn5bgK/RIhmV qj4j6sagz9h1qydQP/gbEjB2Rt/ldR7djLIeaF2kI8FTlyLg+0xoyqgCah+zTit5MkYf u047rQrsSFrYboh+OTwU///QIBLGErR4bxfm1klcax2Z+B3VWK4gmXQJJAqAn5DlWrhx ssPeVfIhyxNKDQDWShnMGT4IG130DU3YV+ljRrnnsyG5G/K+eI+zQwOJK3UjiZ1s7lPZ o61LKJ0J/8Z5Fbb/FfLmWLvDQkPPwWlmdgQ+9xKABLCDWG8V25QDbK44HDh8apKZwh1K 0H0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jz08dxnwMrlPAGxWpBGb6n4dnX7dafT5OlBTjmCfWVI=; b=3YsKh0O5jSCm7UNr+PC9Ehv/agVgIsxvhSc9CQjqJgSa2TK+VH73EPwlX3EpiaR9XN CXwoIDapu9GiA/H27O8S/km8WOdytFOzwqx0x8lYy5yI/s1CM8bcK3E438bxzFEwq/jc ljCfsMdItQPtl5E3y7kXF6RsYpkRRyxzYGFjTfFadpw7dNTF7uBoj+ZEnhnAVRotzaB9 gzOeMKOTTn3E9mruIg/R4Hh5oY55grgmmg2Pf297C9pMwKl9cG3TaWJiu5Laq7YYbP8B Bo7NgSaAj4H3ujmON7E9OCqQVWVNRxKF+W0aAQfE/0cRLNxGpLuG/IE8XEYpWZsFV9U3 ZLKA== X-Gm-Message-State: AOAM530Y1UpDoX0k3fbtWjdbjHWYH3L6JeM3wJATedmVgBpi8lJJGkKR uroGf/ht0crNNdVZdzpSICvqYp6lQz0= X-Google-Smtp-Source: ABdhPJxmM7LdfRDlvhRcNTpJlCQQRT3KE3842yMGSpDxjpKxe10MIKKuIiPAXj/2Vj62+osCUJNEVQ== X-Received: by 2002:a17:906:7e19:: with SMTP id e25mr19660859ejr.642.1643200284730; Wed, 26 Jan 2022 04:31:24 -0800 (PST) Received: from crow.. ([95.87.219.163]) by smtp.gmail.com with ESMTPSA id cz6sm4315611edb.4.2022.01.26.04.31.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 04:31:24 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: linux-trace-devel@vger.kernel.org Cc: "Yordan Karadzhov (VMware)" Subject: [PATCH 2/2] trace-cruncher: Add no_arg() Date: Wed, 26 Jan 2022 14:31:14 +0200 Message-Id: <20220126123114.214956-2-y.karadz@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220126123114.214956-1-y.karadz@gmail.com> References: <20220126123114.214956-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org In the implementation of the low-level APIs wrapping libtracefs, a special string is used as a default value of the optional function arguments. Here we make this string available for the high-level APIs. This simplifies the implementation of the cases when optional arguments are used. Signed-off-by: Yordan Karadzhov (VMware) --- src/ftracepy-utils.c | 5 +++++ src/ftracepy-utils.h | 2 ++ src/ftracepy.c | 5 +++++ tracecruncher/ft_utils.py | 41 +++++++++++++-------------------------- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/ftracepy-utils.c b/src/ftracepy-utils.c index 8c46590..8ff6601 100644 --- a/src/ftracepy-utils.c +++ b/src/ftracepy-utils.c @@ -2178,6 +2178,11 @@ PyObject *PyFtrace_tc_event_system(PyObject *self) return PyUnicode_FromString(TC_SYS); } +PyObject *PyFtrace_no_arg(PyObject *self) +{ + return PyUnicode_FromString(NO_ARG); +} + static PyObject *dynevent_info2py(char *buff, int type) { PyObject *ret; diff --git a/src/ftracepy-utils.h b/src/ftracepy-utils.h index 7612df6..29a7312 100644 --- a/src/ftracepy-utils.h +++ b/src/ftracepy-utils.h @@ -245,6 +245,8 @@ PyObject *PyFtrace_enabled_options(PyObject *self, PyObject *args, PyObject *PyFtrace_tc_event_system(PyObject *self); +PyObject *PyFtrace_no_arg(PyObject *self); + PyObject *PyFtrace_register_kprobe(PyObject *self, PyObject *args, PyObject *kwargs); diff --git a/src/ftracepy.c b/src/ftracepy.c index 3f71b5e..82057ed 100644 --- a/src/ftracepy.c +++ b/src/ftracepy.c @@ -450,6 +450,11 @@ static PyMethodDef ftracepy_methods[] = { METH_NOARGS, "Get the name of the event system used by trace-cruncher." }, + {"no_arg", + (PyCFunction) PyFtrace_no_arg, + METH_NOARGS, + "Returns a default value for an optional function argument." + }, {"register_kprobe", (PyCFunction) PyFtrace_register_kprobe, METH_VARARGS | METH_KEYWORDS, diff --git a/tracecruncher/ft_utils.py b/tracecruncher/ft_utils.py index e1126ad..39faaed 100644 --- a/tracecruncher/ft_utils.py +++ b/tracecruncher/ft_utils.py @@ -55,45 +55,30 @@ class event: """ return int(self.evt_id) - def enable(self, instance=None): + def enable(self, instance=ft.no_arg()): """ Enable this event. """ - if instance is None: - ft.enable_event(system=self.system, event=self.name) - else: - ft.enable_event(instance=instance, system=self.system, event=self.name) + ft.enable_event(instance=instance, system=self.system, event=self.name) - def disable(self, instance=None): + def disable(self, instance=ft.no_arg()): """ Disable this event. """ - if instance is None: - ft.disable_event(system=self.system, event=self.name) - else: - ft.disable_event(instance=instance,system=self.system, event=self.name) + ft.disable_event(instance=instance,system=self.system, event=self.name) - def set_filter(self, filter, instance=None): + def set_filter(self, filter, instance=ft.no_arg()): """ Define a filter for this event. """ - if instance is None: - ft.set_event_filter(system=self.system, - event=self.name, - filter=filter) - else: - ft.set_event_filter(instance=instance, - system=self.system, - event=self.name, - filter=filter) + ft.set_event_filter(instance=instance, + system=self.system, + event=self.name, + filter=filter) - def clear_filter(self, instance=None): + def clear_filter(self, instance=ft.no_arg()): """ Define the filter for this event. """ - if instance is None: - ft.clear_event_filter(system=self.system, - event=self.name) - else: - ft.clear_event_filter(instance=instance, - system=self.system, - event=self.name) + ft.clear_event_filter(instance=instance, + system=self.system, + event=self.name) class kprobe_base(event):