projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: use `loglevel_value` and `loglevel_type` names
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
trace-ust.c
diff --git
a/src/bin/lttng-sessiond/trace-ust.c
b/src/bin/lttng-sessiond/trace-ust.c
index 9ec6e43b0baa8bae6c8d4602cd94743148787977..906f916a91b51ceb1b075ff172ef14281583a577 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-ust.c
+++ b/
src/bin/lttng-sessiond/trace-ust.c
@@
-71,12
+71,14
@@
int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key)
{
struct ltt_ust_event *event;
const struct ltt_ust_ht_key *key;
{
struct ltt_ust_event *event;
const struct ltt_ust_ht_key *key;
+ int ev_loglevel_value;
assert(node);
assert(_key);
event = caa_container_of(node, struct ltt_ust_event, node.node);
key = _key;
assert(node);
assert(_key);
event = caa_container_of(node, struct ltt_ust_event, node.node);
key = _key;
+ ev_loglevel_value = event->attr.loglevel;
/* Match the 4 elements of the key: name, filter, loglevel, exclusions. */
/* Match the 4 elements of the key: name, filter, loglevel, exclusions. */
@@
-86,9
+88,9
@@
int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key)
}
/* Event loglevel. */
}
/* Event loglevel. */
- if (ev
ent->attr.loglevel != key->loglevel
) {
+ if (ev
_loglevel_value != key->loglevel_type
) {
if (event->attr.loglevel_type == LTTNG_UST_LOGLEVEL_ALL
if (event->attr.loglevel_type == LTTNG_UST_LOGLEVEL_ALL
- && key->loglevel
== 0 && event->attr.loglevel
== -1) {
+ && key->loglevel
_type == 0 && ev_loglevel_value
== -1) {
/*
* Match is accepted. This is because on event creation, the
* loglevel is set to -1 if the event loglevel type is ALL so 0 and
/*
* Match is accepted. This is because on event creation, the
* loglevel is set to -1 if the event loglevel type is ALL so 0 and
@@
-171,8
+173,8
@@
error:
* MUST be acquired before calling this.
*/
struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
* MUST be acquired before calling this.
*/
struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
- char *name, struct lttng_filter_bytecode *filter,
int loglevel,
- struct lttng_event_exclusion *exclusion)
+ char *name, struct lttng_filter_bytecode *filter,
+
int loglevel_value,
struct lttng_event_exclusion *exclusion)
{
struct lttng_ht_node_str *node;
struct lttng_ht_iter iter;
{
struct lttng_ht_node_str *node;
struct lttng_ht_iter iter;
@@
-183,7
+185,7
@@
struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
key.name = name;
key.filter = filter;
key.name = name;
key.filter = filter;
- key.loglevel
= loglevel
;
+ key.loglevel
_type = loglevel_value
;
key.exclusion = exclusion;
cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
key.exclusion = exclusion;
cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
This page took
0.02744 seconds
and
4
git commands to generate.