X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-context-perf-counters.c;h=444c2f92e85822d72e361cb882f3dee5c4849938;hb=f97eaafb28e11d68919a6d53278b117343f33d60;hp=2f131d61e32f2cdbd4f7b152b478f7c60e3be6c2;hpb=7b745a9662e0552f2715391147bc994ad17ae29c;p=lttng-modules.git

diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
index 2f131d61..444c2f92 100644
--- a/lttng-context-perf-counters.c
+++ b/lttng-context-perf-counters.c
@@ -12,17 +12,18 @@
 #include <linux/perf_event.h>
 #include <linux/list.h>
 #include <linux/string.h>
-#include "ltt-events.h"
+#include "lttng-events.h"
 #include "wrapper/ringbuffer/frontend_types.h"
 #include "wrapper/vmalloc.h"
-#include "ltt-tracer.h"
+#include "wrapper/perf.h"
+#include "lttng-tracer.h"
 
 static
 size_t perf_counter_get_size(size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, ltt_alignof(uint64_t));
+	size += lib_ring_buffer_align(offset, lttng_alignof(uint64_t));
 	size += sizeof(uint64_t);
 	return size;
 }
@@ -30,7 +31,7 @@ size_t perf_counter_get_size(size_t offset)
 static
 void perf_counter_record(struct lttng_ctx_field *field,
 			 struct lib_ring_buffer_ctx *ctx,
-			 struct ltt_channel *chan)
+			 struct lttng_channel *chan)
 {
 	struct perf_event *event;
 	uint64_t value;
@@ -53,16 +54,25 @@ void perf_counter_record(struct lttng_ctx_field *field,
 		 */
 		value = 0;
 	}
-	lib_ring_buffer_align_ctx(ctx, ltt_alignof(value));
+	lib_ring_buffer_align_ctx(ctx, lttng_alignof(value));
 	chan->ops->event_write(ctx, &value, sizeof(value));
 }
 
+#if defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,99))
+static
+void overflow_callback(struct perf_event *event,
+		       struct perf_sample_data *data,
+		       struct pt_regs *regs)
+{
+}
+#else
 static
 void overflow_callback(struct perf_event *event, int nmi,
 		       struct perf_sample_data *data,
 		       struct pt_regs *regs)
 {
 }
+#endif
 
 static
 void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
@@ -114,7 +124,7 @@ int __cpuinit lttng_perf_counter_cpu_hp_callback(struct notifier_block *nb,
 	switch (action) {
 	case CPU_ONLINE:
 	case CPU_ONLINE_FROZEN:
-		pevent = perf_event_create_kernel_counter(attr,
+		pevent = wrapper_perf_event_create_kernel_counter(attr,
 				cpu, NULL, overflow_callback);
 		if (!pevent || IS_ERR(pevent))
 			return NOTIFY_BAD;
@@ -202,7 +212,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 
 	get_online_cpus();
 	for_each_online_cpu(cpu) {
-		events[cpu] = perf_event_create_kernel_counter(attr,
+		events[cpu] = wrapper_perf_event_create_kernel_counter(attr,
 					cpu, NULL, overflow_callback);
 		if (!events[cpu] || IS_ERR(events[cpu])) {
 			ret = -EINVAL;
@@ -219,9 +229,9 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 
 	field->event_field.name = name_alloc;
 	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = is_signed_type(unsigned long);
+	field->event_field.type.u.basic.integer.size = sizeof(uint64_t) * CHAR_BIT;
+	field->event_field.type.u.basic.integer.alignment = lttng_alignof(uint64_t) * CHAR_BIT;
+	field->event_field.type.u.basic.integer.signedness = is_signed_type(uint64_t);
 	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
 	field->event_field.type.u.basic.integer.base = 10;
 	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;