projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use common functions for module loading and unloading
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
event.c
diff --git
a/src/bin/lttng-sessiond/event.c
b/src/bin/lttng-sessiond/event.c
index 77818e587d4511f65eba47f38f71d5d292cc7f1e..da6a2913fc217352734fe821306ff8ae4879775a 100644
(file)
--- a/
src/bin/lttng-sessiond/event.c
+++ b/
src/bin/lttng-sessiond/event.c
@@
-48,6
+48,7
@@
static void add_unique_ust_event(struct lttng_ht *ht,
key.name = event->attr.name;
key.filter = (struct lttng_filter_bytecode *) event->filter;
key.loglevel = event->attr.loglevel;
key.name = event->attr.name;
key.filter = (struct lttng_filter_bytecode *) event->filter;
key.loglevel = event->attr.loglevel;
+ key.exclusion = event->exclusion;
node_ptr = cds_lfht_add_unique(ht->ht,
ht->hash_fct(event->node.key, lttng_ht_seed),
node_ptr = cds_lfht_add_unique(ht->ht,
ht->hash_fct(event->node.key, lttng_ht_seed),
@@
-244,7
+245,7
@@
end:
}
/*
}
/*
- * Enable all kernel
tracepoint
events of a channel of the kernel session.
+ * 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 event_kernel_enable_all_syscalls(struct ltt_kernel_channel *kchan,
int kernel_tracer_fd)
@@
-313,7
+314,9
@@
end:
* Enable all UST tracepoints for a channel from a UST session.
*/
int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
* 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;
{
int ret, i, size;
struct lttng_ht_iter iter;
@@
-350,7
+353,7
@@
int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
* previously.
*/
uevent = trace_ust_find_event(uchan->events, events[i].name, filter,
* previously.
*/
uevent = trace_ust_find_event(uchan->events, events[i].name, filter,
- events[i].loglevel);
+ events[i].loglevel
, NULL
);
if (uevent != NULL) {
ret = ust_app_enable_event_pid(usess, uchan, uevent,
events[i].pid);
if (uevent != NULL) {
ret = ust_app_enable_event_pid(usess, uchan, uevent,
events[i].pid);
@@
-364,7
+367,8
@@
int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
}
/* Create ust event */
}
/* Create ust event */
- uevent = trace_ust_create_event(&events[i], filter);
+ uevent = trace_ust_create_event(&events[i], filter_expression,
+ filter, NULL);
if (uevent == NULL) {
ret = LTTNG_ERR_FATAL;
goto error_destroy;
if (uevent == NULL) {
ret = LTTNG_ERR_FATAL;
goto error_destroy;
@@
-408,7
+412,9
@@
error:
*/
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct lttng_event *event,
*/
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct lttng_event *event,
- struct lttng_filter_bytecode *filter)
+ char *filter_expression,
+ struct lttng_filter_bytecode *filter,
+ struct lttng_event_exclusion *exclusion)
{
int ret = LTTNG_OK, to_create = 0;
struct ltt_ust_event *uevent;
{
int ret = LTTNG_OK, to_create = 0;
struct ltt_ust_event *uevent;
@@
-420,9
+426,10
@@
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
rcu_read_lock();
uevent = trace_ust_find_event(uchan->events, event->name, filter,
rcu_read_lock();
uevent = trace_ust_find_event(uchan->events, event->name, filter,
- event->loglevel);
+ event->loglevel
, exclusion
);
if (uevent == NULL) {
if (uevent == NULL) {
- uevent = trace_ust_create_event(event, filter);
+ uevent = trace_ust_create_event(event, filter_expression,
+ filter, exclusion);
if (uevent == NULL) {
ret = LTTNG_ERR_UST_ENABLE_FAIL;
goto error;
if (uevent == NULL) {
ret = LTTNG_ERR_UST_ENABLE_FAIL;
goto error;
@@
-613,24
+620,19
@@
error:
*
* Return LTTNG_OK on success or else a LTTNG_ERR* code.
*/
*
* 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)
{
int ret;
struct jul_event *jevent;
{
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);
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. */
/* Enable event on JUL application through TCP socket. */
- ret = event_jul_enable(usess,
&
event);
+ ret = event_jul_enable(usess, event);
if (ret != LTTNG_OK) {
goto error;
}
if (ret != LTTNG_OK) {
goto error;
}
@@
-662,15
+664,19
@@
int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event)
assert(usess);
assert(event);
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);
if (!jevent) {
ret = LTTNG_ERR_NOMEM;
goto error;
}
if (!jevent) {
jevent = jul_create_event(event->name);
if (!jevent) {
ret = LTTNG_ERR_NOMEM;
goto error;
}
+ jevent->loglevel = event->loglevel;
+ jevent->loglevel_type = event->loglevel_type;
created = 1;
}
created = 1;
}
@@
-714,7
+720,7
@@
int event_jul_disable(struct ltt_ust_session *usess, char *event_name)
DBG("Event JUL disabling %s for session %" PRIu64, event_name, usess->id);
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;
if (!jevent) {
ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
goto error;
This page took
0.026476 seconds
and
4
git commands to generate.