* 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;
"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);
if (!jevent) {
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;