*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
#include <unistd.h>
#include "lttngerr.h"
-#include "ltt-sessiond.h"
-#include "libkernelctl.h"
+#include "kernelctl.h"
#include "kernel-ctl.h"
+/*
+ * kernel_add_channel_context
+ *
+ * Add context on a kernel channel.
+ */
+int kernel_add_channel_context(struct ltt_kernel_channel *chan,
+ struct lttng_kernel_context *ctx)
+{
+ int ret;
+
+ DBG("Adding context to channel %s", chan->channel->name);
+ ret = kernctl_add_context(chan->fd, ctx);
+ if (ret < 0) {
+ if (errno != EEXIST) {
+ perror("add context ioctl");
+ } else {
+ /* If EEXIST, we just ignore the error */
+ ret = 0;
+ }
+ goto error;
+ }
+
+ chan->ctx = malloc(sizeof(struct lttng_kernel_context));
+ if (chan->ctx == NULL) {
+ perror("malloc event context");
+ goto error;
+ }
+
+ memcpy(chan->ctx, ctx, sizeof(struct lttng_kernel_context));
+
+ return 0;
+
+error:
+ return ret;
+}
+
+/*
+ * kernel_add_event_context
+ *
+ * Add context on a kernel event.
+ */
+int kernel_add_event_context(struct ltt_kernel_event *event,
+ struct lttng_kernel_context *ctx)
+{
+ int ret;
+
+ DBG("Adding context to event %s", event->event->name);
+ ret = kernctl_add_context(event->fd, ctx);
+ if (ret < 0) {
+ perror("add context ioctl");
+ goto error;
+ }
+
+ event->ctx = malloc(sizeof(struct lttng_kernel_context));
+ if (event->ctx == NULL) {
+ perror("malloc event context");
+ goto error;
+ }
+
+ memcpy(event->ctx, ctx, sizeof(struct lttng_kernel_context));
+
+ return 0;
+
+error:
+ return ret;
+}
+
/*
* kernel_create_session
*
lks->kconsumer_fds_sent = 0;
session->kernel_session = lks;
- session->kern_session_count++;
DBG("Kernel session created (fd: %d)", lks->fd);
* 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)
+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);
+ lkc = trace_create_kernel_channel(chan, path);
if (lkc == NULL) {
goto error;
}
* 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 ltt_kernel_channel *channel, struct lttng_event *ev)
+int kernel_create_event(struct lttng_event *ev, struct ltt_kernel_channel *channel)
{
int ret;
struct ltt_kernel_event *event;
}
event->fd = ret;
- event->enabled = 1;
/* Prevent fd duplication after execlp() */
ret = fcntl(event->fd, F_SETFD, FD_CLOEXEC);
if (ret < 0) {
/* Add event to event list */
cds_list_add(&event->list, &channel->events_list.head);
+ channel->event_count++;
+
DBG("Event %s created (fd: %d)", ev->name, event->fd);
return 0;
}
/*
- * kernel_disable_event
+ * kernel_disable_channel
*
- * Disable a kernel event for a specific channel.
+ * Disable a kernel channel.
*/
-int kernel_disable_event(char *event_name, struct ltt_kernel_channel *channel)
+int kernel_disable_channel(struct ltt_kernel_channel *chan)
{
int ret;
- struct ltt_kernel_event *iter;
- cds_list_for_each_entry(iter, &channel->events_list.head, list) {
- if (strcmp(iter->event->name, event_name) == 0) {
- ret = kernctl_disable(iter->fd);
- if (ret < 0) {
- perror("disable event ioctl");
- goto error;
- }
+ ret = kernctl_disable(chan->fd);
+ if (ret < 0) {
+ perror("disable chan ioctl");
+ ret = errno;
+ goto error;
+ }
+
+ chan->enabled = 0;
+ DBG("Kernel channel %s disabled (fd: %d)", chan->channel->name, chan->fd);
+
+ return 0;
+
+error:
+ return ret;
+}
+
+/*
+ * kernel_enable_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;
+ goto error;
+ }
+
+ chan->enabled = 1;
+ DBG("Kernel channel %s enabled (fd: %d)", chan->channel->name, chan->fd);
+
+ return 0;
+
+error:
+ return ret;
+}
- iter->enabled = 0;
- DBG("Kernel event %s disabled (fd: %d)", iter->event->name, iter->fd);
- break;
+/*
+ * kernel_enable_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;
}
+ goto error;
}
+ event->enabled = 1;
+ DBG("Kernel event %s enabled (fd: %d)", event->event->name, event->fd);
+
return 0;
error:
- return -1;
+ return ret;
+}
+
+/*
+ * kernel_disable_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");
+ goto error;
+ }
+
+ event->enabled = 0;
+ DBG("Kernel event %s disabled (fd: %d)", event->event->name, event->fd);
+
+ return 0;
+
+error:
+ return ret;
}
/*
* Create kernel metadata, open from the kernel tracer and add it to the
* kernel session.
*/
-int kernel_open_metadata(struct ltt_kernel_session *session)
+int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
{
int ret;
struct ltt_kernel_metadata *lkm;
/* Allocate kernel metadata */
- lkm = trace_create_kernel_metadata();
+ lkm = trace_create_kernel_metadata(path);
if (lkm == NULL) {
goto error;
}
}
}
+/*
+ * kernel_calibrate
+ */
+int kernel_calibrate(int fd, struct lttng_kernel_calibrate *calibrate)
+{
+ int ret;
+
+ ret = kernctl_calibrate(fd, calibrate);
+ if (ret < 0) {
+ perror("calibrate ioctl");
+ return -1;
+ }
+
+ return 0;
+}
+
+
/*
* kernel_metadata_flush_buffer
*
perror("fcntl session fd");
}
- ret = asprintf(&lks->pathname, "%s/trace_%d",
- channel->pathname, channel->stream_count);
+ ret = asprintf(&lks->pathname, "%s/%s_%d",
+ channel->pathname, channel->channel->name, channel->stream_count);
if (ret < 0) {
perror("asprintf kernel create stream");
goto error;
}
/*
- * kernel_list_events
- *
- * Get the event list from the kernel tracer and return that list in the CTF
- * format.
+ * Get the event list from the kernel tracer and return the number of elements.
*/
-ssize_t kernel_list_events(int tracer_fd, char **list)
+ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
{
- int fd;
- char *buf, *line = NULL;
- size_t nb, nbmem, total = 0;
+ int fd, pos;
+ char *event;
+ size_t nbmem, count = 0;
ssize_t size;
FILE *fp;
+ struct lttng_event *elist;
fd = kernctl_tracepoint_list(tracer_fd);
if (fd < 0) {
* See kernel-ctl.h for explanation of this value
*/
nbmem = KERNEL_EVENT_LIST_SIZE;
- buf = malloc(nbmem);
+ elist = malloc(sizeof(struct lttng_event) * nbmem);
- while ((size = getline(&line, &nb, fp)) != -1) {
- if (total + size > nbmem) {
- DBG("Reallocating event list from %zd to %zd bytes", nbmem,
- total + size + KERNEL_EVENT_LIST_SIZE);
+ while ((size = fscanf(fp, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) {
+ if (count > nbmem) {
+ DBG("Reallocating event list from %zu to %zu bytes", nbmem,
+ nbmem + KERNEL_EVENT_LIST_SIZE);
/* Adding the default size again */
- nbmem = total + size + KERNEL_EVENT_LIST_SIZE;
- buf = realloc(buf, nbmem);
- if (buf == NULL) {
+ nbmem += KERNEL_EVENT_LIST_SIZE;
+ elist = realloc(elist, nbmem);
+ if (elist == NULL) {
perror("realloc list events");
goto error;
}
}
- memcpy(buf + total, line, size);
- total += size;
+ strncpy(elist[count].name, event, LTTNG_SYMBOL_NAME_LEN);
+ elist[count].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+ count++;
}
- *list = buf;
+ *events = elist;
- DBG("Kernel list events done");
+ DBG("Kernel list events done (%zu events)", count);
- return total;
+ return count;
error:
return -1;
projects / lttng-tools.git / blobdiff