From e6918187568dbd01842d8d1d2c808ce16a894239 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 21 Apr 2024 13:54:28 +0200 Subject: Adding upstream version 18.2.2. Signed-off-by: Daniel Baumann --- src/test/libcephfs/ceph_pthread_self.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/test/libcephfs/ceph_pthread_self.h (limited to 'src/test/libcephfs/ceph_pthread_self.h') diff --git a/src/test/libcephfs/ceph_pthread_self.h b/src/test/libcephfs/ceph_pthread_self.h new file mode 100644 index 000000000..9e3cdfa99 --- /dev/null +++ b/src/test/libcephfs/ceph_pthread_self.h @@ -0,0 +1,31 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab + +#ifndef CEPH_TEST_LIBCEPHFS_PTHREAD_SELF +#define CEPH_TEST_LIBCEPHFS_PTHREAD_SELF + +#include + +#include + +/* + * There is a difference between libc shipped with FreeBSD and + * glibc shipped with GNU/Linux for the return type of pthread_self(). + * + * Introduced a conversion function in include/compat.h + * (uint64_t)ceph_pthread_self() + * + * libc returns an opague pthread_t that is not default convertable + * to a uint64_t, which is what gtest expects. + * And tests using gtest will not compile because of this difference. + * + */ +static uint64_t ceph_pthread_self() { + auto me = pthread_self(); + static_assert(std::is_convertible_v || + std::is_pointer_v, + "we need to use pthread_self() for the owner parameter"); + return static_cast(me); +} + +#endif -- cgit v1.2.3