X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=bbf77329190b915affe0df11ed3cbd7001402291;hb=7e802d0a78ee4010dc540db15b7c747b28c2eacf;hp=5956d53ca9e6f0c4e3006ac456979a621bf5f7e6;hpb=959e3c66727698e58a8788aceeda5820b3c938ba;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 5956d53ca..bbf773291 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -37,6 +37,7 @@
 #include <inttypes.h>
 #include <fcntl.h>
 
+#include "condition-internal.h"
 #include "notification-thread.h"
 #include "notification-thread-events.h"
 #include "notification-thread-commands.h"
@@ -370,125 +371,6 @@ unsigned long hash_trigger_by_name_uid(const struct lttng_trigger *trigger)
 	return hash;
 }
 
-static
-unsigned long lttng_condition_buffer_usage_hash(
-	const struct lttng_condition *_condition)
-{
-	unsigned long hash;
-	unsigned long condition_type;
-	struct lttng_condition_buffer_usage *condition;
-
-	condition = container_of(_condition,
-			struct lttng_condition_buffer_usage, parent);
-
-	condition_type = (unsigned long) condition->parent.type;
-	hash = hash_key_ulong((void *) condition_type, lttng_ht_seed);
-	if (condition->session_name) {
-		hash ^= hash_key_str(condition->session_name, lttng_ht_seed);
-	}
-	if (condition->channel_name) {
-		hash ^= hash_key_str(condition->channel_name, lttng_ht_seed);
-	}
-	if (condition->domain.set) {
-		hash ^= hash_key_ulong(
-				(void *) condition->domain.type,
-				lttng_ht_seed);
-	}
-	if (condition->threshold_ratio.set) {
-		uint64_t val;
-
-		val = condition->threshold_ratio.value * (double) UINT32_MAX;
-		hash ^= hash_key_u64(&val, lttng_ht_seed);
-	} else if (condition->threshold_bytes.set) {
-		uint64_t val;
-
-		val = condition->threshold_bytes.value;
-		hash ^= hash_key_u64(&val, lttng_ht_seed);
-	}
-	return hash;
-}
-
-static
-unsigned long lttng_condition_session_consumed_size_hash(
-	const struct lttng_condition *_condition)
-{
-	unsigned long hash;
-	unsigned long condition_type =
-			(unsigned long) LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE;
-	struct lttng_condition_session_consumed_size *condition;
-	uint64_t val;
-
-	condition = container_of(_condition,
-			struct lttng_condition_session_consumed_size, parent);
-
-	hash = hash_key_ulong((void *) condition_type, lttng_ht_seed);
-	if (condition->session_name) {
-		hash ^= hash_key_str(condition->session_name, lttng_ht_seed);
-	}
-	val = condition->consumed_threshold_bytes.value;
-	hash ^= hash_key_u64(&val, lttng_ht_seed);
-	return hash;
-}
-
-static
-unsigned long lttng_condition_session_rotation_hash(
-	const struct lttng_condition *_condition)
-{
-	unsigned long hash, condition_type;
-	struct lttng_condition_session_rotation *condition;
-
-	condition = container_of(_condition,
-			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);
-	hash ^= hash_key_str(condition->session_name, lttng_ht_seed);
-	return hash;
-}
-
-static
-unsigned long lttng_condition_event_rule_hash(
-	const struct lttng_condition *condition)
-{
-	unsigned long hash, condition_type;
-	enum lttng_condition_status condition_status;
-	const struct lttng_event_rule *event_rule;
-
-	condition_type = (unsigned long) condition->type;
-
-	condition_status = lttng_condition_event_rule_get_rule(condition,
-							       &event_rule);
-	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);
-}
-
-/*
- * The lttng_condition hashing code is kept in this file (rather than
- * condition.c) since it makes use of GPLv2 code (hashtable utils), which we
- * don't want to link in liblttng-ctl.
- */
-static
-unsigned long lttng_condition_hash(const struct lttng_condition *condition)
-{
-	switch (condition->type) {
-	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW:
-	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH:
-		return lttng_condition_buffer_usage_hash(condition);
-	case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
-		return lttng_condition_session_consumed_size_hash(condition);
-	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
-	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
-		return lttng_condition_session_rotation_hash(condition);
-	case LTTNG_CONDITION_TYPE_EVENT_RULE_HIT:
-		return lttng_condition_event_rule_hash(condition);
-	default:
-		ERR("[notification-thread] Unexpected condition type caught");
-		abort();
-	}
-}
-
 static
 unsigned long hash_channel_key(struct channel_key *key)
 {
@@ -1043,6 +925,7 @@ int evaluate_condition_for_client(const struct lttng_trigger *trigger,
 				&evaluation, &object_uid, &object_gid);
 		break;
 	case LTTNG_OBJECT_TYPE_NONE:
+		DBG("[notification-thread] Newly subscribed-to condition not bound to object, nothing to evaluate");
 		ret = 0;
 		goto end;
 	case LTTNG_OBJECT_TYPE_UNKNOWN: