Merged in master and stable-2.10.
Thanks!
Jérémie
On 16 June 2017 at 14:09, Michael Jeanson <mjean...@efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjean...@efficios.com>
> ---
> include/lttng/notification/channel-internal.h | 2 +-
> src/bin/lttng-sessiond/notification-thread-events.c | 6 +++---
> src/bin/lttng-sessiond/notification-thread.c | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/lttng/notification/channel-internal.h
> b/include/lttng/notification/channel-internal.h
> index efe502f..0779d73 100644
> --- a/include/lttng/notification/channel-internal.h
> +++ b/include/lttng/notification/channel-internal.h
> @@ -70,7 +70,7 @@ struct pending_notification {
> * - Synchronous: commands emitted by the client to which a reply is
> expected
> * (e.g. subscribing/unsubscribing to conditions),
> * - Asynchronous: notifications which are sent by the lttng_endpoint to
> the
> - * client as one of the subscribed condition has occured.
> + * client as one of the subscribed condition has occurred.
> *
> * The nature of this hybrid communication mode means that asynchronous
> messages
> * (e.g. notifications) may be interleaved between synchronous messages
> (e.g. a
> diff --git a/src/bin/lttng-sessiond/notification-thread-events.c
> b/src/bin/lttng-sessiond/notification-thread-events.c
> index ab1224a..751e665 100644
> --- a/src/bin/lttng-sessiond/notification-thread-events.c
> +++ b/src/bin/lttng-sessiond/notification-thread-events.c
> @@ -1368,7 +1368,7 @@ int handle_notification_thread_client_disconnect_all(
> int handle_notification_thread_trigger_unregister_all(
> struct notification_thread_state *state)
> {
> - bool error_occured = false;
> + bool error_occurred = false;
> struct cds_lfht_iter iter;
> struct lttng_trigger_ht_element *trigger_ht_element;
>
> @@ -1377,10 +1377,10 @@ int handle_notification_thread_trigger_unregister_all(
> int ret =
> handle_notification_thread_command_unregister_trigger(
> state, trigger_ht_element->trigger, NULL);
> if (ret) {
> - error_occured = true;
> + error_occurred = true;
> }
> }
> - return error_occured ? -1 : 0;
> + return error_occurred ? -1 : 0;
> }
>
> static
> diff --git a/src/bin/lttng-sessiond/notification-thread.c
> b/src/bin/lttng-sessiond/notification-thread.c
> index 7bd6536..c652b6e 100644
> --- a/src/bin/lttng-sessiond/notification-thread.c
> +++ b/src/bin/lttng-sessiond/notification-thread.c
> @@ -569,7 +569,7 @@ int handle_channel_monitoring_pipe(int fd, uint32_t
> revents,
> ret = handle_notification_thread_channel_sample(
> state, fd, domain);
> if (ret) {
> - ERR("[notification-thread] Consumer sample handling error
> occured");
> + ERR("[notification-thread] Consumer sample handling error
> occurred");
> ret = -1;
> goto end;
> }
> --
> 2.7.4
>
--
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
