#include <stdint.h>
#include <sys/mman.h>
#include <sys/syscall.h>
+#include <lttng/ust-arch.h>
#include <lttng/ust-events.h>
#include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
#include <urcu/system.h>
#include <urcu/arch.h>
#include <urcu/rculist.h>
return count;
}
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(LTTNG_UST_ARCH_X86)
static
uint64_t rdpmc(unsigned int counter)
static
void perf_counter_record(struct lttng_ust_ctx_field *field,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
- struct lttng_channel *chan)
+ struct lttng_ust_channel_buffer *chan)
{
uint64_t value;
free(perf_field);
}
-#ifdef __ARM_ARCH_7A__
+#ifdef LTTNG_UST_ARCH_ARMV7
static
int perf_get_exclude_kernel(void)
return 0;
}
-#else /* __ARM_ARCH_7A__ */
+#else /* LTTNG_UST_ARCH_ARMV7 */
static
int perf_get_exclude_kernel(void)
return 1;
}
-#endif /* __ARM_ARCH_7A__ */
+#endif /* LTTNG_UST_ARCH_ARMV7 */
/* Called with UST lock held */
int lttng_add_perf_counter_to_ctx(uint32_t type,
lttng_alignof(uint64_t) * CHAR_BIT,
lttng_is_signed_type(uint64_t),
BYTE_ORDER, 10);
- if (!type) {
+ if (!ust_type) {
ret = -ENOMEM;
goto type_alloc_error;
}