#include <lttng/events.h>
#include <lttng/events-internal.h>
#include <ringbuffer/frontend_types.h>
+#include <wrapper/cpu.h>
#include <wrapper/vmalloc.h>
-#include <wrapper/perf.h>
#include <lttng/tracer.h>
static
chan->ops->event_write(ctx, &value, sizeof(value), lttng_alignof(value));
}
-#if defined(CONFIG_PERF_EVENTS) && (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0))
+#ifdef CONFIG_PERF_EVENTS
static
void overflow_callback(struct perf_event *event,
struct perf_sample_data *data,
{
int cpu;
- get_online_cpus();
+ lttng_cpus_read_lock();
for_each_online_cpu(cpu)
perf_event_release_kernel(events[cpu]);
- put_online_cpus();
+ lttng_cpus_read_unlock();
#ifdef CONFIG_HOTPLUG_CPU
unregister_cpu_notifier(&perf_field->nb);
#endif
struct perf_event_attr *attr = perf_field->attr;
struct perf_event *pevent;
- pevent = wrapper_perf_event_create_kernel_counter(attr,
- cpu, NULL, overflow_callback);
+ pevent = perf_event_create_kernel_counter(attr,
+ cpu, NULL, overflow_callback, NULL);
if (!pevent || IS_ERR(pevent))
return -EINVAL;
if (pevent->state == PERF_EVENT_STATE_ERROR) {
switch (action) {
case CPU_ONLINE:
case CPU_ONLINE_FROZEN:
- pevent = wrapper_perf_event_create_kernel_counter(attr,
- cpu, NULL, overflow_callback);
+ pevent = perf_event_create_kernel_counter(attr,
+ cpu, NULL, overflow_callback, NULL);
if (!pevent || IS_ERR(pevent))
return NOTIFY_BAD;
if (pevent->state == PERF_EVENT_STATE_ERROR) {
perf_field->nb.priority = 0;
register_cpu_notifier(&perf_field->nb);
#endif
- get_online_cpus();
+ lttng_cpus_read_lock();
for_each_online_cpu(cpu) {
- events[cpu] = wrapper_perf_event_create_kernel_counter(attr,
- cpu, NULL, overflow_callback);
+ events[cpu] = perf_event_create_kernel_counter(attr,
+ cpu, NULL, overflow_callback, NULL);
if (!events[cpu] || IS_ERR(events[cpu])) {
ret = -EINVAL;
goto counter_error;
goto counter_busy;
}
}
- put_online_cpus();
+ lttng_cpus_read_unlock();
perf_field->hp_enable = 1;
}
#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */
if (events[cpu] && !IS_ERR(events[cpu]))
perf_event_release_kernel(events[cpu]);
}
- put_online_cpus();
+ lttng_cpus_read_unlock();
#ifdef CONFIG_HOTPLUG_CPU
unregister_cpu_notifier(&perf_field->nb);
#endif