X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flttng-context-perf-counters.c;h=bc860e67465e508ba48451cd6414d51cbad785f3;hb=HEAD;hp=44c47640ca50039ff141fd859a219af12c0fe90a;hpb=2dc781e02eb156a76554ada092a181ab2916db57;p=lttng-modules.git

diff --git a/src/lttng-context-perf-counters.c b/src/lttng-context-perf-counters.c
index 44c47640..a33a3fca 100644
--- a/src/lttng-context-perf-counters.c
+++ b/src/lttng-context-perf-counters.c
@@ -14,13 +14,14 @@
 #include <linux/string.h>
 #include <linux/cpu.h>
 #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
-size_t perf_counter_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset)
+size_t perf_counter_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -30,9 +31,9 @@ size_t perf_counter_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size
 }
 
 static
-void perf_counter_record(void *priv, struct lttng_probe_ctx *probe_ctx,
-			 struct lib_ring_buffer_ctx *ctx,
-			 struct lttng_channel *chan)
+void perf_counter_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+			 struct lttng_kernel_ring_buffer_ctx *ctx,
+			 struct lttng_kernel_channel_buffer *chan)
 {
 	struct lttng_perf_counter_field *perf_field = (struct lttng_perf_counter_field *) priv;
 	struct perf_event *event;
@@ -56,11 +57,10 @@ void perf_counter_record(void *priv, struct lttng_probe_ctx *probe_ctx,
 		 */
 		value = 0;
 	}
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(value));
-	chan->ops->event_write(ctx, &value, sizeof(value));
+	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,
@@ -97,10 +97,10 @@ void lttng_destroy_perf_counter_ctx_field(void *priv)
 	{
 		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
@@ -125,8 +125,8 @@ int lttng_cpuhp_perf_counter_online(unsigned int cpu,
 	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) {
@@ -187,8 +187,8 @@ int lttng_perf_counter_cpu_hp_callback(struct notifier_block *nb,
 	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) {
@@ -304,10 +304,10 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 		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;
@@ -317,7 +317,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 				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)) */
@@ -351,7 +351,7 @@ counter_error:
 			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