#include <string.h>
#include <unistd.h>
-#include "lttngerr.h"
-#include "kernelctl.h"
+#include <lttng-kernel-ctl.h>
+#include <lttngerr.h>
+
#include "kernel-ctl.h"
/*
struct ltt_kernel_session *lks;
/* Allocate data structure */
- lks = trace_create_kernel_session();
+ lks = trace_kernel_create_session(session->path);
if (lks == NULL) {
ret = -1;
goto error;
perror("fcntl session fd");
}
- lks->kconsumer_fds_sent = 0;
+ lks->consumer_fds_sent = 0;
session->kernel_session = lks;
DBG("Kernel session created (fd: %d)", lks->fd);
struct ltt_kernel_channel *lkc;
/* Allocate kernel channel */
- lkc = trace_create_kernel_channel(chan, path);
+ lkc = trace_kernel_create_channel(chan, path);
if (lkc == NULL) {
goto error;
}
int ret;
struct ltt_kernel_event *event;
- event = trace_create_kernel_event(ev);
+ event = trace_kernel_create_event(ev);
if (event == NULL) {
+ ret = -1;
goto error;
}
ret = kernctl_create_event(channel->fd, event->event);
if (ret < 0) {
- perror("create event ioctl");
+ if (errno != EEXIST) {
+ PERROR("create event ioctl");
+ }
+ ret = -errno;
goto free_event;
}
+ /*
+ * LTTNG_KERNEL_SYSCALL event creation will return 0 on success. However
+ * this FD must not be added to the event list.
+ */
+ if (ret == 0 && event->event->instrumentation == LTTNG_KERNEL_SYSCALL) {
+ DBG2("Kernel event syscall creation success");
+ goto end;
+ }
+
event->fd = ret;
/* Prevent fd duplication after execlp() */
ret = fcntl(event->fd, F_SETFD, FD_CLOEXEC);
DBG("Event %s created (fd: %d)", ev->name, event->fd);
+end:
return 0;
free_event:
free(event);
error:
- return -1;
+ return ret;
}
/*
int ret;
ret = kernctl_enable(chan->fd);
- if (ret < 0) {
- perror("enable chan ioctl");
- ret = errno;
+ if (ret < 0 && errno != EEXIST) {
+ perror("Enable kernel chan");
goto error;
}
int ret;
ret = kernctl_enable(event->fd);
- if (ret < 0) {
- perror("enable event ioctl");
- if (errno == EEXIST) {
- ret = -EEXIST;
- }
+ if (ret < 0 && errno != EEXIST) {
+ perror("enable kernel event");
goto error;
}
int ret;
ret = kernctl_disable(event->fd);
- if (ret < 0) {
- perror("disable event ioctl");
+ if (ret < 0 && errno != EEXIST) {
+ perror("disable kernel event");
goto error;
}
struct ltt_kernel_metadata *lkm;
/* Allocate kernel metadata */
- lkm = trace_create_kernel_metadata(path);
+ lkm = trace_kernel_create_metadata(path);
if (lkm == NULL) {
goto error;
}
struct ltt_kernel_stream *lks;
while ((ret = kernctl_create_stream(channel->fd)) > 0) {
- lks = trace_create_kernel_stream();
+ lks = trace_kernel_create_stream();
if (lks == NULL) {
close(ret);
goto error;