From c6bcdf8c7bf9cbc82b6657a5a7ec336af625e412 Mon Sep 17 00:00:00 2001 From: Joshua Santosh Ranjan Date: Fri, 8 Mar 2024 07:27:29 +0000 Subject: [PATCH] fix(sysman): correct the error number for fd overflow Related-To: NEO-10513 Signed-off-by: Joshua Santosh Ranjan --- .../tools/source/sysman/engine/linux/os_engine_imp.cpp | 2 +- .../source/sysman/engine/linux/os_engine_imp_prelim.cpp | 4 ++-- .../sysman/engine/linux/test_zes_engine_prelim.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp b/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp index dcb4279fdd..2b25b2b881 100644 --- a/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp +++ b/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp @@ -74,7 +74,7 @@ ze_result_t LinuxEngineImp::getProperties(zes_engine_properties_t &properties) { } void LinuxEngineImp::checkErrorNumberAndUpdateStatus() { - if (errno == -EMFILE || errno == -ENFILE) { + if (errno == EMFILE || errno == ENFILE) { NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr, "Engine Handles could not be created because system has run out of file handles. Suggested action is to increase the file handle limit. \n"); initStatus = ZE_RESULT_ERROR_DEPENDENCY_UNAVAILABLE; } else { diff --git a/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp b/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp index 1298b959fe..602db6d78d 100644 --- a/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp +++ b/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp @@ -108,7 +108,7 @@ static ze_result_t openPmuHandlesForVfs(uint32_t numberOfVfs, } if (fd[1] < 0) { - if (errno == -EMFILE || errno == -ENFILE) { + if (errno == EMFILE || errno == ENFILE) { NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr, "Engine Handles could not be created because system has run out of file handles. Suggested action is to increase the file handle limit. \n"); return ZE_RESULT_ERROR_DEPENDENCY_UNAVAILABLE; } @@ -211,7 +211,7 @@ ze_result_t LinuxEngineImp::getProperties(zes_engine_properties_t &properties) { } void LinuxEngineImp::checkErrorNumberAndUpdateStatus() { - if (errno == -EMFILE || errno == -ENFILE) { + if (errno == EMFILE || errno == ENFILE) { NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr, "Engine Handles could not be created because system has run out of file handles. Suggested action is to increase the file handle limit. \n"); initStatus = ZE_RESULT_ERROR_DEPENDENCY_UNAVAILABLE; } else { diff --git a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine_prelim.cpp b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine_prelim.cpp index 4b72564a6f..6e7adaabe3 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine_prelim.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine_prelim.cpp @@ -130,7 +130,7 @@ TEST_F(ZesEngineFixture, GivenPmuOpenFailsDueToTooManyOpenFilesWhenCallingzesDev pSysfsAccess->mockReadSymLinkSuccess = true; pPmuInterface->mockPerfEventOpenRead = true; pPmuInterface->mockPerfEventOpenFailAtCount = 3; - pPmuInterface->mockErrorNumber = -EMFILE; + pPmuInterface->mockErrorNumber = EMFILE; pSysmanDeviceImp->pEngineHandleContext->handleList.clear(); pSysmanDeviceImp->pEngineHandleContext->init(deviceHandles); @@ -147,7 +147,7 @@ TEST_F(ZesEngineFixture, GivenPmuOpenFailsDueToTooManyOpenFilesInSystemWhenEnume pSysfsAccess->mockReadSymLinkSuccess = true; pPmuInterface->mockPerfEventOpenRead = true; pPmuInterface->mockPerfEventOpenFailAtCount = 3; - pPmuInterface->mockErrorNumber = -ENFILE; + pPmuInterface->mockErrorNumber = ENFILE; pSysmanDeviceImp->pEngineHandleContext->handleList.clear(); pSysmanDeviceImp->pEngineHandleContext->init(deviceHandles); @@ -423,7 +423,7 @@ TEST_F(ZesEngineFixture, GivenTooManyFilesErrorWhenCallingZesEngineGetActivityEx uint32_t count = 0; pPmuInterface->mockPerfEventOpenRead = true; pPmuInterface->mockPerfEventOpenFailAtCount = 3; - pPmuInterface->mockErrorNumber = -EMFILE; + pPmuInterface->mockErrorNumber = EMFILE; EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetActivityExt(handle, &count, nullptr)); EXPECT_EQ(count, pSysfsAccess->mockReadVal + 1); std::vector engineStats(count); @@ -445,7 +445,7 @@ TEST_F(ZesEngineFixture, GivenTooManyFilesInSystemErrorWhenCallingZesEngineGetAc uint32_t count = 0; pPmuInterface->mockPerfEventOpenRead = true; pPmuInterface->mockPerfEventOpenFailAtCount = 3; - pPmuInterface->mockErrorNumber = -ENFILE; + pPmuInterface->mockErrorNumber = ENFILE; EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetActivityExt(handle, &count, nullptr)); EXPECT_EQ(count, pSysfsAccess->mockReadVal + 1); std::vector engineStats(count);