From dc2d7bf79058641ed15a670e8bcb96789b7f0be2 Mon Sep 17 00:00:00 2001 From: Christian von Elm Date: Thu, 27 Apr 2023 13:19:38 +0200 Subject: [PATCH] Rebase onto master --- include/lo2s/perf/event_description.hpp | 2 +- include/lo2s/perf/sample/reader.hpp | 2 +- src/perf/counter/group/reader.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/lo2s/perf/event_description.hpp b/include/lo2s/perf/event_description.hpp index 33e5320c..72730fb2 100644 --- a/include/lo2s/perf/event_description.hpp +++ b/include/lo2s/perf/event_description.hpp @@ -197,7 +197,7 @@ struct EventDescription // Needed when scaling multiplexed events, and recognize activation phases perf_attr.read_format = PERF_FORMAT_TOTAL_TIME_ENABLED | PERF_FORMAT_TOTAL_TIME_RUNNING; -#if !defined(USE_HW_BREAKPOINT_COMPAT) && defined(USE_PERF_CLOCKID) +#ifndef USE_HW_BREAKPOINT_COMPAT perf_attr.use_clockid = config().use_clockid; perf_attr.clockid = config().clockid; #endif diff --git a/include/lo2s/perf/sample/reader.hpp b/include/lo2s/perf/sample/reader.hpp index 6b5b5271..5bc1e5cc 100644 --- a/include/lo2s/perf/sample/reader.hpp +++ b/include/lo2s/perf/sample/reader.hpp @@ -100,7 +100,7 @@ class Reader : public EventReader perf_attr.mmap = 1; perf_attr.disabled = 1; -#if !defined(USE_HW_BREAKPOINT_COMPAT) && defined(USE_PERF_CLOCKID) +#ifndef USE_HW_BREAKPOINT_COMPAT perf_attr.use_clockid = config().use_clockid; perf_attr.clockid = config().clockid; #endif diff --git a/src/perf/counter/group/reader.cpp b/src/perf/counter/group/reader.cpp index 43a00315..7f20cf96 100644 --- a/src/perf/counter/group/reader.cpp +++ b/src/perf/counter/group/reader.cpp @@ -57,7 +57,7 @@ Reader::Reader(ExecutionScope scope, bool enable_on_exec) leader_attr.disabled = 1; -#if !defined(USE_HW_BREAKPOINT_COMPAT) && defined(USE_PERF_CLOCKID) +#ifndef USE_HW_BREAKPOINT_COMPAT leader_attr.use_clockid = config().use_clockid; leader_attr.clockid = config().clockid; #endif