From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D86137106D for ; Tue, 16 Jun 2026 01:15:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781572556; cv=none; b=uM6o+UIfP3d2JyunWrAoKuQ9WoOVelvIvis96uj0aILyl+dhg2yxJZNF8BVBxqlVlZrm60UEgWCUJXKWtKGywFrBRNwdxVGSh82hxNj9H6pHcfqnL2Wrn0V0j9pGK6ti9Qdgz/LkSX9l63A+4mIzQwvR06t1T6m7FtkoeRiseaw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781572556; c=relaxed/simple; bh=BmN+uIK2KozJ/CmJ6jybIyW1ngHuqgsLL5Q2oJs/n+Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KJgPD9bPCpCe4nJG1sqyg9kLYnH5Xf5xuKYGxLaUoFfiO5hpkSHQE3hfhCyaXra+iYxnzgyjBuSZVbAqD9uUqiAcdT/vraOO45pmFaJt+GAt9q4Iw+3lGBGE4vpUaYJLMbk8r5rha0UU7ve1DzRpHU2n2ceUnuqpeYc+vSgfc3M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=O3rSOfik; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="O3rSOfik" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-30762d67a64so5628062eec.0 for ; Mon, 15 Jun 2026 18:15:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781572555; x=1782177355; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=VvL9FN3niBRwopfeT8jFF2/cj8/ZhVUpeFaQcjlgPs4=; b=O3rSOfiknz717YHMoERxDmhtmzdxlQUxejiW/7GdWJ01mKYijIt3MG3Mhi8V92MpEZ 4NVGfMknxXHdAwT7ZK5TlNhxHUGKUlzEsVNRrvYtAAaoEvypdAKeZL8xlIgr5czHoROI T8BvE8Pn/skm9mpogfXR0wCfs82gDBLVFrjJ+547MfaxK2r6yGRH7vGBsyVRpqJ2uTcV +O0eNPsLlBcDPvvBn80gZD6PjxyLV6Kh5V0MyATv0qiEnut5AC4wyFYd86opeA6ZYrLk RHBOIgN5W0SQOqzdP0p734d+sERjNxqL0iOQyrWbkf78L68rN/uYv82vH8ty4RHjtXkC d14Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781572555; x=1782177355; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VvL9FN3niBRwopfeT8jFF2/cj8/ZhVUpeFaQcjlgPs4=; b=G3dFID/ffYb9yk+nvI+k4N92ug7eRrc5D8ngTdYLGLYjEw5DmtE9l943hh1lQkBs/u eGqZSHdj6hHuTqCHXfuzikMpG4fQ76Dlo+KHeWqiB7k8mMQhMkgNdmisYcU6QpWB9vCw 9HtHvxexhAAUhUmZwuA/V8Su2f+7cQmETxCrxd0+kXwmiWS16GZNKA6bEb8i5A7LcvaC ZazxDd2tDrD03e6WcMeKjrbLzXn9SkCj1JuE47gOFhOQRIqg8rU2FGsRe8WtZI2T5ZNl bYJCdpi6wLXFEyd4Jm1s2AZnnyX6S4GP2/b055M9xaR5DzjZPOMD6TnqqCmme0I2GhM6 hMWQ== X-Forwarded-Encrypted: i=1; AFNElJ81S64dIYMPXI7fb2uVviDVgPTRXZXe5k+HbU4q1ChdThYE7pNcleLiaKU7BOowlgShfcG1Lfk5wlQrlS0=@vger.kernel.org X-Gm-Message-State: AOJu0YwkxNAkVRNGBF2FF+CbWihpNc0LrJqjBtGV0puwkeXL30eY5+Xf FjAdryObpVQGisw7CzO2ZjcJ8Hev0lf7c+YvVa6lFVmzj4cnFT3Up2lybG5INOLIiShrdXUPure C+BXYYDRehQ== X-Received: from dly15-n2.prod.google.com ([2002:a05:701b:204f:20b0:138:7d2:f099]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:2390:b0:136:c443:80e5 with SMTP id a92af1059eb24-13985e9ec50mr795068c88.6.1781572554256; Mon, 15 Jun 2026 18:15:54 -0700 (PDT) Date: Mon, 15 Jun 2026 18:15:24 -0700 In-Reply-To: <20260616011543.4037138-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260615223011.3873955-1-irogers@google.com> <20260616011543.4037138-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260616011543.4037138-3-irogers@google.com> Subject: [PATCH v21 02/21] perf python: Add missed explicit dependencies From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Type: text/plain; charset="UTF-8" Fix missing #include of pmus.h found while cleaning the evsel/evlist header files. Also define PY_SSIZE_T_CLEAN before including Python.h to comply with modern Python 3 C-API requirements, and introduce CHECK_INITIALIZED and CHECK_INITIALIZED_INT safety macros to be used by subsequent patches. Signed-off-by: Ian Rogers --- tools/perf/util/python.c | 41 +++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index cc1019d29a5d..98a8dd9b673d 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -1,30 +1,37 @@ // SPDX-License-Identifier: GPL-2.0 +#define PY_SSIZE_T_CLEAN #include -#include + #include -#include + #include +#include + +#include #include -#ifdef HAVE_LIBTRACEEVENT -#include -#endif #include +#include + #include "callchain.h" #include "counts.h" +#include "event.h" #include "evlist.h" #include "evsel.h" -#include "event.h" #include "expr.h" +#include "metricgroup.h" +#include "mmap.h" +#include "pmus.h" #include "print_binary.h" #include "record.h" #include "strbuf.h" #include "thread_map.h" #include "tp_pmu.h" #include "trace-event.h" -#include "metricgroup.h" -#include "mmap.h" #include "util/sample.h" -#include + +#ifdef HAVE_LIBTRACEEVENT +#include +#endif PyMODINIT_FUNC PyInit_perf(void); @@ -38,6 +45,22 @@ PyMODINIT_FUNC PyInit_perf(void); offsetof(struct pyrf_event, sample) + offsetof(struct perf_sample, member), \ 0, help } +#define CHECK_INITIALIZED(ptr, msg) \ + do { \ + if (!(ptr)) { \ + PyErr_SetString(PyExc_ValueError, msg " not initialized"); \ + return NULL; \ + } \ + } while (0) + +#define CHECK_INITIALIZED_INT(ptr, msg) \ + do { \ + if (!(ptr)) { \ + PyErr_SetString(PyExc_ValueError, msg " not initialized"); \ + return -1; \ + } \ + } while (0) + struct pyrf_event { PyObject_HEAD struct evsel *evsel; -- 2.54.0.1136.gdb2ca164c4-goog