Ensure sleep is called in direct submission controller

Signed-off-by: Lukasz Jobczyk <lukasz.jobczyk@intel.com>

Author: LukaszJobczyk

shared/source/direct_submission/direct_submission_controller.cpp

@@ -48,22 +48,19 @@ void *DirectSubmissionController::controlDirectSubmissionsState(void *self) {
     auto controller = reinterpret_cast<DirectSubmissionController *>(self);
 
     while (!controller->runControlling.load()) {
-
         if (!controller->keepControlling.load()) {
             return nullptr;
         }
 
-        std::this_thread::sleep_for(std::chrono::microseconds(controller->timeout));
+        controller->sleep();
     }
 
     while (true) {
-
         if (!controller->keepControlling.load()) {
             return nullptr;
         }
 
-        std::this_thread::sleep_for(std::chrono::microseconds(controller->timeout));
-
+        controller->sleep();
         controller->checkNewSubmissions();
     }
 }
@@ -91,4 +88,8 @@ void DirectSubmissionController::checkNewSubmissions() {
     }
 }
 
+void DirectSubmissionController::sleep() {
+    std::this_thread::sleep_for(std::chrono::microseconds(this->timeout));
+}
+
 } // namespace NEO

shared/source/direct_submission/direct_submission_controller.h

@@ -37,6 +37,7 @@ class DirectSubmissionController {
 
     static void *controlDirectSubmissionsState(void *self);
     void checkNewSubmissions();
+    MOCKABLE_VIRTUAL void sleep();
 
     std::unordered_map<CommandStreamReceiver *, DirectSubmissionState> directSubmissions;
     std::mutex directSubmissionsMutex;

shared/test/unit_test/direct_submission/direct_submission_controller_mock.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,5 +17,12 @@ struct DirectSubmissionControllerMock : public DirectSubmissionController {
     using DirectSubmissionController::directSubmissionsMutex;
     using DirectSubmissionController::keepControlling;
     using DirectSubmissionController::timeout;
+
+    void sleep() override {
+        DirectSubmissionController::sleep();
+        this->sleepCalled = true;
+    }
+
+    bool sleepCalled = false;
 };
 } // namespace NEO

shared/test/unit_test/direct_submission/direct_submission_controller_tests.cpp

@@ -96,6 +96,9 @@ TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWithStarted
     EXPECT_NE(controller.directSubmissionControllingThread.get(), nullptr);
 
     controller.startControlling();
+
+    while (!controller.sleepCalled) {
+    }
     controller.keepControlling.store(false);
     controller.directSubmissionControllingThread->join();
     controller.directSubmissionControllingThread.reset();
@@ -105,6 +108,8 @@ TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWithNotStar
     DirectSubmissionControllerMock controller;
     EXPECT_NE(controller.directSubmissionControllingThread.get(), nullptr);
 
+    while (!controller.sleepCalled) {
+    }
     controller.keepControlling.store(false);
     controller.directSubmissionControllingThread->join();
     controller.directSubmissionControllingThread.reset();