X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcondition-internal.c;h=dd9c244b3253ac68694799348066bc048daa1274;hp=fb9a5c7540fe6bd63aef8525561b25d2b61bd2a2;hb=3a5f70173aa04d11ccb22694d5d31a702cad33ab;hpb=f66473ac08601dfdbed5a33a8d41957293372b45 diff --git a/src/bin/lttng-sessiond/condition-internal.c b/src/bin/lttng-sessiond/condition-internal.c index fb9a5c754..dd9c244b3 100644 --- a/src/bin/lttng-sessiond/condition-internal.c +++ b/src/bin/lttng-sessiond/condition-internal.c @@ -87,7 +87,7 @@ unsigned long lttng_condition_session_rotation_hash( struct lttng_condition_session_rotation, parent); condition_type = (unsigned long) condition->parent.type; hash = hash_key_ulong((void *) condition_type, lttng_ht_seed); - assert(condition->session_name); + LTTNG_ASSERT(condition->session_name); hash ^= hash_key_str(condition->session_name, lttng_ht_seed); return hash; } @@ -102,7 +102,7 @@ static unsigned long lttng_condition_event_rule_matches_hash( condition_type = (unsigned long) condition->type; condition_status = lttng_condition_event_rule_matches_get_rule( condition, &event_rule); - assert(condition_status == LTTNG_CONDITION_STATUS_OK); + LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK); hash = hash_key_ulong((void *) condition_type, lttng_ht_seed); return hash ^ lttng_event_rule_hash(event_rule); @@ -127,12 +127,10 @@ unsigned long lttng_condition_hash(const struct lttng_condition *condition) case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES: return lttng_condition_event_rule_matches_hash(condition); default: - //ERR("[notification-thread] Unexpected condition type caught"); abort(); } } -LTTNG_HIDDEN struct lttng_condition *lttng_condition_copy(const struct lttng_condition *condition) { int ret;