X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-perf-counters.c;h=6f6209112a81b4bf681eae06f5fe3e40c37d6c78;hb=4e48b5d;hp=c7dc2ecbe03cd10442af063ef3e4b77ebaeb8e52;hpb=864a1eda22ed99266509ac76451c6f27f91aa17e;p=lttng-ust.git diff --git a/liblttng-ust/lttng-context-perf-counters.c b/liblttng-ust/lttng-context-perf-counters.c index c7dc2ecb..6f620911 100644 --- a/liblttng-ust/lttng-context-perf-counters.c +++ b/liblttng-ust/lttng-context-perf-counters.c @@ -7,6 +7,7 @@ */ #define _LGPL_SOURCE +#include #include #include #include @@ -17,9 +18,10 @@ #include #include #include +#include #include #include -#include +#include #include #include #include @@ -29,7 +31,10 @@ #include #include #include "perf_event.h" + +#include "context-internal.h" #include "lttng-tracer-core.h" +#include "ust-events-internal.h" /* * We use a global perf counter key and iterate on per-thread RCU lists @@ -56,6 +61,7 @@ struct lttng_perf_counter_thread { struct lttng_perf_counter_field { struct perf_event_attr attr; struct cds_list_head thread_field_list; /* Per-field list of thread fields */ + char *name; }; static pthread_key_t perf_counter_key; @@ -153,11 +159,12 @@ void lttng_perf_unlock(void) } static -size_t perf_counter_get_size(struct lttng_ctx_field *field, size_t offset) +size_t perf_counter_get_size(void *priv __attribute__((unused)), + size_t offset) { size_t size = 0; - size += lib_ring_buffer_align(offset, lttng_alignof(uint64_t)); + size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint64_t)); size += sizeof(uint64_t); return size; } @@ -178,7 +185,7 @@ uint64_t read_perf_counter_syscall( return count; } -#if defined(__x86_64__) || defined(__i386__) +#if defined(LTTNG_UST_ARCH_X86) static uint64_t rdpmc(unsigned int counter) @@ -422,33 +429,32 @@ struct lttng_perf_counter_thread_field * } static -uint64_t wrapper_perf_counter_read(struct lttng_ctx_field *field) +uint64_t wrapper_perf_counter_read(void *priv) { 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 *) 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(void *priv, struct lttng_ust_lib_ring_buffer_ctx *ctx, - struct lttng_channel *chan) + struct lttng_ust_channel_buffer *chan) { uint64_t value; - value = wrapper_perf_counter_read(field); - lib_ring_buffer_align_ctx(ctx, lttng_alignof(value)); - chan->ops->event_write(ctx, &value, sizeof(value)); + value = wrapper_perf_counter_read(priv); + chan->ops->event_write(ctx, &value, sizeof(value), lttng_ust_rb_alignof(value)); } static -void perf_counter_get_value(struct lttng_ctx_field *field, - struct lttng_ctx_value *value) +void perf_counter_get_value(void *priv, + struct lttng_ust_ctx_value *value) { - value->u.s64 = wrapper_perf_counter_read(field); + value->u.s64 = wrapper_perf_counter_read(priv); } /* Called with perf lock held */ @@ -479,13 +485,13 @@ void lttng_destroy_perf_thread_key(void *_key) /* Called with UST lock held */ static -void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field) +void lttng_destroy_perf_counter_ctx_field(void *priv) { 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; + perf_field = (struct lttng_perf_counter_field *) priv; + free(perf_field->name); /* * This put is performed when no threads can concurrently * perform a "get" concurrently, thanks to urcu-bp grace @@ -501,7 +507,7 @@ void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field) free(perf_field); } -#ifdef __ARM_ARCH_7A__ +#ifdef LTTNG_UST_ARCH_ARMV7 static int perf_get_exclude_kernel(void) @@ -509,7 +515,7 @@ int perf_get_exclude_kernel(void) return 0; } -#else /* __ARM_ARCH_7A__ */ +#else /* LTTNG_UST_ARCH_ARMV7 */ static int perf_get_exclude_kernel(void) @@ -517,61 +523,53 @@ int perf_get_exclude_kernel(void) return 1; } -#endif /* __ARM_ARCH_7A__ */ +#endif /* LTTNG_UST_ARCH_ARMV7 */ + +static const struct lttng_ust_type_common *ust_type = + lttng_ust_static_type_integer(sizeof(uint64_t) * CHAR_BIT, + lttng_ust_rb_alignof(uint64_t) * CHAR_BIT, + lttng_ust_is_signed_type(uint64_t), + BYTE_ORDER, 10); /* 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 ctx_field; + struct lttng_ust_event_field *event_field; struct lttng_perf_counter_field *perf_field; char *name_alloc; int ret; + if (lttng_find_context(*ctx, name)) { + ret = -EEXIST; + goto find_error; + } name_alloc = strdup(name); if (!name_alloc) { ret = -ENOMEM; goto name_alloc_error; } + event_field = zmalloc(sizeof(*event_field)); + if (!event_field) { + ret = -ENOMEM; + goto event_field_alloc_error; + } + event_field->name = name_alloc; + event_field->type = ust_type; + perf_field = zmalloc(sizeof(*perf_field)); if (!perf_field) { ret = -ENOMEM; goto perf_field_alloc_error; } - field = lttng_append_context(ctx); - if (!field) { - ret = -ENOMEM; - goto append_context_error; - } - if (lttng_find_context(*ctx, name_alloc)) { - ret = -EEXIST; - goto find_error; - } - - 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->get_size = perf_counter_get_size; - field->record = perf_counter_record; - field->get_value = perf_counter_get_value; - perf_field->attr.type = type; 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; + perf_field->name = name_alloc; /* Ensure that this perf counter can be used in this process. */ ret = open_perf_fd(&perf_field->attr); @@ -581,23 +579,29 @@ int lttng_add_perf_counter_to_ctx(uint32_t type, } close_perf_fd(ret); - /* - * Contexts can only be added before tracing is started, so we - * don't have to synchronize against concurrent threads using - * the field here. - */ + ctx_field.event_field = event_field; + ctx_field.get_size = perf_counter_get_size; + ctx_field.record = perf_counter_record; + ctx_field.get_value = perf_counter_get_value; + ctx_field.destroy = lttng_destroy_perf_counter_ctx_field; + ctx_field.priv = perf_field; - lttng_context_update(*ctx); + ret = lttng_ust_context_append(ctx, &ctx_field); + if (ret) { + ret = -ENOMEM; + goto append_context_error; + } return 0; -setup_error: -find_error: - lttng_remove_context_field(ctx, field); append_context_error: +setup_error: free(perf_field); perf_field_alloc_error: + free(event_field); +event_field_alloc_error: free(name_alloc); name_alloc_error: +find_error: return ret; }