#include <string.h>
#include <unistd.h>
-#include "lttngerr.h"
-#include "libkernelctl.h"
+#include <lttng-kernel-ctl.h>
+#include <lttngerr.h>
+
#include "kernel-ctl.h"
/*
- * kernel_add_channel_context
- *
- * Add context on a kernel channel.
+ * Add context on a kernel channel.
*/
int kernel_add_channel_context(struct ltt_kernel_channel *chan,
struct lttng_kernel_context *ctx)
}
/*
- * kernel_add_event_context
- *
- * Add context on a kernel event.
+ * Add context on a kernel event.
*/
int kernel_add_event_context(struct ltt_kernel_event *event,
struct lttng_kernel_context *ctx)
}
/*
- * kernel_create_session
- *
- * Create a new kernel session, register it to the kernel tracer and add it to
- * the session daemon session.
+ * Create a new kernel session, register it to the kernel tracer and add it to
+ * the session daemon session.
*/
int kernel_create_session(struct ltt_session *session, int tracer_fd)
{
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);
}
/*
- * kernel_create_channel
- *
- * Create a kernel channel, register it to the kernel tracer and add it to the
- * kernel session.
+ * Create a kernel channel, register it to the kernel tracer and add it to the
+ * kernel session.
*/
-int kernel_create_channel(struct ltt_kernel_session *session, struct lttng_channel *chan, char *path)
+int kernel_create_channel(struct ltt_kernel_session *session,
+ struct lttng_channel *chan, char *path)
{
int ret;
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;
}
}
/*
- * kernel_create_event
- *
- * Create a kernel event, enable it to the kernel tracer and add it to the
- * channel event list of the kernel session.
+ * Create a kernel event, enable it to the kernel tracer and add it to the
+ * channel event list of the kernel session.
*/
-int kernel_create_event(struct lttng_event *ev, struct ltt_kernel_channel *channel)
+int kernel_create_event(struct lttng_event *ev,
+ struct ltt_kernel_channel *channel)
{
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;
}
/*
- * kernel_disable_channel
- *
- * Disable a kernel channel.
+ * Disable a kernel channel.
*/
int kernel_disable_channel(struct ltt_kernel_channel *chan)
{
}
/*
- * kernel_enable_channel
- *
- * Enable a kernel channel.
+ * Enable a kernel channel.
*/
int kernel_enable_channel(struct ltt_kernel_channel *chan)
{
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;
}
}
/*
- * kernel_enable_event
- *
- * Enable a kernel event.
+ * Enable a kernel event.
*/
int kernel_enable_event(struct ltt_kernel_event *event)
{
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;
}
}
/*
- * kernel_disable_event
- *
- * Disable a kernel event.
+ * Disable a kernel event.
*/
int kernel_disable_event(struct ltt_kernel_event *event)
{
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;
}
}
/*
- * kernel_open_metadata
- *
- * Create kernel metadata, open from the kernel tracer and add it to the
- * kernel session.
+ * Create kernel metadata, open from the kernel tracer and add it to the
+ * kernel session.
*/
int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
{
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;
}
}
/*
- * kernel_start_session
- *
- * Start tracing session.
+ * Start tracing session.
*/
int kernel_start_session(struct ltt_kernel_session *session)
{
}
/*
- * kernel_wait_quiescent
- *
- * Make a kernel wait to make sure in-flight probe have completed.
+ * Make a kernel wait to make sure in-flight probe have completed.
*/
void kernel_wait_quiescent(int fd)
{
}
/*
- * kernel_calibrate
+ * Kernel calibrate
*/
int kernel_calibrate(int fd, struct lttng_kernel_calibrate *calibrate)
{
/*
- * kernel_metadata_flush_buffer
- *
* Force flush buffer of metadata.
*/
int kernel_metadata_flush_buffer(int fd)
}
/*
- * kernel_flush_buffer
- *
- * Force flush buffer for channel.
+ * Force flush buffer for channel.
*/
int kernel_flush_buffer(struct ltt_kernel_channel *channel)
{
}
/*
- * kernel_stop_session
- *
- * Stop tracing session.
+ * Stop tracing session.
*/
int kernel_stop_session(struct ltt_kernel_session *session)
{
}
/*
- * kernel_open_channel_stream
- *
- * Open stream of channel, register it to the kernel tracer and add it
- * to the stream list of the channel.
+ * Open stream of channel, register it to the kernel tracer and add it
+ * to the stream list of the channel.
*
- * Return the number of created stream. Else, a negative value.
+ * Return the number of created stream. Else, a negative value.
*/
int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
{
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;
}
/*
- * kernel_open_metadata_stream
- *
- * Open the metadata stream and set it to the kernel session.
+ * Open the metadata stream and set it to the kernel session.
*/
int kernel_open_metadata_stream(struct ltt_kernel_session *session)
{
fp = fdopen(fd, "r");
if (fp == NULL) {
perror("kernel tracepoint list fdopen");
- goto error;
+ goto error_fp;
}
/*
elist = realloc(elist, nbmem);
if (elist == NULL) {
perror("realloc list events");
- goto error;
+ count = -ENOMEM;
+ goto end;
}
}
- strncpy(elist[count].name, event, strlen(event));
+ strncpy(elist[count].name, event, LTTNG_SYMBOL_NAME_LEN);
+ elist[count].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
count++;
}
*events = elist;
-
DBG("Kernel list events done (%zu events)", count);
-
+end:
+ fclose(fp); /* closes both fp and fd */
return count;
+error_fp:
+ close(fd);
error:
return -1;
}