}
/*
- * Create a list of JUL domain events.
+ * Create a list of agent domain events.
*
* Return number of events in list on success or else a negative value.
*/
-static int list_lttng_jul_events(struct jul_domain *dom,
+static int list_lttng_agent_events(struct agent *agt,
struct lttng_event **events)
{
int i = 0, ret = 0;
unsigned int nb_event = 0;
- struct jul_event *event;
+ struct agent_event *event;
struct lttng_event *tmp_events;
struct lttng_ht_iter iter;
- assert(dom);
+ assert(agt);
assert(events);
- DBG3("Listing JUL events");
+ DBG3("Listing agent events");
- nb_event = lttng_ht_get_count(dom->events);
+ nb_event = lttng_ht_get_count(agt->events);
if (nb_event == 0) {
ret = nb_event;
goto error;
tmp_events = zmalloc(nb_event * sizeof(*tmp_events));
if (!tmp_events) {
- PERROR("zmalloc JUL events session");
+ PERROR("zmalloc agent events session");
ret = -LTTNG_ERR_FATAL;
goto error;
}
rcu_read_lock();
- cds_lfht_for_each_entry(dom->events->ht, &iter.iter, event, node.node) {
+ cds_lfht_for_each_entry(agt->events->ht, &iter.iter, event, node.node) {
strncpy(tmp_events[i].name, event->name, sizeof(tmp_events[i].name));
tmp_events[i].name[sizeof(tmp_events[i].name) - 1] = '\0';
tmp_events[i].enabled = event->enabled;
}
case LTTNG_DOMAIN_JUL:
{
+ struct agent *agt;
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
- ret = event_jul_disable(usess, event_name);
+ agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL);
+ if (!agt) {
+ ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND;
+ goto error;
+ }
+
+ ret = event_agent_disable(usess, agt, event_name);
if (ret != LTTNG_OK) {
goto error;
}
}
case LTTNG_DOMAIN_JUL:
{
+ struct agent *agt;
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
- ret = event_jul_disable_all(usess);
+ agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL);
+ if (!agt) {
+ ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND;
+ goto error;
+ }
+
+ ret = event_agent_disable_all(usess, agt);
if (ret != LTTNG_OK) {
goto error;
}
return ret;
}
+static int validate_event_name(const char *name)
+{
+ int ret = 0;
+ const char *c = name;
+ const char *event_name_end = c + LTTNG_SYMBOL_NAME_LEN;
+
+ /*
+ * Make sure that unescaped wildcards are only used as the last
+ * character of the event name.
+ */
+ while (c < event_name_end) {
+ switch (*c) {
+ case '\0':
+ goto end;
+ case '\\':
+ c++;
+ break;
+ case '*':
+ if ((c + 1) < event_name_end && *(c + 1)) {
+ /* Wildcard is not the last character */
+ ret = LTTNG_ERR_INVALID_EVENT_NAME;
+ goto end;
+ }
+ default:
+ break;
+ }
+ c++;
+ }
+end:
+ return ret;
+}
+
/*
* Command LTTNG_ENABLE_EVENT processed by the client thread.
*/
assert(event);
assert(channel_name);
+ ret = validate_event_name(event->name);
+ if (ret) {
+ goto error;
+ }
+
rcu_read_lock();
switch (domain->type) {
}
case LTTNG_DOMAIN_JUL:
{
+ struct agent *agt;
struct lttng_event uevent;
struct lttng_domain tmp_dom;
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
- /* Create the default JUL tracepoint. */
+ agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL);
+ if (!agt) {
+ agt = agent_create(LTTNG_DOMAIN_JUL);
+ if (!agt) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+ agent_add(agt, usess->agents);
+ }
+
+ /* Create the default tracepoint. */
memset(&uevent, 0, sizeof(uevent));
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
/* The wild card * means that everything should be enabled. */
if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
- ret = event_jul_enable_all(usess, event, filter);
+ ret = event_agent_enable_all(usess, agt, event, filter);
} else {
- ret = event_jul_enable(usess, event, filter);
+ ret = event_agent_enable(usess, agt, event, filter);
}
if (ret != LTTNG_OK) {
goto error;
}
case LTTNG_DOMAIN_JUL:
{
+ struct agent *agt;
struct lttng_event uevent, event;
struct lttng_domain tmp_dom;
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
- /* Create the default JUL tracepoint. */
+ agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL);
+ if (!agt) {
+ agt = agent_create(LTTNG_DOMAIN_JUL);
+ if (!agt) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+ agent_add(agt, usess->agents);
+ }
+
+ /* Create the default tracepoint. */
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
if (is_root) {
strncpy(event.name, "*", sizeof(event.name));
event.name[sizeof(event.name) - 1] = '\0';
- ret = event_jul_enable_all(usess, &event, filter);
+ ret = event_agent_enable_all(usess, agt, &event, filter);
if (ret != LTTNG_OK) {
goto error;
}
}
break;
case LTTNG_DOMAIN_JUL:
- nb_events = jul_list_events(events);
+ nb_events = agent_list_events(events);
if (nb_events < 0) {
ret = LTTNG_ERR_UST_LIST_FAIL;
goto error;
{
int ret, index = 0;
ssize_t nb_dom = 0;
+ struct agent *agt;
+ struct lttng_ht_iter iter;
if (session->kernel_session != NULL) {
DBG3("Listing domains found kernel domain");
DBG3("Listing domains found UST global domain");
nb_dom++;
- if (session->ust_session->domain_jul.being_used) {
- nb_dom++;
+ cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
+ agt, node.node) {
+ if (agt->being_used) {
+ nb_dom++;
+ }
}
}
(*domains)[index].buf_type = session->ust_session->buffer_type;
index++;
- if (session->ust_session->domain_jul.being_used) {
- (*domains)[index].type = LTTNG_DOMAIN_JUL;
- (*domains)[index].buf_type = session->ust_session->buffer_type;
- index++;
+ cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
+ agt, node.node) {
+ if (agt->being_used) {
+ (*domains)[index].type = agt->domain;
+ (*domains)[index].buf_type = session->ust_session->buffer_type;
+ index++;
+ }
}
}
}
case LTTNG_DOMAIN_JUL:
if (session->ust_session) {
- nb_event = list_lttng_jul_events(
- &session->ust_session->domain_jul, events);
+ struct lttng_ht_iter iter;
+ struct agent *agt;
+
+ cds_lfht_for_each_entry(session->ust_session->agents->ht,
+ &iter.iter, agt, node.node) {
+ nb_event = list_lttng_agent_events(agt, events);
+ }
}
break;
default:
projects / lttng-tools.git / blobdiff