static DEFINE_MUTEX(perf_counter_mutex);
static LIST_HEAD(perf_counter_contexts);
+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 += sizeof(uint64_t);
+ return size;
+}
+
static
void perf_counter_record(struct lttng_ctx_field *field,
struct lib_ring_buffer_ctx *ctx,
event = field->u.perf_counter.e[ctx->cpu];
event->pmu->read(event);
value = local64_read(&event->count);
- lib_ring_buffer_align_ctx(ctx,
- ltt_alignof(field->type.u.basic.integer.alignment / CHAR_BIT));
+ lib_ring_buffer_align_ctx(ctx, ltt_alignof(value));
chan->ops->event_write(ctx, &value, sizeof(value));
}
{
}
+static
+void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
+{
+ struct perf_event **events = field->u.perf_counter.e;
+ int cpu;
+
+ mutex_lock(&perf_counter_mutex);
+ list_del(&field->u.perf_counter.head);
+ for_each_online_cpu(cpu)
+ perf_event_release_kernel(events[cpu]);
+ mutex_unlock(&perf_counter_mutex);
+ kfree(field->u.perf_counter.attr);
+ kfree(events);
+}
+
int lttng_add_perf_counter_to_ctx(uint32_t type,
uint64_t config,
- struct lttng_ctx *ctx)
+ struct lttng_ctx **ctx)
{
struct lttng_ctx_field *field;
struct perf_event **events;
}
}
- ctx->nr_fields++;
- if (ctx->nr_fields > ctx->allocated_fields) {
- struct lttng_ctx_field *new_fields;
-
- ctx->allocated_fields = min_t(size_t, 1, 2 * ctx->allocated_fields);
- new_fields = kzalloc(ctx->allocated_fields * sizeof(struct lttng_ctx_field), GFP_KERNEL);
- if (!new_fields) {
- ret = -ENOMEM;
- goto error;
- }
- if (ctx->fields)
- memcpy(new_fields, ctx->fields, ctx->nr_fields - 1);
- kfree(ctx->fields);
- ctx->fields = new_fields;
+ field = lttng_append_context(ctx);
+ if (!field) {
+ ret = -ENOMEM;
+ goto error;
}
- field = &ctx->fields[ctx->nr_fields - 1];
-
- field->name = "dummyname";//TODO: lookup_counter_name(type, config);
- field->type.atype = atype_integer;
- field->type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
- field->type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
- field->type.u.basic.integer.signedness = 0;
- field->type.u.basic.integer.reverse_byte_order = 0;
- field->type.u.basic.integer.base = 10;
- field->type.u.basic.integer.encoding = lttng_encode_none;
- field->callback = perf_counter_record;
+ field->destroy = lttng_destroy_perf_counter_field;
+
+ field->event_field.name = "dummyname";//TODO: lookup_counter_name(type, config);
+ 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.reverse_byte_order = 0;
+ field->event_field.type.u.basic.integer.base = 10;
+ field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+ field->get_size = perf_counter_get_size;
+ field->record = perf_counter_record;
field->u.perf_counter.e = events;
field->u.perf_counter.attr = attr;
return ret;
}
-struct lttng_ctx *lttng_create_perf_counter_ctx(void)
-{
- return kzalloc(sizeof(struct lttng_ctx), GFP_KERNEL);
-}
-
-void lttng_destroy_perf_counter_ctx(struct lttng_ctx *ctx)
-{
- int i;
-
- for (i = 0; i < ctx->nr_fields; i++) {
- struct perf_event **events = ctx->fields[i].u.perf_counter.e;
- int cpu;
-
- mutex_lock(&perf_counter_mutex);
- list_del(&ctx->fields[i].u.perf_counter.head);
- for_each_online_cpu(cpu)
- perf_event_release_kernel(events[cpu]);
- mutex_unlock(&perf_counter_mutex);
- kfree(ctx->fields[i].u.perf_counter.attr);
- kfree(events);
- }
- kfree(ctx->fields);
- kfree(ctx);
-}
-
MODULE_LICENSE("GPL and additional rights");
MODULE_AUTHOR("Mathieu Desnoyers");
MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support");