/*
* Disable kernel tracepoint event for a channel from the kernel session.
*/
-int event_kernel_disable_tracepoint(struct ltt_kernel_channel *kchan,
+int event_kernel_disable_event(struct ltt_kernel_channel *kchan,
char *event_name)
{
int ret;
assert(kchan);
- kevent = trace_kernel_get_event_by_name(event_name, kchan);
+ kevent = trace_kernel_get_event_by_name(event_name, kchan,
+ LTTNG_EVENT_ALL);
if (kevent == NULL) {
ret = LTTNG_ERR_NO_EVENT;
goto error;
return ret;
}
-/*
- * Enable kernel system call for a channel from the kernel session.
- */
-int event_kernel_enable_syscall(struct ltt_kernel_channel *kchan,
- char *syscall_name)
-{
- int ret;
-
- assert(kchan);
-
- ret = kernel_enable_syscall(syscall_name, kchan);
- if (ret < 0) {
- ret = LTTNG_ERR_KERN_ENABLE_FAIL;
- goto error;
- }
-
- DBG("Kernel event %s enable for channel %s.",
- syscall_name, kchan->channel->name);
-
- ret = LTTNG_OK;
-
-error:
- return ret;
-}
-
-/*
- * Disable kernel system call for a channel from the kernel session.
- */
-int event_kernel_disable_syscall(struct ltt_kernel_channel *kchan,
- char *syscall_name)
-{
- int ret;
-
- assert(kchan);
-
- ret = kernel_disable_syscall(syscall_name, kchan);
- if (ret < 0) {
- ret = LTTNG_ERR_KERN_DISABLE_FAIL;
- goto error;
- }
-
- DBG("Kernel syscall %s disable for channel %s.",
- syscall_name[0] == '\0' ? "<all>" : syscall_name,
- kchan->channel->name);
-
- ret = LTTNG_OK;
-
-error:
- return ret;
-}
-
/*
* Disable kernel tracepoint events for a channel from the kernel session.
*/
-int event_kernel_disable_all_tracepoints(struct ltt_kernel_channel *kchan)
+int event_kernel_disable_event_type(struct ltt_kernel_channel *kchan,
+ enum lttng_event_type type)
{
int ret;
struct ltt_kernel_event *kevent;
/* For each event in the kernel session */
cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {
+ if (type != LTTNG_EVENT_ALL && kevent->type != type)
+ continue;
ret = kernel_disable_event(kevent);
if (ret < 0) {
/* We continue disabling the rest */
/*
* Disable all kernel event for a channel from the kernel session.
*/
-int event_kernel_disable_all(struct ltt_kernel_channel *kchan)
+int event_kernel_disable_event_all(struct ltt_kernel_channel *kchan)
{
- int ret;
-
- assert(kchan);
-
- ret = event_kernel_disable_all_tracepoints(kchan);
- if (ret != LTTNG_OK)
- return ret;
- ret = event_kernel_disable_syscall(kchan, "");
- return ret;
+ return event_kernel_disable_event_type(kchan, LTTNG_EVENT_ALL);
}
/*
* Enable kernel tracepoint event for a channel from the kernel session.
* We own filter_expression and filter.
*/
-int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan,
- struct lttng_event *event)
+int event_kernel_enable_event(struct ltt_kernel_channel *kchan,
+ struct lttng_event *event, char *filter_expression,
+ struct lttng_filter_bytecode *filter)
{
int ret;
struct ltt_kernel_event *kevent;
assert(kchan);
assert(event);
- kevent = trace_kernel_get_event_by_name(event->name, kchan);
+ kevent = trace_kernel_find_event(event->name, kchan,
+ event->type, filter);
if (kevent == NULL) {
- ret = kernel_create_event(event, kchan);
+ ret = kernel_create_event(event, kchan,
+ filter_expression, filter);
+ /* We have passed ownership */
+ filter_expression = NULL;
+ filter = NULL;
if (ret < 0) {
switch (-ret) {
case EEXIST:
ret = LTTNG_OK;
end:
+ free(filter_expression);
+ free(filter);
return ret;
}
-/*
- * Enable all kernel tracepoint events of a channel of the kernel session.
- */
-int event_kernel_enable_all_tracepoints(struct ltt_kernel_channel *kchan,
- int kernel_tracer_fd)
-{
- int size, i, ret;
- struct ltt_kernel_event *kevent;
- struct lttng_event *event_list = NULL;
-
- assert(kchan);
-
- /* For each event in the kernel session */
- cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {
- if (kevent->enabled == 0) {
- ret = kernel_enable_event(kevent);
- if (ret < 0) {
- /* Enable failed but still continue */
- continue;
- }
- }
- }
-
- size = kernel_list_events(kernel_tracer_fd, &event_list);
- if (size < 0) {
- ret = LTTNG_ERR_KERN_LIST_FAIL;
- goto end;
- }
-
- for (i = 0; i < size; i++) {
- kevent = trace_kernel_get_event_by_name(event_list[i].name, kchan);
- if (kevent == NULL) {
- /* Default event type for enable all */
- event_list[i].type = LTTNG_EVENT_TRACEPOINT;
- /* Enable each single tracepoint event */
- ret = kernel_create_event(&event_list[i], kchan);
- if (ret < 0) {
- /* Ignore error here and continue */
- }
- }
- }
- free(event_list);
-
- ret = LTTNG_OK;
-end:
- return ret;
-}
-
-/*
- * Enable all kernel events of a channel of the kernel session.
- */
-int event_kernel_enable_all(struct ltt_kernel_channel *kchan,
- int kernel_tracer_fd)
-{
- int tp_ret;
-
- assert(kchan);
-
- tp_ret = event_kernel_enable_all_tracepoints(kchan, kernel_tracer_fd);
- if (tp_ret != LTTNG_OK) {
- goto end;
- }
-
- /*
- * Reaching this code path means that all tracepoints were enabled without
- * errors so we ignore the error value of syscalls.
- *
- * At the moment, failing to enable syscalls on "lttng enable-event -a -k"
- * is not considered an error that need to be returned to the client since
- * tracepoints did not fail. Future work will allow us to send back
- * multiple errors to the client in one API call.
- */
- (void) event_kernel_enable_syscall(kchan, "");
-
-end:
- return tp_ret;
-}
-
/*
* ============================
* UST : The Ultimate Frontier!
/* Create ust event */
uevent = trace_ust_create_event(&events[i], filter_expression,
- filter, NULL);
+ filter, NULL, false);
if (uevent == NULL) {
ret = LTTNG_ERR_FATAL;
goto error_destroy;
struct ltt_ust_channel *uchan, struct lttng_event *event,
char *filter_expression,
struct lttng_filter_bytecode *filter,
- struct lttng_event_exclusion *exclusion)
+ struct lttng_event_exclusion *exclusion,
+ bool internal_event)
{
int ret = LTTNG_OK, to_create = 0;
struct ltt_ust_event *uevent;
event->loglevel, exclusion);
if (uevent == NULL) {
uevent = trace_ust_create_event(event, filter_expression,
- filter, exclusion);
+ filter, exclusion, internal_event);
/* We have passed ownership */
filter_expression = NULL;
filter = NULL;
*/
int event_agent_enable_all(struct ltt_ust_session *usess,
struct agent *agt, struct lttng_event *event,
- struct lttng_filter_bytecode *filter)
+ struct lttng_filter_bytecode *filter ,char *filter_expression)
{
int ret;
struct agent_event *aevent;
DBG("Event agent enabling ALL events for session %" PRIu64, usess->id);
/* Enable event on agent application through TCP socket. */
- ret = event_agent_enable(usess, agt, event, filter);
+ ret = event_agent_enable(usess, agt, event, filter, filter_expression);
if (ret != LTTNG_OK) {
goto error;
}
*/
int event_agent_enable(struct ltt_ust_session *usess,
struct agent *agt, struct lttng_event *event,
- struct lttng_filter_bytecode *filter)
+ struct lttng_filter_bytecode *filter,
+ char *filter_expression)
{
int ret, created = 0;
struct agent_event *aevent;
assert(agt);
DBG("Event agent enabling %s for session %" PRIu64 " with loglevel type %d "
- "and loglevel %d", event->name, usess->id, event->loglevel_type,
- event->loglevel);
+ ", loglevel %d and filter \"%s\"", event->name,
+ usess->id, event->loglevel_type, event->loglevel,
+ filter_expression ? filter_expression : "NULL");
aevent = agent_find_event(event->name, event->loglevel, agt);
if (!aevent) {
- aevent = agent_create_event(event->name, filter);
+ aevent = agent_create_event(event->name, event->loglevel,
+ event->loglevel_type, filter,
+ filter_expression);
if (!aevent) {
ret = LTTNG_ERR_NOMEM;
goto error;
}
- aevent->loglevel = event->loglevel;
- aevent->loglevel_type = event->loglevel_type;
created = 1;
}
}
break;
case LTTNG_DOMAIN_PYTHON:
- default_event_name = DEFAULT_USER_PYTHON_EVENT_NAME;
+ default_event_name = DEFAULT_PYTHON_EVENT_NAME;
break;
default:
assert(0);
projects / lttng-tools.git / blobdiff