Adress requested changes

CMakeLists.txt

@@ -129,6 +129,12 @@ add_feature_info("USE_LIBAUDIT" USE_LIBAUDIT "Use libaudit for syscall name reso
 
 # system configuration checks
 CHECK_INCLUDE_FILES(linux/hw_breakpoint.h HAVE_HW_BREAKPOINT_H)
+CHECK_STRUCT_HAS_MEMBER("struct perf_event_attr" clockid linux/perf_event.h HAVE_PERF_EVENT_ATTR_CLOCKID)
+
+if(NOT HAVE_PERF_EVENT_ATTR_CLOCKID)
+    message(FATAL_ERROR "The system is not able to use custom reference clocks for perf events. Make sure that you are running on system that supports use_clockid with perf")
+endif()
+
 check_function_exists(clock_gettime CLOCK_GETTIME_FOUND)
 if(NOT CLOCK_GETTIME_FOUND)
     set(CMAKE_REQUIRED_LIBRARIES "rt")

src/config.cpp

@@ -578,7 +578,7 @@ void parse_program_options(int argc, const char** argv)
         const auto& clock = lo2s::time::ClockProvider::get_clock_by_name(requested_clock_name);
 
         lo2s::Log::debug() << "Using clock \'" << clock.name << "\'.";
-#if !defined(USE_HW_BREAKPOINT_COMPAT)
+#ifndef USE_HW_BREAKPOINT_COMPAT
         config.use_clockid = true;
         config.clockid = clock.id;
 #else

src/perf/util.cpp

@@ -58,7 +58,7 @@ struct perf_event_attr common_perf_event_attrs()
     attr.size = sizeof(struct perf_event_attr);
     attr.disabled = 1;
 
-#if !defined(USE_HW_BREAKPOINT_COMPAT)
+#ifndef USE_HW_BREAKPOINT_COMPAT
     attr.use_clockid = config().use_clockid;
     attr.clockid = config().clockid;
 #endif
@@ -125,7 +125,7 @@ int perf_event_description_open(ExecutionScope scope, const EventDescription& de
     // 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)
+#ifndef USE_HW_BREAKPOINT_COMPAT
     perf_attr.use_clockid = config().use_clockid;
     perf_attr.clockid = config().clockid;
 #endif