X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=6777fd6dd1f3b34f228981bd4b9aaf30a27dd07e;hb=d39ea393542d8c8c29ca063bd435c6a278be042d;hp=5e53b79a1661a458e5d4bada395350b152f6d725;hpb=f02254865666bb16c7c7b6dfd6a72cbcdcca45a9;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 5e53b79a1..6777fd6dd 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -88,7 +88,7 @@ struct notification_client {
 	uid_t uid;
 	gid_t gid;
 	/*
-	 * Indicates if the credentials and versions of the client has been
+	 * Indicates if the credentials and versions of the client have been
 	 * checked.
 	 */
 	bool validated;
@@ -295,7 +295,7 @@ unsigned long lttng_condition_buffer_usage_hash(
 
 		val = condition->threshold_ratio.value * (double) UINT32_MAX;
 		hash ^= hash_key_u64(&val, lttng_ht_seed);
-	} else if (condition->threshold_ratio.set) {
+	} else if (condition->threshold_bytes.set) {
 		uint64_t val;
 
 		val = condition->threshold_bytes.value;
@@ -469,7 +469,7 @@ int evaluate_condition_for_client(struct lttng_trigger *trigger,
 	ret = evaluate_condition(condition, &evaluation, state, NULL,
 			last_sample, channel_info->capacity);
 	if (ret) {
-		WARN("[notification-thread] Fatal error occured while evaluating a newly subscribed-to condition");
+		WARN("[notification-thread] Fatal error occurred while evaluating a newly subscribed-to condition");
 		goto end;
 	}
 
@@ -565,6 +565,7 @@ int notification_thread_client_subscribe(struct notification_client *client,
 			client, state)) {
 		WARN("[notification-thread] Evaluation of a condition on client subscription failed, aborting.");
 		ret = -1;
+		free(client_list_element);
 		goto end_unlock;
 	}
 
@@ -1275,7 +1276,7 @@ int handle_notification_thread_command(
 	struct notification_thread_command *cmd;
 
 	/* Read event_fd to put it back into a quiescent state. */
-	ret = read(handle->cmd_queue.event_fd, &counter, sizeof(counter));
+	ret = read(lttng_pipe_get_readfd(handle->cmd_queue.event_pipe), &counter, sizeof(counter));
 	if (ret == -1) {
 		goto error;
 	}