projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: list agent event per domain only
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 0cc71303aeb6704de4bc926f39d0e2acbf58bc39..628fb1061da0492089dff7f332df15b7a4bc6906 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-185,25
+185,25
@@
static void list_lttng_channels(int domain, struct ltt_session *session,
}
/*
}
/*
- * 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.
*/
*
* 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 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;
struct lttng_event *tmp_events;
struct lttng_ht_iter iter;
- assert(
dom
);
+ assert(
agt
);
assert(events);
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;
if (nb_event == 0) {
ret = nb_event;
goto error;
@@
-211,13
+211,13
@@
static int list_lttng_jul_events(struct jul_domain *dom,
tmp_events = zmalloc(nb_event * sizeof(*tmp_events));
if (!tmp_events) {
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();
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;
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;
@@
-1071,13
+1071,21
@@
int cmd_disable_event(struct ltt_session *session, int domain,
channel_name);
break;
}
channel_name);
break;
}
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
{
case LTTNG_DOMAIN_JUL:
{
+ struct agent *agt;
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
- ret = event_jul_disable(usess, event_name);
+ agt = trace_ust_find_agent(usess, domain);
+ 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;
}
if (ret != LTTNG_OK) {
goto error;
}
@@
-1176,13
+1184,21
@@
int cmd_disable_event_all(struct ltt_session *session, int domain,
break;
}
break;
}
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
{
case LTTNG_DOMAIN_JUL:
{
+ struct agent *agt;
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
struct ltt_ust_session *usess = session->ust_session;
assert(usess);
- ret = event_jul_disable_all(usess);
+ agt = trace_ust_find_agent(usess, domain);
+ if (!agt) {
+ ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND;
+ goto error;
+ }
+
+ ret = event_agent_disable_all(usess, agt);
if (ret != LTTNG_OK) {
goto error;
}
if (ret != LTTNG_OK) {
goto error;
}
@@
-1466,15
+1482,27
@@
int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
}
break;
}
}
break;
}
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
{
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);
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, domain->type);
+ if (!agt) {
+ agt = agent_create(domain->type);
+ 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;
memset(&uevent, 0, sizeof(uevent));
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
@@
-1503,9
+1531,9
@@
int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
/* The wild card * means that everything should be enabled. */
if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
/* 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 {
} else {
- ret = event_
jul_enable(usess
, event, filter);
+ ret = event_
agent_enable(usess, agt
, event, filter);
}
if (ret != LTTNG_OK) {
goto error;
}
if (ret != LTTNG_OK) {
goto error;
@@
-1687,15
+1715,27
@@
int cmd_enable_event_all(struct ltt_session *session,
break;
}
break;
}
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
{
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);
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, domain->type);
+ if (!agt) {
+ agt = agent_create(domain->type);
+ 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) {
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
if (is_root) {
@@
-1726,7
+1766,7
@@
int cmd_enable_event_all(struct ltt_session *session,
strncpy(event.name, "*", sizeof(event.name));
event.name[sizeof(event.name) - 1] = '\0';
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;
}
if (ret != LTTNG_OK) {
goto error;
}
@@
-1774,8
+1814,9
@@
ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events)
goto error;
}
break;
goto error;
}
break;
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
case LTTNG_DOMAIN_JUL:
- nb_events =
jul_list_events(events
);
+ nb_events =
agent_list_events(events, domain
);
if (nb_events < 0) {
ret = LTTNG_ERR_UST_LIST_FAIL;
goto error;
if (nb_events < 0) {
ret = LTTNG_ERR_UST_LIST_FAIL;
goto error;
@@
-2370,6
+2411,8
@@
ssize_t cmd_list_domains(struct ltt_session *session,
{
int ret, index = 0;
ssize_t nb_dom = 0;
{
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");
if (session->kernel_session != NULL) {
DBG3("Listing domains found kernel domain");
@@
-2380,8
+2423,11
@@
ssize_t cmd_list_domains(struct ltt_session *session,
DBG3("Listing domains found UST global domain");
nb_dom++;
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++;
+ }
}
}
}
}
@@
-2401,10
+2447,13
@@
ssize_t cmd_list_domains(struct ltt_session *session,
(*domains)[index].buf_type = session->ust_session->buffer_type;
index++;
(*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++;
+ }
}
}
}
}
@@
-2496,10
+2545,16
@@
ssize_t cmd_list_events(int domain, struct ltt_session *session,
}
break;
}
}
break;
}
+ case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_JUL:
if (session->ust_session) {
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:
}
break;
default:
This page took
0.026881 seconds
and
4
git commands to generate.