diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-10-16 12:11:24 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-10-16 12:11:24 +0000 |
| commit | 40811e93f3fdf9342a9295369994012420fac548 (patch) | |
| tree | a8d85e094a9c21e10aa250f537c101fc2016a049 /library/cpp/netliba | |
| parent | 30ebe5357bb143648c6be4d151ecd4944af81ada (diff) | |
| parent | 28a0c4a9f297064538a018c512cd9bbd00a1a35d (diff) | |
| download | ydb-40811e93f3fdf9342a9295369994012420fac548.tar.gz | |
Merge branch 'rightlib' into mergelibs-241016-1210
Diffstat (limited to 'library/cpp/netliba')
| -rw-r--r-- | library/cpp/netliba/v6/cpu_affinity.cpp | 2 | ||||
| -rw-r--r-- | library/cpp/netliba/v6/ib_low.cpp | 2 | ||||
| -rw-r--r-- | library/cpp/netliba/v6/ib_low.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/library/cpp/netliba/v6/cpu_affinity.cpp b/library/cpp/netliba/v6/cpu_affinity.cpp index 55b4c98b71..26544bc376 100644 --- a/library/cpp/netliba/v6/cpu_affinity.cpp +++ b/library/cpp/netliba/v6/cpu_affinity.cpp @@ -35,7 +35,7 @@ namespace NNetliba { void Set(size_t i) { CPU_SET(i, CpuInfo); } -#elif defined(_linux_) +#elif defined(_linux_) && !defined(__ANDROID__) public: #define NUMCPU ((CPU_SETSIZE > MAX_SIZE) ? 1 : (MAX_SIZE / CPU_SETSIZE)) cpu_set_t CpuInfo[NUMCPU]; diff --git a/library/cpp/netliba/v6/ib_low.cpp b/library/cpp/netliba/v6/ib_low.cpp index 4dff3ac5cd..99d77d593f 100644 --- a/library/cpp/netliba/v6/ib_low.cpp +++ b/library/cpp/netliba/v6/ib_low.cpp @@ -8,7 +8,7 @@ namespace NNetliba { EnableROCEFlag = f; } -#if defined(_linux_) +#if defined(_linux_) && !defined(__ANDROID__) static TMutex IBPortMutex; static TIntrusivePtr<TIBPort> IBPort; static bool IBWasInitialized; diff --git a/library/cpp/netliba/v6/ib_low.h b/library/cpp/netliba/v6/ib_low.h index f75f1e5379..19be819b43 100644 --- a/library/cpp/netliba/v6/ib_low.h +++ b/library/cpp/netliba/v6/ib_low.h @@ -2,7 +2,7 @@ #include "udp_address.h" -#if defined(_linux_) +#if defined(_linux_) && !defined(__ANDROID__) #include <contrib/libs/ibdrv/include/infiniband/verbs.h> #include <contrib/libs/ibdrv/include/rdma/rdma_cma.h> #endif @@ -22,7 +22,7 @@ namespace NNetliba { const size_t MAX_INLINE_DATA_SIZE = 16; const int MAX_OUTSTANDING_RDMA = 10; -#if defined(_linux_) +#if defined(_linux_) && !defined(__ANDROID__) class TIBContext: public TThrRefBase, TNonCopyable { ibv_context* Context; ibv_pd* ProtDomain; |