[tarantool-patches] Re: [tarantool-patches] [PATCH] FreeBSD/x64: Avoid changing resource limits, if not needed.

[Sergey Ostanevich]

LGTM.

Sergos 



Sent from Mail.ru app for iOS


Friday, 4 October 2019, 19:43 +0300 from Igor Munkin  <imun at tarantool.org>:
>Part-of tarantool gh-4271
>Part-of tarantool gh-4537
>
>Signed-off-by: Igor Munkin < imun at tarantool.org >
>---
>
>This is a backport of original commit from v2.1 branch in LuaJIT repo.
>
>I found a thread in lua-l mailing list[1] about INIT_MMAP workaround
>for FreeBSD. The submitted changeset relates to LJ_GC64 machinery and
>is not included in master branch.
>
>Authored by: Mike Pall <mike>
>
>[1]:  http://lua-users.org/lists/lua-l/2010-10/msg00625.html
>
> src/lj_alloc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/lj_alloc.c b/src/lj_alloc.c
>index 95d15d0..9fc761c 100644
>--- a/src/lj_alloc.c
>+++ b/src/lj_alloc.c
>@@ -343,7 +343,7 @@ static void *CALL_MMAP(size_t size)
> }
> #endif
> 
>-#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !LJ_TARGET_PS4
>+#if LJ_64 && !LJ_GC64 && ((defined(__FreeBSD__) && __FreeBSD__ < 10) || defined(__FreeBSD_kernel__)) && !LJ_TARGET_PS4
> 
> #include <sys/resource.h>
> 
>-- 
>2.23.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.tarantool.org/pipermail/tarantool-patches/attachments/20191004/337768a7/attachment.html>