X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Flttng-abi.c;h=cd9466568221f3427ebad590f140b137251f32f0;hb=546cb5f29a6b43d6240f21a1a2d1a38b2919f966;hp=eac1afd11a83b50caa6495251d70b44dc838e1af;hpb=c190d76e8c7b44d62b3651ab845b765c1b1f8104;p=lttng-modules.git diff --git a/src/lttng-abi.c b/src/lttng-abi.c index eac1afd1..cd946656 100644 --- a/src/lttng-abi.c +++ b/src/lttng-abi.c @@ -550,7 +550,7 @@ int lttng_abi_create_channel(struct file *session_file, * We tolerate no failure path after channel creation. It will stay * invariant for the rest of the session. */ - chan = lttng_channel_create(session, transport_name, NULL, + chan = lttng_channel_buffer_create(session, transport_name, NULL, chan_param->subbuf_size, chan_param->num_subbuf, chan_param->switch_timer_interval, @@ -1887,19 +1887,21 @@ int lttng_abi_create_event(struct file *channel_file, lttng_fallthrough; case LTTNG_KERNEL_ABI_SYSCALL: { - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; if (strutils_is_star_glob_pattern(event_param->name)) { /* * If the event name is a star globbing pattern, * we create the special star globbing enabler. */ - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_STAR_GLOB, + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_STAR_GLOB, event_param, channel); } else { - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, event_param, channel); } + if (event_enabler) + lttng_event_enabler_session_add(channel->parent.session, event_enabler); priv = event_enabler; break; } @@ -1910,20 +1912,27 @@ int lttng_abi_create_event(struct file *channel_file, lttng_fallthrough; case LTTNG_KERNEL_ABI_UPROBE: { - struct lttng_kernel_event_recorder *event; + struct lttng_kernel_event_common *event; + struct lttng_event_recorder_enabler *event_enabler; + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, + event_param, channel); + if (!event_enabler) { + ret = -ENOMEM; + goto event_error; + } /* * We tolerate no failure path after event creation. It * will stay invariant for the rest of the session. */ - event = lttng_kernel_event_recorder_create(channel, event_param, - NULL, event_param->instrumentation); + event = lttng_kernel_event_create(&event_enabler->parent, NULL); WARN_ON_ONCE(!event); + lttng_event_enabler_destroy(&event_enabler->parent); if (IS_ERR(event)) { ret = PTR_ERR(event); goto event_error; } - priv = event; + priv = container_of(event, struct lttng_kernel_event_recorder, parent); break; } @@ -1978,12 +1987,11 @@ long lttng_event_notifier_enabler_ioctl(struct file *file, unsigned int cmd, uns switch (cmd) { case LTTNG_KERNEL_ABI_ENABLE: - return lttng_event_notifier_enabler_enable(event_notifier_enabler); + return lttng_event_enabler_enable(&event_notifier_enabler->parent); case LTTNG_KERNEL_ABI_DISABLE: - return lttng_event_notifier_enabler_disable(event_notifier_enabler); + return lttng_event_enabler_disable(&event_notifier_enabler->parent); case LTTNG_KERNEL_ABI_FILTER: - return lttng_event_notifier_enabler_attach_filter_bytecode( - event_notifier_enabler, + return lttng_event_enabler_attach_filter_bytecode(&event_notifier_enabler->parent, (struct lttng_kernel_abi_filter_bytecode __user *) arg); case LTTNG_KERNEL_ABI_CAPTURE: return lttng_event_notifier_enabler_attach_capture_bytecode( @@ -2124,15 +2132,17 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file, * we create the special star globbing enabler. */ enabler = lttng_event_notifier_enabler_create( - event_notifier_group, LTTNG_ENABLER_FORMAT_STAR_GLOB, - event_notifier_param); + event_notifier_param, + event_notifier_group); } else { enabler = lttng_event_notifier_enabler_create( - event_notifier_group, LTTNG_ENABLER_FORMAT_NAME, - event_notifier_param); + event_notifier_param, + event_notifier_group); } + if (enabler) + lttng_event_notifier_enabler_group_add(event_notifier_group, enabler); priv = enabler; break; } @@ -2143,24 +2153,23 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file, lttng_fallthrough; case LTTNG_KERNEL_ABI_UPROBE: { - struct lttng_kernel_event_notifier *event_notifier; + struct lttng_kernel_event_common *event; + struct lttng_event_notifier_enabler *event_notifier_enabler; - /* - * We tolerate no failure path after event notifier creation. - * It will stay invariant for the rest of the session. - */ - event_notifier = lttng_event_notifier_create(NULL, - event_notifier_param->event.token, - event_notifier_param->error_counter_index, - event_notifier_group, - event_notifier_param, - event_notifier_param->event.instrumentation); - WARN_ON_ONCE(!event_notifier); - if (IS_ERR(event_notifier)) { - ret = PTR_ERR(event_notifier); + event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME, + event_notifier_param, event_notifier_group); + if (!event_notifier_enabler) { + ret = -ENOMEM; + goto event_notifier_error; + } + event = lttng_kernel_event_create(&event_notifier_enabler->parent, NULL); + WARN_ON_ONCE(!event); + lttng_event_enabler_destroy(&event_notifier_enabler->parent); + if (IS_ERR(event)) { + ret = PTR_ERR(event); goto event_notifier_error; } - priv = event_notifier; + priv = container_of(event, struct lttng_kernel_event_notifier, parent); break; } @@ -2519,12 +2528,12 @@ old_ctx_end: } case LTTNG_KERNEL_ABI_OLD_ENABLE: case LTTNG_KERNEL_ABI_ENABLE: - return lttng_channel_enable(channel); + return lttng_channel_enable(&channel->parent); case LTTNG_KERNEL_ABI_OLD_DISABLE: case LTTNG_KERNEL_ABI_DISABLE: - return lttng_channel_disable(channel); + return lttng_channel_disable(&channel->parent); case LTTNG_KERNEL_ABI_SYSCALL_MASK: - return lttng_channel_syscall_mask(channel, + return lttng_syscall_table_get_active_mask(&channel->priv->parent.syscall_table, (struct lttng_kernel_abi_syscall_mask __user *) arg); default: return -ENOIOCTLCMD; @@ -2691,7 +2700,7 @@ long lttng_event_recorder_event_ioctl(struct file *file, unsigned int cmd, unsig static long lttng_event_recorder_enabler_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - struct lttng_event_enabler *event_enabler = file->private_data; + struct lttng_event_recorder_enabler *event_enabler = file->private_data; switch (cmd) { case LTTNG_KERNEL_ABI_OLD_CONTEXT: @@ -2706,13 +2715,12 @@ long lttng_event_recorder_enabler_ioctl(struct file *file, unsigned int cmd, uns } case LTTNG_KERNEL_ABI_OLD_ENABLE: case LTTNG_KERNEL_ABI_ENABLE: - return lttng_event_enabler_enable(event_enabler); + return lttng_event_enabler_enable(&event_enabler->parent); case LTTNG_KERNEL_ABI_OLD_DISABLE: case LTTNG_KERNEL_ABI_DISABLE: - return lttng_event_enabler_disable(event_enabler); + return lttng_event_enabler_disable(&event_enabler->parent); case LTTNG_KERNEL_ABI_FILTER: - return lttng_event_enabler_attach_filter_bytecode( - event_enabler, + return lttng_event_enabler_attach_filter_bytecode(&event_enabler->parent, (struct lttng_kernel_abi_filter_bytecode __user *) arg); case LTTNG_KERNEL_ABI_ADD_CALLSITE: return -EINVAL; @@ -2734,7 +2742,7 @@ int lttng_event_recorder_event_release(struct inode *inode, struct file *file) static int lttng_event_recorder_enabler_release(struct inode *inode, struct file *file) { - struct lttng_event_enabler *event_enabler = file->private_data; + struct lttng_event_recorder_enabler *event_enabler = file->private_data; if (event_enabler) fput(event_enabler->chan->priv->parent.file);