*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <errno.h>
#include <urcu/list.h>
#include <string.h>
assert(node_ptr == &event->node.node);
}
-/*
- * Setup a lttng_event used to enable *all* syscall tracing.
- */
-static void init_syscalls_kernel_event(struct lttng_event *event)
-{
- assert(event);
-
- event->name[0] = '\0';
- /*
- * We use LTTNG_EVENT* here since the trace kernel creation will make the
- * right changes for the kernel.
- */
- event->type = LTTNG_EVENT_SYSCALL;
-}
-
/*
* Disable kernel tracepoint event for a channel from the kernel session.
*/
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.
*/
return ret;
}
-/*
- * Disable kernel syscall events for a channel from the kernel session.
- */
-int event_kernel_disable_all_syscalls(struct ltt_kernel_channel *kchan)
-{
- ERR("Cannot disable syscall tracing for existing session. Please destroy session instead.");
- return LTTNG_OK; /* Return OK so disable all succeeds */
-}
-
/*
* Disable all kernel event for a channel from the kernel session.
*/
ret = event_kernel_disable_all_tracepoints(kchan);
if (ret != LTTNG_OK)
return ret;
- ret = event_kernel_disable_all_syscalls(kchan);
+ ret = event_kernel_disable_syscall(kchan, "");
return ret;
}
return ret;
}
-/*
- * Enable all kernel sycalls events of a channel of the kernel session.
- */
-int event_kernel_enable_all_syscalls(struct ltt_kernel_channel *kchan,
- int kernel_tracer_fd)
-{
- int ret;
- struct lttng_event event;
-
- assert(kchan);
-
- init_syscalls_kernel_event(&event);
-
- DBG("Enabling all syscall tracing");
-
- ret = kernel_create_event(&event, kchan);
- if (ret < 0) {
- if (ret == -EEXIST) {
- ret = LTTNG_ERR_KERN_EVENT_EXIST;
- } else {
- ret = LTTNG_ERR_KERN_ENABLE_FAIL;
- }
- goto end;
- }
-
- ret = LTTNG_OK;
-end:
- return ret;
-}
-
/*
* Enable all kernel events of a channel of the kernel session.
*/
* 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_all_syscalls(kchan, kernel_tracer_fd);
+ (void) event_kernel_enable_syscall(kchan, "");
end:
return tp_ret;
return ret;
}
+/*
+ * Return the agent default event name to use by testing if the process is root
+ * or not. Return NULL on error.
+ */
+const char *event_get_default_agent_ust_name(enum lttng_domain_type domain)
+{
+ const char *default_event_name = NULL;
+
+ switch (domain) {
+ case LTTNG_DOMAIN_LOG4J:
+ if (is_root) {
+ default_event_name = DEFAULT_SYS_LOG4J_EVENT_NAME;
+ } else {
+ default_event_name = DEFAULT_USER_LOG4J_EVENT_NAME;
+ }
+ break;
+ case LTTNG_DOMAIN_JUL:
+ if (is_root) {
+ default_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
+ } else {
+ default_event_name = DEFAULT_USER_JUL_EVENT_NAME;
+ }
+ break;
+ case LTTNG_DOMAIN_PYTHON:
+ default_event_name = DEFAULT_USER_PYTHON_EVENT_NAME;
+ break;
+ default:
+ assert(0);
+ }
+
+ return default_event_name;
+}
+
/*
* Disable a single agent event for a given UST session.
*
struct agent_event *aevent;
struct ltt_ust_event *uevent = NULL;
struct ltt_ust_channel *uchan = NULL;
- char *ust_event_name;
+ const char *ust_event_name, *ust_channel_name;
assert(agt);
assert(usess);
goto end;
}
+ if (agt->domain == LTTNG_DOMAIN_JUL) {
+ ust_channel_name = DEFAULT_JUL_CHANNEL_NAME;
+ } else if (agt->domain == LTTNG_DOMAIN_LOG4J) {
+ ust_channel_name = DEFAULT_LOG4J_CHANNEL_NAME;
+ } else if (agt->domain == LTTNG_DOMAIN_PYTHON) {
+ ust_channel_name = DEFAULT_PYTHON_CHANNEL_NAME;
+ } else {
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+
/*
* Disable it on the UST side. First get the channel reference then find
* the event and finally disable it.
*/
uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
- DEFAULT_JUL_CHANNEL_NAME);
+ (char *) ust_channel_name);
if (!uchan) {
ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
goto error;
}
- if (is_root) {
- ust_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
- } else {
- ust_event_name = DEFAULT_USER_JUL_EVENT_NAME;
+ ust_event_name = event_get_default_agent_ust_name(agt->domain);
+ if (!ust_event_name) {
+ ret = LTTNG_ERR_FATAL;
+ goto error;
}
/*
* with the loglevel type to ALL thus the loglevel stays 0. The event's
* filter is the one handling the loglevel for agent.
*/
- uevent = trace_ust_find_event(uchan->events, ust_event_name,
+ uevent = trace_ust_find_event(uchan->events, (char *) ust_event_name,
aevent->filter, 0, NULL);
/* If the agent event exists, it must be available on the UST side. */
assert(uevent);
projects / lttng-tools.git / blobdiff