Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 BD0D81759D for ; Thu, 14 Mar 2024 05:51:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710395497; cv=none; b=NEDLBdWNWkaeJ1O/3iGcCPrLIs8MgbW7qp74EwDmWMTbmCJZdEtO5LbQjLzp1Imwez0R+Yl68a8fgoVa4bko2Jh0HKrX3zkasgkbxZ1fUqG4OCft19KaGSbHV5M5AgjQ+Vg5aUi9lhn9lsnLvcdo3jMuzeZOJN8CXaRkOgiF4pc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710395497; c=relaxed/simple; bh=KBRLOPIttIVmUTXmYYpZ5y5zAjJINB3dv9EpY8rLPGk=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=DXE6u61TajIXJqrF8Vb4NsV2qu3o3iowtcTrrcXfuFr4OtUnPHL9wT/LtUJS1NvGe1cmipHhEUXTQK/lB0+A2TsCOTIsG/4COzKgQugSbPAMixaLhMt70HjMg1Wew6hz/o01/S5W/kfWHxfPXn8EWQeG78UrJaBGAsPf8PYi0L0= 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=iqyN+p1/; arc=none smtp.client-ip=209.85.128.201 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="iqyN+p1/" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-60a5374f3bcso10665617b3.0 for ; Wed, 13 Mar 2024 22:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1710395494; x=1711000294; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=CEuSAf1lkMchEU55uC9f020RZIQvzTohuVPV0uKWKVI=; b=iqyN+p1/fsXvaY6NdOvI0iLy5MVYnJwaTEcSfjsceeKGFBBEq2YabDH9X8r6gKeCXz X8IRl7TBJwUaYRGW/SY5Scm0o59HQiFXdNm5GqY5dVk70d3VXeiFRurpUVow9GWa/apI RYuw1fonkvcbugukNyYPS/Ut04RQtKAngSJcHezlYRQlrCy6JGz4k8tF6oiFYVxfWDd+ +aoV+96Yrs76KwrfnrxDvDyKAkrSyNnl1xNxmea3grBmsCLsLKfu/17BZZ4Dp5740Zuz ARLtYEFKLJE4JH5wbYCDE5w6WYdVx1Xu2GXaY3ef4GIxEidefS7NQKqlsNS3iURGPCRm ku1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710395494; x=1711000294; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CEuSAf1lkMchEU55uC9f020RZIQvzTohuVPV0uKWKVI=; b=QXdPohII9kBjIjcjt0P+QtXHlD07HCHC4/e66ruQwTj8G5dS1wK0JOFVnxwxSE0BX+ NR8dbKmDA0T8sJRRNy/osClXORsIeMk1pujeiSPMVCf531OP/ks76dLMLWHk4p0zDF/h ofoYgOCuAyp6udBGEBDI3U5392jnALZGAM0DnIK6/CjK4c73ton8M8mV9juj0sYos9jw wzbw13t4Thhmc9lNKbPgp8KLCjgSiXQVTpBJ7zhPs0vYsK/rohRxS2BdpQ7a1sYMsqq0 dvxwHAzBCv31fKp/3lpoUA2EErR4sXixXWf9Pppvc+NasiHIme5VGykIK1njw6He0SGD Uyhw== X-Forwarded-Encrypted: i=1; AJvYcCWuMiHfgRtoCsKW33OHoI4w/X33MPhpwlw+84bn3O0WCYVYjI6ojDAobJrr3gCqLRcWVtQ8uJ4npadDOkphwsLLt1CFzWJ4idDGZlZsS67eOA== X-Gm-Message-State: AOJu0Yw7B/QftD0Am3cwVJtZJQn/61H1F1yr4sXMbIGi0vOSOxtm6Chl xSio5EujmLuq7mqsVVOCZZuG5dzAntytCX1rvBm12w0o/TZfB9qPsUZ3DCT7wGBCoxIw6HYc0vz WuqRPPQ== X-Google-Smtp-Source: AGHT+IG0CL5cqXQIbZ1eaywOmmX+tgnH+dpd1oudAB+T9cu4RUKk/wH22kkWUmezUlgBl5zJvsLXxla13pjm X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:449f:3bde:a4cd:806a]) (user=irogers job=sendgmr) by 2002:a05:6902:2503:b0:dcb:fb69:eadc with SMTP id dt3-20020a056902250300b00dcbfb69eadcmr20395ybb.6.1710395494388; Wed, 13 Mar 2024 22:51:34 -0700 (PDT) Date: Wed, 13 Mar 2024 22:50:47 -0700 In-Reply-To: <20240314055051.1960527-1-irogers@google.com> Message-Id: <20240314055051.1960527-9-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240314055051.1960527-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v3 08/12] perf jevents: Move json encoding to its own functions From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , John Garry , Kan Liang , Jing Zhang , Thomas Richter , James Clark , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Andi Kleen , Kajol Jain , Sandipan Das , Ravi Bangoria , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Stephane Eranian Content-Type: text/plain; charset="UTF-8" Have dedicate encode functions rather than having them embedded in MetricGroup. This is to provide some uniformity in the Metric ToXXX routines. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/metric.py | 34 +++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric.py index e81fed2e29b5..b39189182608 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -484,15 +484,6 @@ class Metric: def ToMetricGroupDescriptions(self, root: bool = True) -> Dict[str, str]: return {} -class _MetricJsonEncoder(json.JSONEncoder): - """Special handling for Metric objects.""" - - def default(self, o): - if isinstance(o, Metric): - return o.ToPerfJson() - return json.JSONEncoder.default(self, o) - - class MetricGroup: """A group of metrics. @@ -523,8 +514,11 @@ class MetricGroup: return result - def ToPerfJson(self) -> str: - return json.dumps(sorted(self.Flatten()), indent=2, cls=_MetricJsonEncoder) + def ToPerfJson(self) -> List[Dict[str, str]]: + result = [] + for x in sorted(self.Flatten()): + result.append(x.ToPerfJson()) + return result def ToMetricGroupDescriptions(self, root: bool = True) -> Dict[str, str]: result = {self.name: self.description} if self.description else {} @@ -533,7 +527,23 @@ class MetricGroup: return result def __str__(self) -> str: - return self.ToPerfJson() + return str(self.ToPerfJson()) + + +def JsonEncodeMetric(x: MetricGroup): + class MetricJsonEncoder(json.JSONEncoder): + """Special handling for Metric objects.""" + + def default(self, o): + if isinstance(o, Metric) or isinstance(o, MetricGroup): + return o.ToPerfJson() + return json.JSONEncoder.default(self, o) + + return json.dumps(x, indent=2, cls=MetricJsonEncoder) + + +def JsonEncodeMetricGroupDescriptions(x: MetricGroup): + return json.dumps(x.ToMetricGroupDescriptions(), indent=2) class _RewriteIfExpToSelect(ast.NodeTransformer): -- 2.44.0.278.ge034bb2e1d-goog