#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>
}
static
-size_t perf_counter_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t perf_counter_get_size(struct lttng_ust_ctx_field *field, size_t offset)
{
size_t size = 0;
return count;
}
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(LTTNG_UST_ARCH_X86)
static
uint64_t rdpmc(unsigned int counter)
}
static
-uint64_t wrapper_perf_counter_read(struct lttng_ctx_field *field)
+uint64_t wrapper_perf_counter_read(struct lttng_ust_ctx_field *field)
{
struct lttng_perf_counter_field *perf_field;
struct lttng_perf_counter_thread_field *perf_thread_field;
- perf_field = field->u.perf_counter;
+ perf_field = (struct lttng_perf_counter_field *) field->priv;
perf_thread_field = get_thread_field(perf_field);
return arch_read_perf_counter(perf_thread_field);
}
static
-void perf_counter_record(struct lttng_ctx_field *field,
+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;
}
static
-void perf_counter_get_value(struct lttng_ctx_field *field,
- struct lttng_ctx_value *value)
+void perf_counter_get_value(struct lttng_ust_ctx_field *field,
+ struct lttng_ust_ctx_value *value)
{
value->u.s64 = wrapper_perf_counter_read(field);
}
/* Called with UST lock held */
static
-void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
+void lttng_destroy_perf_counter_field(struct lttng_ust_ctx_field *field)
{
struct lttng_perf_counter_field *perf_field;
struct lttng_perf_counter_thread_field *pos, *p;
- free((char *) field->event_field.name);
- perf_field = field->u.perf_counter;
+ free((char *) field->event_field->name);
+ perf_field = (struct lttng_perf_counter_field *) field->priv;
/*
* This put is performed when no threads can concurrently
* perform a "get" concurrently, thanks to urcu-bp grace
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,
uint64_t config,
const char *name,
- struct lttng_ctx **ctx)
+ struct lttng_ust_ctx **ctx)
{
- struct lttng_ctx_field *field;
+ struct lttng_ust_ctx_field *field;
+ struct lttng_ust_type_common *ust_type;
struct lttng_perf_counter_field *perf_field;
char *name_alloc;
int ret;
ret = -ENOMEM;
goto perf_field_alloc_error;
}
+ ust_type = lttng_ust_create_type_integer(sizeof(uint64_t) * CHAR_BIT,
+ lttng_alignof(uint64_t) * CHAR_BIT,
+ lttng_ust_is_signed_type(uint64_t),
+ BYTE_ORDER, 10);
+ if (!ust_type) {
+ ret = -ENOMEM;
+ goto type_alloc_error;
+ }
field = lttng_append_context(ctx);
if (!field) {
ret = -ENOMEM;
field->destroy = lttng_destroy_perf_counter_field;
- field->event_field.name = name_alloc;
- field->event_field.type.atype = atype_integer;
- field->event_field.type.u.integer.size =
- sizeof(uint64_t) * CHAR_BIT;
- field->event_field.type.u.integer.alignment =
- lttng_alignof(uint64_t) * CHAR_BIT;
- field->event_field.type.u.integer.signedness =
- lttng_is_signed_type(uint64_t);
- field->event_field.type.u.integer.reverse_byte_order = 0;
- field->event_field.type.u.integer.base = 10;
- field->event_field.type.u.integer.encoding = lttng_encode_none;
+ field->event_field->name = name_alloc;
+ field->event_field->type = ust_type;
field->get_size = perf_counter_get_size;
field->record = perf_counter_record;
field->get_value = perf_counter_get_value;
perf_field->attr.config = config;
perf_field->attr.exclude_kernel = perf_get_exclude_kernel();
CDS_INIT_LIST_HEAD(&perf_field->thread_field_list);
- field->u.perf_counter = perf_field;
+ field->priv = perf_field;
/* Ensure that this perf counter can be used in this process. */
ret = open_perf_fd(&perf_field->attr);
find_error:
lttng_remove_context_field(ctx, field);
append_context_error:
+ lttng_ust_destroy_type(ust_type);
+type_alloc_error:
free(perf_field);
perf_field_alloc_error:
free(name_alloc);