Merge pull request #70 from DataDog/jb/ctimer_default

richardstartin · web-flow · commit b7cd1461dbe6 · 2024-02-12T15:33:55.000Z
Use CTimer as default
diff --git a/ddprof-lib/src/main/cpp/profiler.cpp b/ddprof-lib/src/main/cpp/profiler.cpp
@@ -960,7 +960,7 @@ Engine* Profiler::selectCpuEngine(Arguments& args) {
             // signal based samplers are unstable on J9 before 8.0.362, 11.0.18 and 17.0.6
             return (Engine*)&j9_engine;
         }
-        return !perf_events.check(args) ? (Engine*)&perf_events : (!ctimer.check(args) ? (Engine*)&ctimer : (Engine*)&itimer);
+        return !ctimer.check(args) ? (Engine*)&ctimer : (!perf_events.check(args) ? (Engine*)&perf_events : (Engine*)&itimer);
     } else if (strcmp(args._event, EVENT_WALL) == 0) {
         return &noop_engine;
     } else if (strcmp(args._event, EVENT_ITIMER) == 0) {

Original file line number	Diff line number	Diff line change
`@@ -960,7 +960,7 @@ Engine* Profiler::selectCpuEngine(Arguments& args) {`
`960`	`960`	`// signal based samplers are unstable on J9 before 8.0.362, 11.0.18 and 17.0.6`
`961`	`961`	`return (Engine*)&j9_engine;`
`962`	`962`	`}`
`963`		`- return !perf_events.check(args) ? (Engine)&perf_events : (!ctimer.check(args) ? (Engine)&ctimer : (Engine*)&itimer);`
	`963`	`+ return !ctimer.check(args) ? (Engine)&ctimer : (!perf_events.check(args) ? (Engine)&perf_events : (Engine*)&itimer);`
`964`	`964`	`} else if (strcmp(args._event, EVENT_WALL) == 0) {`
`965`	`965`	`return &noop_engine;`
`966`	`966`	`} else if (strcmp(args._event, EVENT_ITIMER) == 0) {`