#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <urcu/list.h>
#include <lttng-sessiond-comm.h>
-#include <urcu/list.h>
+#include <lttngerr.h>
-#include "lttngerr.h"
#include "context.h"
#include "kernel-ctl.h"
DBG("Add kernel context to event %s", event_name);
- kevent = get_kernel_event_by_name(event_name, kchan);
+ kevent = trace_kernel_get_event_by_name(event_name, kchan);
if (kevent != NULL) {
ret = kernel_add_event_context(kevent, kctx);
if (ret < 0) {
/*
* Add kernel context to tracer.
*/
-int add_kernel_context(struct ltt_kernel_session *ksession,
- struct lttng_kernel_context *kctx, char *event_name,
+int context_kernel_add(struct ltt_kernel_session *ksession,
+ struct lttng_event_context *ctx, char *event_name,
char *channel_name)
{
int ret;
struct ltt_kernel_channel *kchan;
+ struct lttng_kernel_context kctx;
+
+ /* Setup kernel context structure */
+ kctx.ctx = ctx->ctx;
+ kctx.u.perf_counter.type = ctx->u.perf_counter.type;
+ kctx.u.perf_counter.config = ctx->u.perf_counter.config;
+ strncpy(kctx.u.perf_counter.name, ctx->u.perf_counter.name,
+ LTTNG_SYMBOL_NAME_LEN);
+ kctx.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
if (strlen(channel_name) == 0) {
- ret = add_kctx_all_channels(ksession, kctx, event_name);
+ ret = add_kctx_all_channels(ksession, &kctx, event_name);
if (ret != LTTCOMM_OK) {
goto error;
}
} else {
/* Get kernel channel */
- kchan = get_kernel_channel_by_name(channel_name, ksession);
+ kchan = trace_kernel_get_channel_by_name(channel_name, ksession);
if (kchan == NULL) {
ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
goto error;
}
- ret = add_kctx_to_channel(kctx, kchan, event_name);
+ ret = add_kctx_to_channel(&kctx, kchan, event_name);
if (ret != LTTCOMM_OK) {
goto error;
}