X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=1793cac6b7e98804328ecc7f8d9fb29af5538beb;hb=066a3c820b39f849207a5f7f24f4071c47f5bb5e;hp=5e53b79a1661a458e5d4bada395350b152f6d725;hpb=e4db5ace44cc9a1d2ecc6898cb1764675af381c8;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..1793cac6b 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; @@ -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; } @@ -1275,7 +1275,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; }