From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp48.i.mail.ru (smtp48.i.mail.ru [94.100.177.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 64C1546971A for ; Fri, 6 Dec 2019 14:00:02 +0300 (MSK) Content-Type: multipart/alternative; boundary="Apple-Mail=_94D0F347-D9BC-4D6C-9FC5-3920FCA1AECE" Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\)) From: Serge Petrenko In-Reply-To: <1575607823.301029230@f119.i.mail.ru> Date: Fri, 6 Dec 2019 14:00:00 +0300 Message-Id: <68B7F16F-27E2-4372-8C21-91F8C2BA289E@tarantool.org> References: <720acf3e6dbd775132b35c73e12e124e0067a5ec.1575011179.git.avtikhon@tarantool.org> <20191205014922.ktbfpefyq5uywgua@tkn_work_nb> <1575607823.301029230@f119.i.mail.ru> Subject: Re: [Tarantool-patches] [PATCH v2] build: fix unit tests build with lrt List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Tikhonov Cc: tarantool-patches@dev.tarantool.org --Apple-Mail=_94D0F347-D9BC-4D6C-9FC5-3920FCA1AECE Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Hi! Thanks for the patch. Looks good to me. > 6 =D0=B4=D0=B5=D0=BA. 2019 =D0=B3., =D0=B2 7:50, Alexander Tikhonov = =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BB(=D0=B0= ): >=20 > Alexander, >=20 > Thanks for the review, updated commit message as you suggested. >=20 > =D0=A7=D0=B5=D1=82=D0=B2=D0=B5=D1=80=D0=B3, 5 =D0=B4=D0=B5=D0=BA=D0=B0=D0= =B1=D1=80=D1=8F 2019, 4:49 +03:00 =D0=BE=D1=82 Alexander Turenko = : >=20 > LGTM. >=20 > I'm okay with the approach I proposed, of course :) My review would be > insufficient. >=20 > Serge, can you do the second review? >=20 > WBR, Alexander Turenko. >=20 > > build: fix unit tests build with lrt >=20 > Nit: librt or -ltr >=20 > Or just 'on CentOS 6'. All those details about librt are described in > the commit message below, while the header would be better if it will > give us an idea why the commit was made. > Corrected commit message added 'on CentOS 6' add '-lrt', (use of = 'librt' exceeded the limit of the commit message length) >=20 > > After the commit 77fa45bd05f8cdd4c0f9bad85185ef5b61528d49 > > ('lua: add fiber.top() listing fiber cpu consumption') > > the unit tests builds failed like: > >=20 > > = /opt/rh/devtoolset-6/root/usr/libexec/gcc/x86_64-redhat-linux/6.3.1/ld: > > ../../src/lib/core/libcore.a(fiber.c.o): undefined reference to = symbol > > 'clock_gettime@@GLIBC_2.2.5' > > //lib64/librt.so.1: error adding symbols: DSO missing from command = line > > collect2: error: ld returned 1 exit status > > test/unit/CMakeFiles/cbus.test.dir/build.make:108: recipe for target > > 'test/unit/cbus.test' failed > > make[2]: *** [test/unit/cbus.test] Error 1 > >=20 > > Found that fiber.cc is using now clock_gettime(), which requires = -lrt > > with glibc. To fix it added librt dependency for core library for = glibc. > > Due to glibc requires for -lrt for clock_gettime() only for some > > versions, check 'man clock_gettime.2': > > 'Link with -lrt (only for glibc versions before 2.17).' > > the check whether is able to use clock_gettime() w/o librt library = is > > added. > >=20 > > Close #4639 > > --- > >=20 > > Github: = https://github.com/tarantool/tarantool/tree/avtikhon/gh-4639-lrt-suggested= -full-ci = > > Issue: https://github.com/tarantool/tarantool/issues/4639 = > >=20 > > CMakeLists.txt | 6 ++++++ > > src/lib/core/CMakeLists.txt | 8 ++++++++ > > 2 files changed, 14 insertions(+) > >=20 > > diff --git a/CMakeLists.txt b/CMakeLists.txt > > index 7d6c0846e..ca968eb8d 100644 > > --- a/CMakeLists.txt > > +++ b/CMakeLists.txt > > @@ -116,6 +116,12 @@ else () > > set(HAVE_CLOCK_GETTIME ${HAVE_CLOCK_GETTIME_DECL}) > > endif () > > set(CMAKE_REQUIRED_LIBRARIES "") > > +# According to `man 2 clockgettime` the glibc wrapper requires > > +# -lrt on glibc versions before 2.17. We need to check whether > > +# the function is available without -lrt to set this linker option > > +# conditionally. > > +check_function_exists(clock_gettime HAVE_CLOCK_GETTIME_WITHOUT_RT) > > + > > check_symbol_exists(__get_cpuid cpuid.h HAVE_CPUID) > >=20 > > # Checks for libev > > diff --git a/src/lib/core/CMakeLists.txt = b/src/lib/core/CMakeLists.txt > > index e60b5199e..8623aa0de 100644 > > --- a/src/lib/core/CMakeLists.txt > > +++ b/src/lib/core/CMakeLists.txt > > @@ -46,3 +46,11 @@ target_link_libraries(core salad small uri = decNumber ${LIBEV_LIBRARIES} > > if (ENABLE_BACKTRACE AND NOT TARGET_OS_DARWIN) > > target_link_libraries(core gcc_s ${UNWIND_LIBRARIES}) > > endif() > > + > > +# Since fiber.top() introduction, fiber.cc, which is part of core > > +# library, depends on clock_gettime() syscall, so we should set > > +# -lrt when it is appropriate. See a comment for > > +# HAVE_CLOCK_GETTIME_WITHOUT_RT in ${REPO}/CMakeLists.txt. > > +if ("${HAVE_CLOCK_GETTIME}" AND NOT = "${HAVE_CLOCK_GETTIME_WITHOUT_RT}") > > + target_link_libraries(core rt) > > +endif() > > --=20 > > 2.17.1 > >=20 >=20 >=20 > --=20 > Alexander Tikhonov -- Serge Petrenko sergepetrenko@tarantool.org --Apple-Mail=_94D0F347-D9BC-4D6C-9FC5-3920FCA1AECE Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8 Hi! = Thanks for the patch.

Looks good to me.


6= =D0=B4=D0=B5=D0=BA. 2019 =D0=B3., =D0=B2 7:50, Alexander Tikhonov = <avtikhon@tarantool.org> =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0= =B0=D0=BB(=D0=B0):

Alexander,

Thanks for the = review, updated commit message as you suggested.

=D0=A7=D0=B5=D1=82=D0=B2=D0=B5=D1=80=D0=B3, 5 =D0=B4=D0=B5=D0=BA=D0= =B0=D0=B1=D1=80=D1=8F 2019, 4:49 +03:00 =D0=BE=D1=82 Alexander Turenko = <alexander.turenko@tarantool.org>:

LGTM.

I'm okay with the approach I proposed, of course :) My review would = be
insufficient.

Serge, can you do the second review?

WBR, Alexander Turenko.

> build: fix unit tests build with = lrt

Nit: librt or -ltr

Or just 'on CentOS 6'. All those details about librt are described in
the commit message below, while the header would be better if it will
give us an idea why the commit was made.
Corrected commit message = added 'on CentOS 6' add '-lrt', (use of 'librt' exceeded the limit of = the commit message length)

> After the commit 77fa45bd05f8cdd4c0f9bad85185ef5b61528d49
> ('lua: add fiber.top() = listing fiber cpu consumption')
> the unit tests builds failed like:
>
> = /opt/rh/devtoolset-6/root/usr/libexec/gcc/x86_64-redhat-linux/6.3.1/ld: > ../../src/lib/core/libcore.a(fiber.c.o): undefined reference to = symbol
> 'clock_gettime@@GLIBC_2.2.5'
> //lib64/librt.so.1: error adding symbols: DSO missing from command = line
> collect2: error: ld returned 1 exit status
> test/unit/CMakeFiles/cbus.test.dir/build.make:108: recipe for = target
> 'test/unit/cbus.test' failed
> make[2]: *** [test/unit/cbus.test] Error 1
>
> Found that fiber.cc is = using now clock_gettime(), which requires -lrt
> with glibc. To fix it added librt dependency for core library for = glibc.
> Due to glibc requires for -lrt for clock_gettime() only for some
> versions, check 'man clock_gettime.2':
> 'Link with -lrt (only for glibc versions before 2.17).'
> the check whether is able to use clock_gettime() w/o librt library = is
> added.
>
> Close #4639
> ---
>
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4639-lr= t-suggested-full-ci
> Issue: https://github.com/tarantool/tarantool/issues/4639
>
> CMakeLists.txt | 6 ++++++
> src/lib/core/CMakeLists.txt | 8 ++++++++
> 2 files changed, 14 insertions(+)
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 7d6c0846e..ca968eb8d 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -116,6 +116,12 @@ else ()
> set(HAVE_CLOCK_GETTIME ${HAVE_CLOCK_GETTIME_DECL})
> endif ()
> set(CMAKE_REQUIRED_LIBRARIES "")
> +# According to `man 2 clockgettime` the glibc wrapper requires
> +# -lrt on glibc versions before 2.17. We need to check whether
> +# the function is available without -lrt to set this linker = option
> +# conditionally.
> +check_function_exists(clock_gettime = HAVE_CLOCK_GETTIME_WITHOUT_RT)
> +
> check_symbol_exists(__get_cpuid cpuid.h HAVE_CPUID)
>
> # Checks for libev
> diff --git a/src/lib/core/CMakeLists.txt = b/src/lib/core/CMakeLists.txt
> index e60b5199e..8623aa0de 100644
> --- a/src/lib/core/CMakeLists.txt
> +++ b/src/lib/core/CMakeLists.txt
> @@ -46,3 +46,11 @@ target_link_libraries(core salad small uri = decNumber ${LIBEV_LIBRARIES}
> if (ENABLE_BACKTRACE AND NOT TARGET_OS_DARWIN)
> target_link_libraries(core gcc_s ${UNWIND_LIBRARIES})
> endif()
> +
> +# Since fiber.top() = introduction, fiber.cc, which = is part of core
> +# library, depends on clock_gettime() syscall, so we should set
> +# -lrt when it is appropriate. See a comment for
> +# HAVE_CLOCK_GETTIME_WITHOUT_RT in ${REPO}/CMakeLists.txt.
> +if ("${HAVE_CLOCK_GETTIME}" AND NOT = "${HAVE_CLOCK_GETTIME_WITHOUT_RT}")
> + target_link_libraries(core rt)
> +endif()
> --
> 2.17.1
>


--
Alexander Tikhonov



= --Apple-Mail=_94D0F347-D9BC-4D6C-9FC5-3920FCA1AECE--