projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: HT must not be destroyed with a rcu_read_lock held
[lttng-tools.git]
/
src
/
lib
/
lttng-ctl
/
lttng-ctl.c
diff --git
a/src/lib/lttng-ctl/lttng-ctl.c
b/src/lib/lttng-ctl/lttng-ctl.c
index ff57a0d1a7a70237e396274b8a4847f1194beb3d..aae0e4fa5708ed4fd6c6416d5074c867da4bc62f 100644
(file)
--- a/
src/lib/lttng-ctl/lttng-ctl.c
+++ b/
src/lib/lttng-ctl/lttng-ctl.c
@@
-106,6
+106,7
@@
void lttng_ctl_copy_lttng_domain(struct lttng_domain *dst,
case LTTNG_DOMAIN_UST:
case LTTNG_DOMAIN_JUL:
case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_UST:
case LTTNG_DOMAIN_JUL:
case LTTNG_DOMAIN_LOG4J:
+ case LTTNG_DOMAIN_PYTHON:
memcpy(dst, src, sizeof(struct lttng_domain));
break;
default:
memcpy(dst, src, sizeof(struct lttng_domain));
break;
default:
@@
-690,25
+691,25
@@
int lttng_enable_event_with_filter(struct lttng_handle *handle,
}
/*
}
/*
- * Depending on the event, return a newly allocated
JUL
filter expression or
+ * Depending on the event, return a newly allocated
agent
filter expression or
* NULL if not applicable.
*
* An event with NO loglevel and the name is * will return NULL.
*/
* NULL if not applicable.
*
* An event with NO loglevel and the name is * will return NULL.
*/
-static char *set_
jul
_filter(const char *filter, struct lttng_event *ev)
+static char *set_
agent
_filter(const char *filter, struct lttng_event *ev)
{
int err;
{
int err;
- char *
jul
_filter = NULL;
+ char *
agent
_filter = NULL;
assert(ev);
/* Don't add filter for the '*' event. */
if (ev->name[0] != '*') {
if (filter) {
assert(ev);
/* Don't add filter for the '*' event. */
if (ev->name[0] != '*') {
if (filter) {
- err = asprintf(&
jul
_filter, "(%s) && (logger_name == \"%s\")", filter,
+ err = asprintf(&
agent
_filter, "(%s) && (logger_name == \"%s\")", filter,
ev->name);
} else {
ev->name);
} else {
- err = asprintf(&
jul
_filter, "logger_name == \"%s\"", ev->name);
+ err = asprintf(&
agent
_filter, "logger_name == \"%s\"", ev->name);
}
if (err < 0) {
PERROR("asprintf");
}
if (err < 0) {
PERROR("asprintf");
@@
-726,18
+727,18
@@
static char *set_jul_filter(const char *filter, struct lttng_event *ev)
op = "==";
}
op = "==";
}
- if (filter ||
jul
_filter) {
+ if (filter ||
agent
_filter) {
char *new_filter;
err = asprintf(&new_filter, "(%s) && (int_loglevel %s %d)",
char *new_filter;
err = asprintf(&new_filter, "(%s) && (int_loglevel %s %d)",
-
jul_filter ? jul
_filter : filter, op,
+
agent_filter ? agent
_filter : filter, op,
ev->loglevel);
ev->loglevel);
- if (
jul
_filter) {
- free(
jul
_filter);
+ if (
agent
_filter) {
+ free(
agent
_filter);
}
}
-
jul
_filter = new_filter;
+
agent
_filter = new_filter;
} else {
} else {
- err = asprintf(&
jul
_filter, "int_loglevel %s %d", op,
+ err = asprintf(&
agent
_filter, "int_loglevel %s %d", op,
ev->loglevel);
}
if (err < 0) {
ev->loglevel);
}
if (err < 0) {
@@
-746,9
+747,9
@@
static char *set_jul_filter(const char *filter, struct lttng_event *ev)
}
}
}
}
- return
jul
_filter;
+ return
agent
_filter;
error:
error:
- free(
jul
_filter);
+ free(
agent
_filter);
return NULL;
}
return NULL;
}
@@
-941,7
+942,8
@@
int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
*/
if (exclusion_count == 0 && filter_expression == NULL &&
(handle->domain.type != LTTNG_DOMAIN_JUL &&
*/
if (exclusion_count == 0 && filter_expression == NULL &&
(handle->domain.type != LTTNG_DOMAIN_JUL &&
- handle->domain.type != LTTNG_DOMAIN_LOG4J)) {
+ handle->domain.type != LTTNG_DOMAIN_LOG4J &&
+ handle->domain.type != LTTNG_DOMAIN_PYTHON)) {
goto ask_sessiond;
}
goto ask_sessiond;
}
@@
-952,24
+954,26
@@
int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
/* Parse filter expression */
if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL
/* Parse filter expression */
if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL
- || handle->domain.type == LTTNG_DOMAIN_LOG4J) {
+ || handle->domain.type == LTTNG_DOMAIN_LOG4J
+ || handle->domain.type == LTTNG_DOMAIN_PYTHON) {
if (handle->domain.type == LTTNG_DOMAIN_JUL ||
if (handle->domain.type == LTTNG_DOMAIN_JUL ||
- handle->domain.type == LTTNG_DOMAIN_LOG4J) {
- char *jul_filter;
+ handle->domain.type == LTTNG_DOMAIN_LOG4J ||
+ handle->domain.type == LTTNG_DOMAIN_PYTHON) {
+ char *agent_filter;
/* Setup JUL filter if needed. */
/* Setup JUL filter if needed. */
-
jul_filter = set_jul
_filter(filter_expression, ev);
- if (!
jul
_filter) {
+
agent_filter = set_agent
_filter(filter_expression, ev);
+ if (!
agent
_filter) {
if (!filter_expression) {
/* No JUL and no filter, just skip everything below. */
goto ask_sessiond;
}
} else {
/*
if (!filter_expression) {
/* No JUL and no filter, just skip everything below. */
goto ask_sessiond;
}
} else {
/*
- * With a
JUL filter, the original filter has been added to it
- * thus replace the filter expression.
+ * With a
n agent filter, the original filter has been added to
+ *
it
thus replace the filter expression.
*/
*/
- filter_expression =
jul
_filter;
+ filter_expression =
agent
_filter;
free_filter_expression = 1;
}
}
free_filter_expression = 1;
}
}
@@
-1102,7
+1106,8
@@
int lttng_disable_event_ext(struct lttng_handle *handle,
*/
if (filter_expression == NULL &&
(handle->domain.type != LTTNG_DOMAIN_JUL &&
*/
if (filter_expression == NULL &&
(handle->domain.type != LTTNG_DOMAIN_JUL &&
- handle->domain.type != LTTNG_DOMAIN_LOG4J)) {
+ handle->domain.type != LTTNG_DOMAIN_LOG4J &&
+ handle->domain.type != LTTNG_DOMAIN_PYTHON)) {
goto ask_sessiond;
}
goto ask_sessiond;
}
@@
-1113,14
+1118,16
@@
int lttng_disable_event_ext(struct lttng_handle *handle,
/* Parse filter expression */
if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL
/* Parse filter expression */
if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL
- || handle->domain.type == LTTNG_DOMAIN_LOG4J) {
+ || handle->domain.type == LTTNG_DOMAIN_LOG4J
+ || handle->domain.type == LTTNG_DOMAIN_PYTHON) {
if (handle->domain.type == LTTNG_DOMAIN_JUL ||
if (handle->domain.type == LTTNG_DOMAIN_JUL ||
- handle->domain.type == LTTNG_DOMAIN_LOG4J) {
- char *jul_filter;
+ handle->domain.type == LTTNG_DOMAIN_LOG4J ||
+ handle->domain.type == LTTNG_DOMAIN_PYTHON) {
+ char *agent_filter;
/* Setup JUL filter if needed. */
/* Setup JUL filter if needed. */
-
jul_filter = set_jul
_filter(filter_expression, ev);
- if (!
jul
_filter) {
+
agent_filter = set_agent
_filter(filter_expression, ev);
+ if (!
agent
_filter) {
if (!filter_expression) {
/* No JUL and no filter, just skip everything below. */
goto ask_sessiond;
if (!filter_expression) {
/* No JUL and no filter, just skip everything below. */
goto ask_sessiond;
@@
-1130,7
+1137,7
@@
int lttng_disable_event_ext(struct lttng_handle *handle,
* With a JUL filter, the original filter has been added to it
* thus replace the filter expression.
*/
* With a JUL filter, the original filter has been added to it
* thus replace the filter expression.
*/
- filter_expression =
jul
_filter;
+ filter_expression =
agent
_filter;
free_filter_expression = 1;
}
}
free_filter_expression = 1;
}
}
This page took
0.041213 seconds
and
5
git commands to generate.