[Sysman] Replace normal pointers with smart pointers (13/n)

Replacing normal pointers by smart pointers in scheduler module
of LO sysman(zesinit).

Related-To: LOCI-2810

Signed-off-by: Singh, Prasoon <prasoon.singh@intel.com>
This commit is contained in:
Singh, Prasoon
2023-04-10 11:01:37 +00:00
committed by Compute-Runtime-Automation
parent d0fb5a6e51
commit 0165f6158c
10 changed files with 24 additions and 48 deletions

View File

@@ -55,10 +55,6 @@ class SysmanDeviceSchedulerFixture : public SysmanDeviceFixture {
pSysfsAccess->write(engineDir + "/" + engineName + "/" + heartbeatIntervalMilliSecs, heartbeatMilliSecs);
});
// delete handles created in initial SysmanDeviceHandleContext::init() call
for (auto handle : pSysmanDeviceImp->pSchedulerHandleContext->handleList) {
delete handle;
}
pSysmanDeviceImp->pSchedulerHandleContext->handleList.clear();
device = pSysmanDevice;
getSchedHandles(0);
@@ -622,10 +618,8 @@ TEST_F(SysmanDeviceSchedulerFixture, GivenValidDeviceHandleWhenCallingzesSchedul
TEST_F(SysmanDeviceSchedulerFixture, GivenValidObjectsOfClassSchedulerImpAndSchedulerHandleContextThenDuringObjectReleaseCheckDestructorBranches) {
for (auto &handle : pSysmanDeviceImp->pSchedulerHandleContext->handleList) {
auto pSchedulerImp = static_cast<L0::Sysman::SchedulerImp *>(handle);
delete pSchedulerImp->pOsScheduler;
auto pSchedulerImp = static_cast<L0::Sysman::SchedulerImp *>(handle.get());
pSchedulerImp->pOsScheduler = nullptr;
delete handle;
handle = nullptr;
}
}

View File

@@ -64,10 +64,6 @@ class SysmanDeviceSchedulerFixture : public SysmanDeviceFixture {
pSysfsAccess->setFileProperties(dummy, enableEuDebug, true, S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR);
pSysfsAccess->write(enableEuDebug, 0);
// delete handles created in initial SysmanDeviceHandleContext::init() call
for (auto handle : pSysmanDeviceImp->pSchedulerHandleContext->handleList) {
delete handle;
}
pSysmanDeviceImp->pSchedulerHandleContext->handleList.clear();
device = pSysmanDevice;
getSchedHandles(0);
@@ -108,7 +104,7 @@ class SysmanDeviceSchedulerFixture : public SysmanDeviceFixture {
void setComputeUnitDebugModeMock(zes_sched_handle_t hScheduler) {
auto pSchedulerImp = static_cast<L0::Sysman::SchedulerImp *>(L0::Sysman::Scheduler::fromHandle(hScheduler));
auto pOsScheduler = static_cast<PublicLinuxSchedulerImp *>(pSchedulerImp->pOsScheduler);
auto pOsScheduler = static_cast<PublicLinuxSchedulerImp *>((pSchedulerImp->pOsScheduler).get());
EXPECT_EQ(ZE_RESULT_SUCCESS, pOsScheduler->setExclusiveModeImp());
uint64_t val = 1;
@@ -167,7 +163,7 @@ TEST_F(SysmanDeviceSchedulerFixture, GivenValidDeviceHandleWhenCallingzesSchedul
TEST_F(SysmanDeviceSchedulerFixture, GivenSomeInvalidSchedulerModeWhenCheckingForCurrentModeThenAPIReportUnknownMode) {
auto handles = getSchedHandles(handleComponentCount);
auto pSchedulerImp = static_cast<L0::Sysman::SchedulerImp *>(L0::Sysman::Scheduler::fromHandle(handles[0]));
auto pOsScheduler = static_cast<PublicLinuxSchedulerImp *>(pSchedulerImp->pOsScheduler);
auto pOsScheduler = static_cast<PublicLinuxSchedulerImp *>((pSchedulerImp->pOsScheduler).get());
uint64_t timeslice = 0, timeout = 0, heartbeat = 3000;
pOsScheduler->setPreemptTimeout(timeout);
pOsScheduler->setTimesliceDuration(timeslice);
@@ -607,7 +603,7 @@ TEST_F(SysmanDeviceSchedulerFixture, GivenHeartBeatIntervalFileNotPresentWhenSet
auto handles = getSchedHandles(handleComponentCount);
auto pSchedulerImp = static_cast<L0::Sysman::SchedulerImp *>(L0::Sysman::Scheduler::fromHandle(handles[0]));
auto pOsScheduler = static_cast<PublicLinuxSchedulerImp *>(pSchedulerImp->pOsScheduler);
auto pOsScheduler = static_cast<PublicLinuxSchedulerImp *>((pSchedulerImp->pOsScheduler).get());
EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, pOsScheduler->setHeartbeatInterval(2000));
}
@@ -821,7 +817,7 @@ TEST_F(SysmanDeviceSchedulerFixture, DISABLED_GivenEuDebugNodeWriteFailsWhenCall
TEST_F(SysmanDeviceSchedulerFixture, GivenNodeRequiredToEnableEuDebugNotPresentWhenCheckingForDebugModeThenCallReturnsFalse) {
auto handles = getSchedHandles(handleComponentCount);
auto pSchedulerImp = static_cast<L0::Sysman::SchedulerImp *>(L0::Sysman::Scheduler::fromHandle(handles[0]));
auto pOsScheduler = static_cast<PublicLinuxSchedulerImp *>(pSchedulerImp->pOsScheduler);
auto pOsScheduler = static_cast<PublicLinuxSchedulerImp *>((pSchedulerImp->pOsScheduler).get());
std::string dummy;
pSysfsAccess->setFileProperties(dummy, enableEuDebug, false, S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR);
EXPECT_FALSE(pOsScheduler->isComputeUnitDebugModeEnabled());
@@ -939,10 +935,8 @@ TEST_F(SysmanDeviceSchedulerFixture, GivenValidDeviceHandleWhenCallingzesSchedul
TEST_F(SysmanDeviceSchedulerFixture, GivenValidObjectsOfClassSchedulerImpAndSchedulerHandleContextThenDuringObjectReleaseCheckDestructorBranches) {
for (auto &handle : pSysmanDeviceImp->pSchedulerHandleContext->handleList) {
auto pSchedulerImp = static_cast<L0::Sysman::SchedulerImp *>(handle);
delete pSchedulerImp->pOsScheduler;
auto pSchedulerImp = static_cast<L0::Sysman::SchedulerImp *>(handle.get());
pSchedulerImp->pOsScheduler = nullptr;
delete handle;
handle = nullptr;
}
}
@@ -973,11 +967,6 @@ class SysmanMultiDeviceSchedulerFixture : public SysmanMultiDeviceFixture {
auto &osInterface = pSysmanDeviceImp->getRootDeviceEnvironment().osInterface;
osInterface->setDriverModel(std::unique_ptr<MockSchedulerNeoDrm>(pDrm));
// delete handles created in initial SysmanDeviceHandleContext::init() call
for (auto handle : pSysmanDeviceImp->pSchedulerHandleContext->handleList) {
delete handle;
}
pSysmanDeviceImp->pSchedulerHandleContext->handleList.clear();
device = pSysmanDevice;
auto drm = pSysmanDeviceImp->getRootDeviceEnvironment().osInterface->getDriverModel()->as<NEO::Drm>();
@@ -999,7 +988,7 @@ class SysmanMultiDeviceSchedulerFixture : public SysmanMultiDeviceFixture {
TEST_F(SysmanMultiDeviceSchedulerFixture, GivenValidSchedulerHandleContextWhenInitializingForIncorrectDistanceInfoVerifyInvalidEngineTypeIsNotReturned) {
auto pSchedulerHandleContextTest = std::make_unique<L0::Sysman::SchedulerHandleContext>(pOsSysman);
pSchedulerHandleContextTest->init(pOsSysman->getSubDeviceCount());
for (auto handle : pSchedulerHandleContextTest->handleList) {
for (auto &handle : pSchedulerHandleContextTest->handleList) {
zes_sched_properties_t properties = {};
ze_result_t result = zesSchedulerGetProperties(handle->toHandle(), &properties);
EXPECT_EQ(ZE_RESULT_SUCCESS, result);