#include "channel.h"
#include "event.h"
#include "kernel.h"
+#include "lttng-sessiond.h"
#include "ust-ctl.h"
#include "ust-app.h"
#include "trace-kernel.h"
* Enable all UST tracepoints for a channel from a UST session.
*/
int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
- struct ltt_ust_channel *uchan, struct lttng_filter_bytecode *filter)
+ struct ltt_ust_channel *uchan,
+ char *filter_expression,
+ struct lttng_filter_bytecode *filter)
{
int ret, i, size;
struct lttng_ht_iter iter;
}
/* Create ust event */
- uevent = trace_ust_create_event(&events[i], filter, NULL);
+ uevent = trace_ust_create_event(&events[i], filter_expression,
+ filter, NULL);
if (uevent == NULL) {
ret = LTTNG_ERR_FATAL;
goto error_destroy;
*/
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct lttng_event *event,
+ char *filter_expression,
struct lttng_filter_bytecode *filter,
struct lttng_event_exclusion *exclusion)
{
uevent = trace_ust_find_event(uchan->events, event->name, filter,
event->loglevel, exclusion);
if (uevent == NULL) {
- uevent = trace_ust_create_event(event, filter, exclusion);
+ uevent = trace_ust_create_event(event, filter_expression,
+ filter, exclusion);
if (uevent == NULL) {
ret = LTTNG_ERR_UST_ENABLE_FAIL;
goto error;
*
* Return LTTNG_OK on success or else a LTTNG_ERR* code.
*/
-int event_jul_enable_all(struct ltt_ust_session *usess)
+int event_jul_enable_all(struct ltt_ust_session *usess,
+ struct lttng_event *event, struct lttng_filter_bytecode *filter)
{
int ret;
struct jul_event *jevent;
- struct lttng_event event;
struct lttng_ht_iter iter;
assert(usess);
DBG("Event JUL enabling ALL events for session %" PRIu64, usess->id);
- /* Create the * wildcard event name for the Java agent. */
- memset(event.name, 0, sizeof(event.name));
- strncpy(event.name, "*", sizeof(event.name));
- event.name[sizeof(event.name) - 1] = '\0';
-
/* Enable event on JUL application through TCP socket. */
- ret = event_jul_enable(usess, &event);
+ ret = event_jul_enable(usess, event, filter);
if (ret != LTTNG_OK) {
goto error;
}
*
* Return LTTNG_OK on success or else a LTTNG_ERR* code.
*/
-int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event)
+int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event,
+ struct lttng_filter_bytecode *filter)
{
int ret, created = 0;
struct jul_event *jevent;
assert(usess);
assert(event);
- DBG("Event JUL enabling %s for session %" PRIu64, event->name, usess->id);
+ DBG("Event JUL enabling %s for session %" PRIu64 " with loglevel type %d "
+ "and loglevel %d", event->name, usess->id, event->loglevel_type,
+ event->loglevel);
- jevent = jul_find_by_name(event->name, &usess->domain_jul);
+ jevent = jul_find_event(event->name, event->loglevel, &usess->domain_jul);
if (!jevent) {
- jevent = jul_create_event(event->name);
+ jevent = jul_create_event(event->name, filter);
if (!jevent) {
ret = LTTNG_ERR_NOMEM;
goto error;
}
+ jevent->loglevel = event->loglevel;
+ jevent->loglevel_type = event->loglevel_type;
created = 1;
}
{
int ret;
struct jul_event *jevent;
+ struct ltt_ust_event *uevent = NULL;
+ struct ltt_ust_channel *uchan = NULL;
+ char *ust_event_name;
assert(usess);
assert(event_name);
DBG("Event JUL disabling %s for session %" PRIu64, event_name, usess->id);
- jevent = jul_find_by_name(event_name, &usess->domain_jul);
+ jevent = jul_find_event_by_name(event_name, &usess->domain_jul);
if (!jevent) {
ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
goto error;
goto end;
}
+ /*
+ * 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);
+ 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;
+ }
+
+ /*
+ * The loglevel is hardcoded with 0 here since the JUL ust event is set
+ * with the loglevel type to ALL thus the loglevel stays 0. The event's
+ * filter is the one handling the loglevel for JUL.
+ */
+ uevent = trace_ust_find_event(uchan->events, ust_event_name,
+ jevent->filter, 0, NULL);
+ /* If the JUL event exists, it must be available on the UST side. */
+ assert(uevent);
+
+ ret = ust_app_disable_event_glb(usess, uchan, uevent);
+ if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) {
+ ret = LTTNG_ERR_UST_DISABLE_FAIL;
+ goto error;
+ }
+
ret = jul_disable_event(jevent);
if (ret != LTTNG_OK) {
goto error;