* We own filter_expression and filter.
*/
int kernel_create_event(struct lttng_event *ev,
- struct ltt_kernel_channel *channel)
+ struct ltt_kernel_channel *channel,
+ char *filter_expression,
+ struct lttng_filter_bytecode *filter)
{
int ret;
struct ltt_kernel_event *event;
assert(ev);
assert(channel);
- event = trace_kernel_create_event(ev);
+ /* We pass ownership of filter_expression and filter */
+ event = trace_kernel_create_event(ev, filter_expression,
+ filter);
if (event == NULL) {
ret = -1;
goto error;
goto free_event;
}
- /*
- * LTTNG_KERNEL_SYSCALL event creation will return 0 on success.
- */
- if (ret == 0 && event->event->instrumentation == LTTNG_KERNEL_SYSCALL) {
- DBG2("Kernel event syscall creation success");
- /*
- * We use fd == -1 to ensure that we never trigger a close of fd
- * 0.
- */
- event->fd = -1;
- goto add_list;
- }
-
+ event->type = ev->type;
event->fd = ret;
/* Prevent fd duplication after execlp() */
ret = fcntl(event->fd, F_SETFD, FD_CLOEXEC);
PERROR("fcntl session fd");
}
-add_list:
+ if (filter) {
+ ret = kernctl_filter(event->fd, filter);
+ if (ret) {
+ goto filter_error;
+ }
+ }
+
+ ret = kernctl_enable(event->fd);
+ if (ret < 0) {
+ switch (errno) {
+ case EEXIST:
+ ret = LTTNG_ERR_KERN_EVENT_EXIST;
+ break;
+ default:
+ PERROR("enable kernel event");
+ break;
+ }
+ goto enable_error;
+ }
+
/* Add event to event list */
cds_list_add(&event->list, &channel->events_list.head);
channel->event_count++;
return 0;
+enable_error:
+filter_error:
+ {
+ int closeret;
+
+ closeret = close(event->fd);
+ if (closeret) {
+ PERROR("close event fd");
+ }
+ }
free_event:
free(event);
error:
return ret;
}
-int kernel_enable_syscall(const char *syscall_name,
- struct ltt_kernel_channel *channel)
-{
- return kernctl_enable_syscall(channel->fd, syscall_name);
-}
-
-int kernel_disable_syscall(const char *syscall_name,
- struct ltt_kernel_channel *channel)
-{
- return kernctl_disable_syscall(channel->fd, syscall_name);
-}
int kernel_track_pid(struct ltt_kernel_session *session, int pid)
{
+ int ret;
+
DBG("Kernel track PID %d for session id %" PRIu64 ".",
pid, session->id);
- return kernctl_track_pid(session->fd, pid);
+ ret = kernctl_track_pid(session->fd, pid);
+ if (!ret) {
+ return LTTNG_OK;
+ }
+ switch (errno) {
+ case EINVAL:
+ return LTTNG_ERR_INVALID;
+ case ENOMEM:
+ return LTTNG_ERR_NOMEM;
+ case EEXIST:
+ return LTTNG_ERR_PID_TRACKED;
+ default:
+ return LTTNG_ERR_UNK;
+ }
}
int kernel_untrack_pid(struct ltt_kernel_session *session, int pid)
{
+ int ret;
+
DBG("Kernel untrack PID %d for session id %" PRIu64 ".",
pid, session->id);
- return kernctl_untrack_pid(session->fd, pid);
+ ret = kernctl_untrack_pid(session->fd, pid);
+ if (!ret) {
+ return LTTNG_OK;
+ }
+ switch (errno) {
+ case EINVAL:
+ return LTTNG_ERR_INVALID;
+ case ENOMEM:
+ return LTTNG_ERR_NOMEM;
+ case ENOENT:
+ return LTTNG_ERR_PID_NOT_TRACKED;
+ default:
+ return LTTNG_ERR_UNK;
+ }
}
ssize_t kernel_list_tracker_pids(struct ltt_kernel_session *session,