Re: [PATCH lttng-tools] Fix: Lazily initialize max poll set size in poll compat

Re: [PATCH lttng-tools] Fix: Lazily initialize max poll set size in poll compat

[Jérémie Galarneau]

Merged in master, stable-2.9 and stable-2.8.

Thanks!
Jérémie

On 26 January 2017 at 14:36, Michael Jeanson <mjeanson@efficios.com> wrote:
> This was applied to the epoll implementation in commit
> 22dad56815ce0201c5ae7d5ef5d79cc0c6a42c5e
>
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
>  src/common/compat/compat-poll.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/common/compat/compat-poll.c b/src/common/compat/compat-poll.c
> index cc280c7..7d4d0e1 100644
> --- a/src/common/compat/compat-poll.c
> +++ b/src/common/compat/compat-poll.c
> @@ -111,8 +111,9 @@ int compat_poll_create(struct lttng_poll_event *events, int size)
>         }
>
>         if (!poll_max_size) {
> -               ERR("poll_max_size not initialized yet");
> -               goto error;
> +               if (lttng_poll_set_max_size()) {
> +                       goto error;
> +               }
>         }
>
>         /* Don't bust the limit here */
> --
> 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

[PATCH lttng-tools] Fix: Lazily initialize max poll set size in poll compat

[Michael Jeanson]

This was applied to the epoll implementation in commit
22dad56815ce0201c5ae7d5ef5d79cc0c6a42c5e

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 src/common/compat/compat-poll.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/compat/compat-poll.c b/src/common/compat/compat-poll.c
index cc280c7..7d4d0e1 100644
--- a/src/common/compat/compat-poll.c
+++ b/src/common/compat/compat-poll.c
@@ -111,8 +111,9 @@ int compat_poll_create(struct lttng_poll_event *events, int size)
 	}
 
 	if (!poll_max_size) {
-		ERR("poll_max_size not initialized yet");
-		goto error;
+		if (lttng_poll_set_max_size()) {
+			goto error;
+		}
 	}
 
 	/* Don't bust the limit here */
-- 
2.7.4

_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev