From a0d9e8f6a6c8aebeb94dab757cc1085194532f5b Mon Sep 17 00:00:00 2001 From: ZhihanYan Date: Sun, 9 Nov 2025 19:28:49 +0800 Subject: [PATCH] add cmake for urma 3rdparty --- CMakeLists.txt | 3 + build/make_software_package.sh | 10 ++-- src/hcom.cpp | 1 - src/hcom.h | 4 -- src/hcom_def.h | 5 -- src/transport/rdma/verbs/net_rdma_driver.cpp | 12 ---- src/transport/rdma/verbs/net_rdma_driver.h | 4 -- src/transport/shm/net_shm_driver_oob.cpp | 12 ---- src/transport/shm/net_shm_driver_oob.h | 4 -- src/transport/sock/net_sock_driver_oob.cpp | 12 ---- src/transport/sock/net_sock_driver_oob.h | 5 -- src/transport/ub/net_ub_driver.cpp | 20 ------- src/transport/ub/net_ub_driver.h | 5 -- src/transport/ub/net_ub_driver_oob.cpp | 7 ++- src/transport/ub/ub_mr_pool.cpp | 23 ------- src/transport/ub/ub_mr_pool.h | 3 - src/transport/ub/ub_urma_wrapper_jetty.cpp | 3 +- src/under_api/obmm/obmm_api_dl.cpp | 63 -------------------- src/under_api/obmm/obmm_api_dl.h | 48 --------------- src/under_api/obmm/obmm_api_wrapper.h | 61 ------------------- 20 files changed, 13 insertions(+), 292 deletions(-) delete mode 100644 src/under_api/obmm/obmm_api_dl.cpp delete mode 100644 src/under_api/obmm/obmm_api_dl.h delete mode 100644 src/under_api/obmm/obmm_api_wrapper.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 89fdd23..5e41dfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,6 +221,9 @@ include_directories(${HCOM_SRC_DIR}/src/under_api/verbs ${JAVA_HOME}/include ${JAVA_HOME}/include/linux) +if (BUILD_WITH_UB) + include_directories(${HCOM_SRC_DIR}/3rdparty/) +endif () # Reset the prefix path if user doesn't provide one. if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set_property(CACHE CMAKE_INSTALL_PREFIX PROPERTY VALUE ${PROJECT_BINARY_DIR}) diff --git a/build/make_software_package.sh b/build/make_software_package.sh index d4f9b21..41dda23 100644 --- a/build/make_software_package.sh +++ b/build/make_software_package.sh @@ -52,7 +52,7 @@ echo "${HCOM_LOG_TAG} HCOM install directory: ${HCOM_INSTALL_DIR}" [[ -z "${HCOM_PRODUCT_VERSION}" ]] && HCOM_PRODUCT_VERSION="24.4" [[ -z "${HCOM_COMPONENT_VERSION}" ]] && HCOM_COMPONENT_VERSION="1.0.0" [[ -z "${HCOM_PACKAGE_PATH}" ]] && HCOM_PACKAGE_PATH="${HCOM_ROOT_DIR}/dist" -[[ -z "${ARCH}" ]] && ARCH="aarch64" +[[ -z "${HCOM_BUILD_OS_ARCH}" ]] && HCOM_BUILD_OS_ARCH="aarch64" HCOM_COMPONENT_COMMIT_ID="" if [ -d "${HCOM_ROOT_DIR}/.git" ] || (cd "${HCOM_ROOT_DIR}" && git rev-parse --is-inside-work-tree >/dev/null 2>&1); then HCOM_COMPONENT_COMMIT_ID=$(cd "${HCOM_ROOT_DIR}" && git rev-parse HEAD 2>/dev/null) @@ -61,11 +61,11 @@ fi # hcom is published by BoostKit cd "${HCOM_PACKAGE_PATH}" -if [[ -z "${OS}" || -z "${ARCH}" ]]; then +if [[ -z "${OS}" || -z "${HCOM_BUILD_OS_ARCH}" ]]; then echo "${HCOM_LOG_TAG} env OS or env ARCH is empty!" HCOM_PACKAGE_NAME="BoostKit-${HCOM_COMPONENT_NAME}_${HCOM_COMPONENT_VERSION}_${HCOM_BUILD_OS_ARCH}" else - HCOM_PACKAGE_NAME="BoostKit-${HCOM_COMPONENT_NAME}_${HCOM_COMPONENT_VERSION}_${OS}_${ARCH}" + HCOM_PACKAGE_NAME="BoostKit-${HCOM_COMPONENT_NAME}_${HCOM_COMPONENT_VERSION}_${OS}_${HCOM_BUILD_OS_ARCH}" fi [[ -n "${HCOM_PACKAGE_NAME}" ]] && rm -rf "${HCOM_PACKAGE_NAME}" @@ -168,7 +168,7 @@ base_rpmbuild_cmd="rpmbuild --define \"package_name ${HCOM_PACKAGE_NAME}\" -bb h eval "$base_rpmbuild_cmd" if [[ "${HCOM_BUILD_TYPE,,}" == "debug" ]]; then - cp ~/rpmbuild/RPMS/${ARCH}/OCK-CommunicationSuite_HCOM_Debug-2.0.0-B099*.rpm "${HCOM_ROOT_DIR}/dist/OCK-CommunicationSuite_HCOM_Debug_2.0.0_${OS}-${ARCH}.rpm" + cp ~/rpmbuild/RPMS/${HCOM_BUILD_OS_ARCH}/OCK-CommunicationSuite_HCOM_Debug-2.0.0-B099*.rpm "${HCOM_ROOT_DIR}/dist/OCK-CommunicationSuite_HCOM_Debug_2.0.0_${OS}-${HCOM_BUILD_OS_ARCH}.rpm" else - cp ~/rpmbuild/RPMS/${ARCH}/OCK-CommunicationSuite_HCOM-2.0.0-B099*.rpm "${HCOM_ROOT_DIR}/dist/OCK-CommunicationSuite_HCOM_2.0.0_${OS}-${ARCH}.rpm" + cp ~/rpmbuild/RPMS/${HCOM_BUILD_OS_ARCH}/OCK-CommunicationSuite_HCOM-2.0.0-B099*.rpm "${HCOM_ROOT_DIR}/dist/OCK-CommunicationSuite_HCOM_2.0.0_${OS}-${HCOM_BUILD_OS_ARCH}.rpm" fi diff --git a/src/hcom.cpp b/src/hcom.cpp index a8ff1cf..522be37 100644 --- a/src/hcom.cpp +++ b/src/hcom.cpp @@ -34,7 +34,6 @@ #ifdef UB_BUILD_ENABLED #include "net_ub_driver_oob.h" -#include "obmm_api_wrapper.h" #endif namespace ock { diff --git a/src/hcom.h b/src/hcom.h index dd79d9d..c62f527 100644 --- a/src/hcom.h +++ b/src/hcom.h @@ -2225,10 +2225,6 @@ public: */ bool IsInited() const; - virtual void *MapAndRegVaForUB(unsigned long memid, uint64_t &va) = 0; - - virtual NResult UnmapVaForUB(uint64_t &va) = 0; - static void DumpObjectStatistics(); void SetPeerDevId(uint8_t index); diff --git a/src/hcom_def.h b/src/hcom_def.h index c9abc73..24df639 100644 --- a/src/hcom_def.h +++ b/src/hcom_def.h @@ -22,10 +22,6 @@ namespace ock { namespace hcom { #define NET_FLAGS_BIT(i) (1UL << (i)) -#define SLAVE1_PHYSICAL_ADDRESS 0x286f00000000 // hard-coded PA on slave1 -#define SLAVE2_PHYSICAL_ADDRESS 0x686f00000000 // hard-coded PA on slave2 -#define OBMM_SIZE 1 << 27 // 128M - constexpr const uint32_t NET_SGE_MAX_SIZE = 524288000; constexpr const uint32_t NET_STR_ERROR_BUF_SIZE = 128; constexpr const uint32_t NET_SGE_MAX_IOV = 4; @@ -118,7 +114,6 @@ struct UBSHcomNetTransSgeIov { uint64_t lKey = 0; uint64_t rKey = 0; uint32_t size = 0; - unsigned long memid = 0; // indicate obmm memory used by urma in rndv void *srcSeg; // ptr to description of src mem seg for urma void *dstSeg; // ptr to description of dst mem seg for urma diff --git a/src/transport/rdma/verbs/net_rdma_driver.cpp b/src/transport/rdma/verbs/net_rdma_driver.cpp index 64da83f..15f1cc2 100644 --- a/src/transport/rdma/verbs/net_rdma_driver.cpp +++ b/src/transport/rdma/verbs/net_rdma_driver.cpp @@ -604,18 +604,6 @@ void NetDriverRDMA::DestroyMemoryRegion(UBSHcomNetMemoryRegionPtr &mr) mMrChecker.UnRegister(mr->GetLKey()); mr->UnInitialize(); } - -void *NetDriverRDMA::MapAndRegVaForUB(unsigned long memid, uint64_t &va) -{ - NN_LOG_ERROR("operation is not supported in rdma"); - return nullptr; -} - -NResult NetDriverRDMA::UnmapVaForUB(uint64_t &va) -{ - NN_LOG_ERROR("operation is not supported in rdma"); - return NN_ERROR; -} } // namespace hcom } #endif \ No newline at end of file diff --git a/src/transport/rdma/verbs/net_rdma_driver.h b/src/transport/rdma/verbs/net_rdma_driver.h index 2b5b4ce..f991ba9 100644 --- a/src/transport/rdma/verbs/net_rdma_driver.h +++ b/src/transport/rdma/verbs/net_rdma_driver.h @@ -54,10 +54,6 @@ public: void DestroyEndpoint(UBSHcomNetEndpointPtr &ep) override; - void *MapAndRegVaForUB(unsigned long memid, uint64_t &va) override; - - NResult UnmapVaForUB(uint64_t &va) override; - inline RDMAMemoryRegionFixedBuffer *GetDriverSendMr() const { return mDriverSendMR; diff --git a/src/transport/shm/net_shm_driver_oob.cpp b/src/transport/shm/net_shm_driver_oob.cpp index dc6e664..8b6f7e2 100644 --- a/src/transport/shm/net_shm_driver_oob.cpp +++ b/src/transport/shm/net_shm_driver_oob.cpp @@ -1614,17 +1614,5 @@ void NetDriverShmWithOOB::DestroyMemoryRegion(UBSHcomNetMemoryRegionPtr &mr) mMrChecker.UnRegister(mr->GetLKey()); mr->UnInitialize(); } - -void *NetDriverShmWithOOB::MapAndRegVaForUB(unsigned long memid, uint64_t &va) -{ - NN_LOG_ERROR("operation is not supported in shm"); - return nullptr; -} - -NResult NetDriverShmWithOOB::UnmapVaForUB(uint64_t &va) -{ - NN_LOG_ERROR("operation is not supported in shm"); - return NN_ERROR; -} } } \ No newline at end of file diff --git a/src/transport/shm/net_shm_driver_oob.h b/src/transport/shm/net_shm_driver_oob.h index 0c90a64..4a26a8f 100644 --- a/src/transport/shm/net_shm_driver_oob.h +++ b/src/transport/shm/net_shm_driver_oob.h @@ -67,10 +67,6 @@ public: NResult SendExchangeInfo(OOBTCPConnection &conn, ShmConnExchangeInfo &exInfo); NResult ReceiveExchangeInfo(OOBTCPConnection &conn, ShmConnExchangeInfo &exInfo); - void *MapAndRegVaForUB(unsigned long memid, uint64_t &va) override; - - NResult UnmapVaForUB(uint64_t &va) override; - inline NResult ValidateMemoryRegion(uint64_t lKey, uintptr_t address, uint64_t size) { return mMrChecker.Validate(lKey, address, size); diff --git a/src/transport/sock/net_sock_driver_oob.cpp b/src/transport/sock/net_sock_driver_oob.cpp index 053be3d..d1d201f 100644 --- a/src/transport/sock/net_sock_driver_oob.cpp +++ b/src/transport/sock/net_sock_driver_oob.cpp @@ -1592,17 +1592,5 @@ NResult NetDriverSockWithOOB::MultiRailNewConnection(OOBTCPConnection &conn) NN_LOG_ERROR("Invalid operation, TCP is not supported by MultiRail"); return NN_ERROR; } - -void *NetDriverSockWithOOB::MapAndRegVaForUB(unsigned long memid, uint64_t &va) -{ - NN_LOG_ERROR("operation is not supported in tcp"); - return nullptr; -} - -NResult NetDriverSockWithOOB::UnmapVaForUB(uint64_t &va) -{ - NN_LOG_ERROR("operation is not supported in tcp"); - return NN_ERROR; -} } } diff --git a/src/transport/sock/net_sock_driver_oob.h b/src/transport/sock/net_sock_driver_oob.h index f80329a..4802e95 100644 --- a/src/transport/sock/net_sock_driver_oob.h +++ b/src/transport/sock/net_sock_driver_oob.h @@ -56,11 +56,6 @@ public: uint8_t serverGrpNo = 0, uint8_t clientGrpNo = 0, uint64_t ctx = 0) override; NResult MultiRailNewConnection(OOBTCPConnection &conn); - - void *MapAndRegVaForUB(unsigned long memid, uint64_t &va) override; - - NResult UnmapVaForUB(uint64_t &va) override; - void DestroyEndpoint(UBSHcomNetEndpointPtr &ep) override; void DestroyEndpointById(uint64_t id); inline NetMemPoolFixedPtr GetOpCtxMemPool() diff --git a/src/transport/ub/net_ub_driver.cpp b/src/transport/ub/net_ub_driver.cpp index bce7341..4eed4e0 100644 --- a/src/transport/ub/net_ub_driver.cpp +++ b/src/transport/ub/net_ub_driver.cpp @@ -15,7 +15,6 @@ #include "net_ub_driver.h" #include "net_ub_endpoint.h" #include "openssl_api_wrapper.h" -#include "under_api/obmm/obmm_api_wrapper.h" #include "ub_common.h" #include "ub_mr_fixed_buf.h" #include "ub_worker.h" @@ -547,13 +546,6 @@ void NetDriverUB::UnInitializeInner() DestroyClientLB(); ClearWorkers(); - if (!mMapVaSgeForUB.empty()) { - for (const auto &pair : mMapVaSgeForUB) { - uint64_t va = pair.first; - UnmapVaForUB(va); - } - mMapVaSgeForUB.clear(); - } } #define DRIVER_CHECK_HANDLES() \ @@ -718,18 +710,6 @@ void NetDriverUB::DestroyMemoryRegion(UBSHcomNetMemoryRegionPtr &mr) mr->UnInitialize(); } - -void *NetDriverUB::MapAndRegVaForUB(unsigned long memid, uint64_t &va) -{ - NN_LOG_ERROR("operation not supported in non-hccs NetDriverUB "); - return nullptr; -} - -NResult NetDriverUB::UnmapVaForUB(uint64_t &va) -{ - NN_LOG_ERROR("operation not supported in non-hccs NetDriverUB "); - return NN_ERROR; -} } } #endif diff --git a/src/transport/ub/net_ub_driver.h b/src/transport/ub/net_ub_driver.h index dd9c726..a859b4a 100644 --- a/src/transport/ub/net_ub_driver.h +++ b/src/transport/ub/net_ub_driver.h @@ -49,10 +49,6 @@ public: NResult CreateMemoryRegion(uint64_t size, UBSHcomNetMemoryRegionPtr &mr, unsigned long memid) override; void DestroyMemoryRegion(UBSHcomNetMemoryRegionPtr &mr) override; - void *MapAndRegVaForUB(unsigned long memid, uint64_t &va) override; - - NResult UnmapVaForUB(uint64_t &va) override; - inline NResult ValidateMemoryRegion(uint64_t lKey, uintptr_t address, uint64_t size) { return NN_OK; @@ -105,7 +101,6 @@ protected: MemoryRegionChecker mMrChecker; uint32_t mHeartBeatIdleTime = NN_NO8; uint32_t mHeartBeatProbeInterval = NN_NO1; - std::map mMapVaSgeForUB; private: NResult CreateSendMr(uint8_t slave); NResult ImportRemotePA(unsigned long memid); diff --git a/src/transport/ub/net_ub_driver_oob.cpp b/src/transport/ub/net_ub_driver_oob.cpp index 18f229c..54c91e7 100644 --- a/src/transport/ub/net_ub_driver_oob.cpp +++ b/src/transport/ub/net_ub_driver_oob.cpp @@ -1405,7 +1405,8 @@ int NetDriverUBWithOob::SendFinishedCB(UBOpContextInfo *ctx) } else if (ctx->opType == UBOpContextInfo::SEND_RAW_SGL) { return SendRawSglFinishedCB(ctx, requestCtx); } else if (ctx->opType == UBOpContextInfo::SEND_SGL_INLINE) { - return SendSglInlineFinishedCB(ctx, requestCtx); + auto worker = reinterpret_cast(ctx->ubJetty->GetUpContext1()); + return SendSglInlineFinishedCB(ctx, requestCtx, worker); } else { NN_LOG_WARN("Unreachable path"); } @@ -1559,8 +1560,8 @@ void NetDriverUBWithOob::ProcessEpError(uintptr_t ep) auto qp = endpointPtr->GetQp(); qp->Stop(); - NN_LOG_WARN("Handle Ep state " << NEPStateToString(endpointPtr->State().Get()) << ", Ep id " << endpointPtr->Id() << - " , try call Ep broken handle"); + NN_LOG_WARN("Handle Ep state " << UBSHcomNEPStateToString(endpointPtr->State().Get()) << ", Ep id " << + endpointPtr->Id() << " , try call Ep broken handle"); mEndPointBrokenHandler(endpointPtr); } diff --git a/src/transport/ub/ub_mr_pool.cpp b/src/transport/ub/ub_mr_pool.cpp index c221ace..34b6fd0 100644 --- a/src/transport/ub/ub_mr_pool.cpp +++ b/src/transport/ub/ub_mr_pool.cpp @@ -15,7 +15,6 @@ #include "ub_common.h" #include "ub_mr_pool.h" #include "under_api/urma/urma_api_wrapper.h" -#include "under_api/obmm/obmm_api_wrapper.h" namespace ock { namespace hcom { @@ -190,28 +189,6 @@ UResult UBMemoryRegion::InitializeForOneSide() return UB_OK; } -UResult UBMemoryRegion::InitializeWithPA(unsigned long memid) -{ - int fd_e = HcomObmm::ObmmOpen(memid); - if (fd_e < 0) { - NN_LOG_ERROR("Failed to get fd with memid " << memid << " errno " << errno); - return UB_MEMORY_ALLOCATE_FAILED; - } - mMemFd = fd_e; - auto tmpBuf = mmap(NULL, mSize, PROT_READ | PROT_WRITE, MAP_SHARED, fd_e, 0); - if (tmpBuf == MAP_FAILED) { - char buf[NET_STR_ERROR_BUF_SIZE] = {0}; - NN_LOG_ERROR("mmap error: " << - NetFunc::NN_GetStrError(errno, buf, NET_STR_ERROR_BUF_SIZE)); - close(fd_e); - return UB_MEMORY_ALLOCATE_FAILED; - } - - mBuf = reinterpret_cast(tmpBuf); - mGetBufWithMapping = true; - return UB_OK; -} - void UBMemoryRegion::UnInitialize() { if (mMemSeg != nullptr) { diff --git a/src/transport/ub/ub_mr_pool.h b/src/transport/ub/ub_mr_pool.h index 413f21a..155d8ad 100644 --- a/src/transport/ub/ub_mr_pool.h +++ b/src/transport/ub/ub_mr_pool.h @@ -14,7 +14,6 @@ #define HCOM_UB_MR_POOL_H #ifdef UB_BUILD_ENABLED #include -#include "libobmm.h" #include "hcom.h" #include "ub_common.h" @@ -56,7 +55,6 @@ public: UResult Initialize() override; UResult InitializeForOneSide(); - UResult InitializeWithPA(unsigned long memid); void UnInitialize() override; inline UBSHcomNetDriverProtocol GetProtocol() { @@ -92,7 +90,6 @@ protected: protected: urma_target_seg_t *mMemSeg = nullptr; unsigned long mMemid = 0; - int mMemFd = 0; // InitializeWithPA obmm open fd static uint64_t gPageSize; }; } diff --git a/src/transport/ub/ub_urma_wrapper_jetty.cpp b/src/transport/ub/ub_urma_wrapper_jetty.cpp index 88c9344..aed8938 100644 --- a/src/transport/ub/ub_urma_wrapper_jetty.cpp +++ b/src/transport/ub/ub_urma_wrapper_jetty.cpp @@ -14,7 +14,6 @@ #include "hcom_env.h" #include "ub_urma_wrapper_jetty.h" #include "ub_worker.h" -#include "under_api/obmm/obmm_api_wrapper.h" namespace ock { namespace hcom { @@ -110,7 +109,7 @@ UResult UBJetty::Stop() urma_jfr_attr_t jfr_attr = {}; jfr_attr.mask = JFR_STATE; jfr_attr.state = URMA_JFR_STATE_ERROR; - result = HcomUrma::ModifyJfr(mJfr, &jfr_attr); + auto result = HcomUrma::ModifyJfr(mJfr, &jfr_attr); if (result != UB_OK) { NN_LOG_ERROR("Fail to modify jfr to URMA_JFR_STATE_ERROR, urma result is " << result); return result; diff --git a/src/under_api/obmm/obmm_api_dl.cpp b/src/under_api/obmm/obmm_api_dl.cpp deleted file mode 100644 index 7443e1f..0000000 --- a/src/under_api/obmm/obmm_api_dl.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) Huawei Technologies Co., Ltd. 2025. All rights reserved. - - * ubs-hcom is licensed under the Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ -#ifdef UB_BUILD_ENABLED -#include -#include "hcom_log.h" -#include "hcom_def.h" -#include "common/net_common.h" -#include "obmm_api_dl.h" - -using namespace ock::hcom; - -OBMM_EXPORT ObmmAPI::hcomObmmExport = nullptr; -OBMM_EXPORT_USERADDR ObmmAPI::hcomObmmExportUseraddr = nullptr; -OBMM_UNEXPORT ObmmAPI::hcomObmmUnexport = nullptr; -OBMM_IMPORT ObmmAPI::hcomObmmImport = nullptr; -OBMM_UNIMPORT ObmmAPI::hcomObmmUnimport = nullptr; -OBMM_OPEN ObmmAPI::hcomObmmOpen = nullptr; - -bool ObmmAPI::gLoaded = false; - -#define DLSYM(type, ptr, sym) \ - do { \ - auto ptr1 = dlsym(handle, sym); \ - if (ptr1 == nullptr) { \ - NN_LOG_ERROR("Failed to load function " << sym << ", error " << dlerror()); \ - dlclose(handle); \ - return NN_NOF1; \ - } \ - ptr = (type)ptr1; \ - } while (0) - -int ObmmAPI::LoadObmmAPI() -{ - if (gLoaded) { - return 0; - } - - auto handle = dlopen(OBMM_SO_PATH, RTLD_NOW | RTLD_GLOBAL); - if (handle == nullptr) { - NN_LOG_ERROR("Failed to load obmm so " << OBMM_SO_PATH << ", error " << dlerror()); - return NN_NOF1; - } - DLSYM(OBMM_EXPORT, ObmmAPI::hcomObmmExport, "obmm_export"); - DLSYM(OBMM_UNEXPORT, ObmmAPI::hcomObmmUnexport, "obmm_unexport"); - DLSYM(OBMM_IMPORT, ObmmAPI::hcomObmmImport, "obmm_import"); - DLSYM(OBMM_UNIMPORT, ObmmAPI::hcomObmmUnimport, "obmm_unimport"); - DLSYM(OBMM_OPEN, ObmmAPI::hcomObmmOpen, "obmm_open"); - - NN_LOG_INFO("Success to load obmm"); - gLoaded = true; - - return 0; -} -#endif diff --git a/src/under_api/obmm/obmm_api_dl.h b/src/under_api/obmm/obmm_api_dl.h deleted file mode 100644 index 37614ba..0000000 --- a/src/under_api/obmm/obmm_api_dl.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) Huawei Technologies Co., Ltd. 2025. All rights reserved. - - * ubs-hcom is licensed under the Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ -#ifndef HCOM_UNDER_API_OBMM_API_DL_H -#define HCOM_UNDER_API_OBMM_API_DL_H -#ifdef UB_BUILD_ENABLED - -#include -#include "hcom.h" - -namespace ock { -namespace hcom { - -#define OBMM_SO_PATH "libobmm.so" - -using OBMM_EXPORT = uint64_t (*)(size_t size, bitmask *nodes, unsigned long flags, struct obmm_mem_desc *desc); -using OBMM_EXPORT_USERADDR = uint64_t (*)(void *addr, size_t size, unsigned long flags, struct obmm_mem_desc *desc); -using OBMM_UNEXPORT = int (*)(uint64_t id, unsigned long flags); -using OBMM_IMPORT = uint64_t (*)(struct obmm_mem_desc *desc, unsigned long flags, int *numa); -using OBMM_UNIMPORT = int (*)(uint64_t id, unsigned long flags); -using OBMM_OPEN = int (*)(uint64_t id); - -class ObmmAPI { -public: - static OBMM_EXPORT hcomObmmExport; - static OBMM_EXPORT_USERADDR hcomObmmExportUseraddr; - static OBMM_UNEXPORT hcomObmmUnexport; - static OBMM_IMPORT hcomObmmImport; - static OBMM_UNIMPORT hcomObmmUnimport; - static OBMM_OPEN hcomObmmOpen; - - static int LoadObmmAPI(); - -private: - static bool gLoaded; -}; -} -} -#endif -#endif /* UAPI_OBMM_H */ \ No newline at end of file diff --git a/src/under_api/obmm/obmm_api_wrapper.h b/src/under_api/obmm/obmm_api_wrapper.h deleted file mode 100644 index e48b21b..0000000 --- a/src/under_api/obmm/obmm_api_wrapper.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) Huawei Technologies Co., Ltd. 2025. All rights reserved. - - * ubs-hcom is licensed under the Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ -#ifndef HCOM_OBMM_API_WRAPPER_H -#define HCOM_OBMM_API_WRAPPER_H -#ifdef UB_BUILD_ENABLED - -#include "obmm_api_dl.h" - -namespace ock { -namespace hcom { -class HcomObmm { -public: - static inline uint64_t ObmmExport(size_t size, bitmask *nodes, unsigned long flags, struct obmm_mem_desc *desc) - { - return ObmmAPI::hcomObmmExport(size, nodes, flags, desc); - } - - static inline uint64_t ObmmExportUseraddr(void *addr, size_t size, unsigned long flags, - struct obmm_mem_desc *desc) - { - return ObmmAPI::hcomObmmExportUseraddr(addr, size, flags, desc); - } - - static inline int ObmmUnexport(uint64_t id, unsigned long flags) - { - return ObmmAPI::hcomObmmUnexport(id, flags); - } - - static inline int ObmmUnimport(uint64_t id, unsigned long flags) - { - return ObmmAPI::hcomObmmUnimport(id, flags); - } - - static inline uint64_t ObmmImport(struct obmm_mem_desc *desc, unsigned long flags, int *numa) - { - return ObmmAPI::hcomObmmImport(desc, flags, numa); - } - - static inline int ObmmOpen(uint64_t id) - { - return ObmmAPI::hcomObmmOpen(id); - } - - static inline int Load() - { - return ObmmAPI::LoadObmmAPI(); - } -}; -} -} -#endif -#endif // HCOM_OBMM_API_WRAPPER_H \ No newline at end of file -- Gitee