X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-perf-counters.c;h=372f05e0cc902c311611604875d6922372c1dc48;hb=ffcc873470121ef1ebb110df3d9038a38d9cb7cb;hp=e637bb75ca94c3ea2c991871ba2ce40617894f03;hpb=2836dd4ff6274876a8709fcc1637e78bbc059cdf;p=lttng-modules.git

diff --git a/src/lttng-context-perf-counters.c b/src/lttng-context-perf-counters.c
index e637bb75..372f05e0 100644
--- a/src/lttng-context-perf-counters.c
+++ b/src/lttng-context-perf-counters.c
@@ -14,13 +14,15 @@
 #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(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,15 +32,15 @@ size_t perf_counter_get_size(size_t offset)
 }
 
 static
-void perf_counter_record(struct lttng_kernel_ctx_field *field,
-			 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 = field->priv;
+	struct lttng_perf_counter_field *perf_field = (struct lttng_perf_counter_field *) priv;
 	struct perf_event *event;
 	uint64_t value;
 
-	event = perf_field->e[ctx->cpu];
+	event = perf_field->e[ctx->priv.reserve_cpu];
 	if (likely(event)) {
 		if (unlikely(event->state == PERF_EVENT_STATE_ERROR)) {
 			value = 0;
@@ -56,8 +58,7 @@ void perf_counter_record(struct lttng_kernel_ctx_field *field,
 		 */
 		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))
@@ -77,9 +78,9 @@ void overflow_callback(struct perf_event *event, int nmi,
 #endif
 
 static
-void lttng_destroy_perf_counter_ctx_field(struct lttng_kernel_ctx_field *field)
+void lttng_destroy_perf_counter_ctx_field(void *priv)
 {
-	struct lttng_perf_counter_field *perf_field = field->priv;
+	struct lttng_perf_counter_field *perf_field = priv;
 	struct perf_event **events = perf_field->e;
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0))
@@ -97,10 +98,10 @@ void lttng_destroy_perf_counter_ctx_field(struct lttng_kernel_ctx_field *field)
 	{
 		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
@@ -304,7 +305,7 @@ 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);
@@ -317,7 +318,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 +352,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