From 0800ab54f5fb0509f774bc79518599b2698cf450 Mon Sep 17 00:00:00 2001 From: Mateusz Hoppe Date: Mon, 22 Jul 2024 15:52:02 +0000 Subject: [PATCH] refactor: remove redundant getPid() Signed-off-by: Mateusz Hoppe --- shared/source/os_interface/windows/sys_calls.cpp | 4 ---- shared/source/os_interface/windows/wddm/wddm.cpp | 2 +- shared/source/os_interface/windows/wddm/wddm.h | 1 - shared/test/common/os_interface/linux/sys_calls_win.cpp | 6 +----- shared/test/common/os_interface/windows/sys_calls.cpp | 4 ---- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/shared/source/os_interface/windows/sys_calls.cpp b/shared/source/os_interface/windows/sys_calls.cpp index e8ca12efc3..37bc177a86 100644 --- a/shared/source/os_interface/windows/sys_calls.cpp +++ b/shared/source/os_interface/windows/sys_calls.cpp @@ -12,10 +12,6 @@ namespace NEO { -unsigned int getPid() { - return GetCurrentProcessId(); -} - bool isShutdownInProgress() { auto handle = GetModuleHandleA("ntdll.dll"); diff --git a/shared/source/os_interface/windows/wddm/wddm.cpp b/shared/source/os_interface/windows/wddm/wddm.cpp index af23423d29..9f533dbbf4 100644 --- a/shared/source/os_interface/windows/wddm/wddm.cpp +++ b/shared/source/os_interface/windows/wddm/wddm.cpp @@ -1002,7 +1002,7 @@ bool Wddm::createContext(OsContextWin &osContext) { CREATECONTEXT_PVTDATA privateData = initPrivateData(osContext); - privateData.ProcessID = NEO::getPid(); + privateData.ProcessID = NEO::SysCalls::getProcessId(); privateData.pHwContextId = &hwContextId; privateData.NoRingFlushes = debugManager.flags.UseNoRingFlushesKmdMode.get(); diff --git a/shared/source/os_interface/windows/wddm/wddm.h b/shared/source/os_interface/windows/wddm/wddm.h index 03ae529640..9a88087a36 100644 --- a/shared/source/os_interface/windows/wddm/wddm.h +++ b/shared/source/os_interface/windows/wddm/wddm.h @@ -46,7 +46,6 @@ struct WorkaroundTable; enum class HeapIndex : uint32_t; unsigned int readEnablePreemptionRegKey(); -unsigned int getPid(); bool isShutdownInProgress(); CREATECONTEXT_PVTDATA initPrivateData(OsContextWin &osContext); diff --git a/shared/test/common/os_interface/linux/sys_calls_win.cpp b/shared/test/common/os_interface/linux/sys_calls_win.cpp index 035681f82a..32129b16df 100644 --- a/shared/test/common/os_interface/linux/sys_calls_win.cpp +++ b/shared/test/common/os_interface/linux/sys_calls_win.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Intel Corporation + * Copyright (C) 2022-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -17,10 +17,6 @@ bool isShutdownInProgress() { return false; } -unsigned int getPid() { - return static_cast(getpid()); -} - unsigned int readEnablePreemptionRegKey() { return 1; } diff --git a/shared/test/common/os_interface/windows/sys_calls.cpp b/shared/test/common/os_interface/windows/sys_calls.cpp index 803414c7d5..759d86a368 100644 --- a/shared/test/common/os_interface/windows/sys_calls.cpp +++ b/shared/test/common/os_interface/windows/sys_calls.cpp @@ -433,10 +433,6 @@ bool isShutdownInProgress() { return false; } -unsigned int getPid() { - return 0xABCEDF; -} - unsigned int readEnablePreemptionRegKey() { return 1; }