From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 293E410E4 for ; Sat, 28 Jun 2025 00:09:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751069380; cv=none; b=t2iQi/5ROqsaomEW238ChmB7pRAmz2Re3qHkREMNcmXiTgqQOHvQoAdbZENODjpa1yeljoIPMY+DHTI6JUaGn79rH/e0PpH9SFqsIznQm6JDZKb/Kng9f/GLuIg8An2aYBIraHuM2qYrV/z6imLoQ6fU+bIcwPQrV5Y7NNeS+KU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751069380; c=relaxed/simple; bh=SCSVRXj5DB/cfKYLIvAW2+qqqcd9DzSoDst4X0cpuZc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=UlMA5vAMzVZfF08O3gDIKm5AkLOsyGa6PET9B54gSwzWJXjKBPbYwv0KNoBrciIG40h9VXnZ8MVOLB8FYkIy/MANMilw1HoN9lizlgaeCX2GSOK7TLKjlXN/Zkn2fjkC8GJ+S/3WKHcapB1zYIqYNSRVt+Vli8aMGYLXpRoWQ4c= 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=Skwh/E83; arc=none smtp.client-ip=209.85.215.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="Skwh/E83" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b115fb801bcso3141004a12.3 for ; Fri, 27 Jun 2025 17:09:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1751069377; x=1751674177; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=uM9b0q174RElAGAUOsRC1+X9nDdEI4t5lPgRji4c5mk=; b=Skwh/E83+7tU5aJq06GugXApFjEYo9GfTRBpQYy/laBlZJTjtfYXtCMB0W1WKLrU+0 g5pDOW0jT9EfWM+miDv3BtPx96YnJO3zfYcXRrTxmS/ZRjG9RQR1KiNoHe3MenuyJhmG LhUJJ6c9PgeScT4TvFixZ7LXM2i6V65v1v1c4vtS2HdWy0n2yYrL1rxFiO5HlN3JMyO/ 2VjKTGa54xuDYFIg5UUlCf2WcDT+IwOBr4qGLIo+j9JQGUNdNrNcjNOaM/iPN93U4Tvq fYYvCQ3jF5wInCTyoT+1fegyhehONGY3guwFimYXG2/tsne9LfuYryS/4+ojCa2i8Ai/ R4vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751069377; x=1751674177; h=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=uM9b0q174RElAGAUOsRC1+X9nDdEI4t5lPgRji4c5mk=; b=FEYs4jpBiRn6pxaVSUboHm90Rr+02ADjkofaWcqlmxSvdc7iwkqhq+rGO27im7VnZQ cBtWbtUfZH8vY+Snys/CTC1J6j8jr91nBrPQer0+PgHrj9Y+wo7T2opjq+ze7aVGQoK6 Fg4XC9eYy57pqj4NT1XxJHVXTPU72JqaYXWy0AFsMSk0ad3ENfe543Pmwa0OMlkUhfcb 4pWNVNXHYye0gJ/fuY/NUPQmQaAU8kyRtjUYVRDR2qgpt93belKLsdTLnS5/eqmf+ft+ PVOdfrSOlJiD+wS0PCy6PoVAxs8X4y08zoGPuxqx1XK0Smh9a2wj+BZ+/1sZazFq5kEw h8Rg== X-Forwarded-Encrypted: i=1; AJvYcCUmAp0JwGOOnaCown+aUDUzpS6oieAjT/WC6+8pYE7xj5rSAQLuivGaeP1Ha5th5dYwWCDSubIlSSOQAAXiY+Ws@vger.kernel.org X-Gm-Message-State: AOJu0YycuQL2twH2lYbG8aeoWh9T4lbP0jcIdq96Dr1iYmBS0U3EeVqD XIXl6HhKqYM+tGVbMNWyTsKe1D+IvgcyxZbew/hXwiTWrnwqTJIvf7JC86tO7hvaz6LiC41tJEI LQXKVxYqPJg== X-Google-Smtp-Source: AGHT+IFGs6aHSOiyXNrCU00NCL/c6uJ+2lnXnQ91a3SG2R8GfL5Yw7XlkLgRRFH3xzwbNKmbtXllaDIxcXX4 X-Received: from pfbbd20.prod.google.com ([2002:a05:6a00:2794:b0:746:fd4c:1fcf]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:2d0c:b0:21a:efe4:5c6f with SMTP id adf61e73a8af0-220a1265985mr8361320637.2.1751069377320; Fri, 27 Jun 2025 17:09:37 -0700 (PDT) Date: Fri, 27 Jun 2025 17:09:16 -0700 In-Reply-To: <20250628000929.230406-1-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: <20250628000929.230406-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250628000929.230406-3-irogers@google.com> Subject: [PATCH v4 02/15] perf parse-events: Minor tidy up of event_type helper From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Xu Yang , John Garry , "Masami Hiramatsu (Google)" , Howard Chu , Weilin Wang , Thomas Richter , Andi Kleen , Tiezhu Yang , Gautam Menghani , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Add missing breakpoint and raw types. Avoid a switch, just use a lookup array. Switch the type to unsigned to avoid checking negative values. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 31 +++++++++++++------------------ tools/perf/util/parse-events.h | 2 +- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 4cd64ffa4fcd..a59ae5ca0f89 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -135,26 +135,21 @@ const struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = { }, }; -const char *event_type(int type) -{ - switch (type) { - case PERF_TYPE_HARDWARE: - return "hardware"; - - case PERF_TYPE_SOFTWARE: - return "software"; - - case PERF_TYPE_TRACEPOINT: - return "tracepoint"; - - case PERF_TYPE_HW_CACHE: - return "hardware-cache"; +static const char *const event_types[] = { + [PERF_TYPE_HARDWARE] = "hardware", + [PERF_TYPE_SOFTWARE] = "software", + [PERF_TYPE_TRACEPOINT] = "tracepoint", + [PERF_TYPE_HW_CACHE] = "hardware-cache", + [PERF_TYPE_RAW] = "raw", + [PERF_TYPE_BREAKPOINT] = "breakpoint", +}; - default: - break; - } +const char *event_type(size_t type) +{ + if (type >= PERF_TYPE_MAX) + return "unknown"; - return "unknown"; + return event_types[type]; } static char *get_config_str(const struct parse_events_terms *head_terms, diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 1c20ed0879aa..b47bf2810112 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -21,7 +21,7 @@ struct option; struct perf_pmu; struct strbuf; -const char *event_type(int type); +const char *event_type(size_t type); /* Arguments encoded in opt->value. */ struct parse_events_option_args { -- 2.50.0.727.gbf7dc18ff4-goog