From 77b284e6988b9a131d6abb3140ec6663c2ae84ae Mon Sep 17 00:00:00 2001
From: Jim Flynn <jim.flynn@arm.com>
Date: Sun, 13 Mar 2022 20:53:35 +0000
Subject: IVGCVSW-6848 Move Process.[ch]pp from armnnUtils to profiling/common

Change-Id: I13353f50293eae565a75ccfda37209350512bbc6
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
---
 Android.mk                                         |  2 +-
 CMakeLists.txt                                     |  2 --
 profiling/common/include/Processes.hpp             | 16 ++++++++++++
 profiling/common/src/CMakeLists.txt                |  1 +
 profiling/common/src/Processes.cpp                 | 29 ++++++++++++++++++++++
 .../basePipeServer/tests/BasePipeServerTests.cpp   |  4 +--
 src/armnn/LoadedNetwork.cpp                        | 14 +++++++----
 src/armnn/test/RuntimeTests.cpp                    | 15 ++++++-----
 src/armnnUtils/Processes.cpp                       | 29 ----------------------
 src/armnnUtils/Processes.hpp                       | 16 ------------
 src/profiling/SendCounterPacket.cpp                |  5 ++--
 src/profiling/SendThread.cpp                       |  3 ---
 src/profiling/test/ProfilingTestUtils.cpp          |  4 +--
 src/profiling/test/SendCounterPacketTests.cpp      |  4 +--
 14 files changed, 73 insertions(+), 71 deletions(-)
 create mode 100644 profiling/common/include/Processes.hpp
 create mode 100644 profiling/common/src/Processes.cpp
 delete mode 100644 src/armnnUtils/Processes.cpp
 delete mode 100644 src/armnnUtils/Processes.hpp

diff --git a/Android.mk b/Android.mk
index 29ca965d5d..c884aa6898 100644
--- a/Android.mk
+++ b/Android.mk
@@ -113,6 +113,7 @@ LOCAL_SRC_FILES := \
         profiling/common/src/Logging.cpp \
         profiling/common/src/NetworkSockets.cpp \
         profiling/common/src/PacketVersionResolver.cpp \
+        profiling/common/src/Processes.cpp \
         profiling/common/src/SwTrace.cpp \
         profiling/common/src/LabelsAndEventClasses.cpp \
         profiling/server/src/timelineDecoder/TimelineCaptureCommandHandler.cpp \
@@ -158,7 +159,6 @@ LOCAL_SRC_FILES := \
         src/armnnUtils/TensorUtils.cpp \
         src/armnnUtils/VerificationHelpers.cpp \
         src/armnnUtils/Filesystem.cpp \
-        src/armnnUtils/Processes.cpp \
         src/armnnUtils/ProfilingOptionsConverter.cpp \
         src/armnnUtils/Threads.cpp \
         src/armnnUtils/Transpose.cpp \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c069b052cc..923bc64697 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,8 +105,6 @@ list(APPEND armnnUtils_sources
     src/armnnUtils/ParserHelper.hpp
     src/armnnUtils/ParserHelper.cpp
     src/armnnUtils/ParserPrototxtFixture.hpp
-    src/armnnUtils/Processes.hpp
-    src/armnnUtils/Processes.cpp
     src/armnnUtils/ProfilingOptionsConverter.hpp
     src/armnnUtils/ProfilingOptionsConverter.cpp
     src/armnnUtils/PrototxtConversions.hpp
diff --git a/profiling/common/include/Processes.hpp b/profiling/common/include/Processes.hpp
new file mode 100644
index 0000000000..cc59d8b2d4
--- /dev/null
+++ b/profiling/common/include/Processes.hpp
@@ -0,0 +1,16 @@
+//
+// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+namespace arm
+{
+namespace pipe
+{
+
+int GetCurrentId();
+
+} // namespace arm
+} // namespace pipe
diff --git a/profiling/common/src/CMakeLists.txt b/profiling/common/src/CMakeLists.txt
index 1b47b6cf73..3932186c51 100644
--- a/profiling/common/src/CMakeLists.txt
+++ b/profiling/common/src/CMakeLists.txt
@@ -13,6 +13,7 @@ if(BUILD_TIMELINE_DECODER)
         Logging.cpp
         NetworkSockets.cpp
         PacketVersionResolver.cpp
+        Processes.cpp
         SwTrace.cpp
         LabelsAndEventClasses.cpp)
 
diff --git a/profiling/common/src/Processes.cpp b/profiling/common/src/Processes.cpp
new file mode 100644
index 0000000000..d6d4ca4950
--- /dev/null
+++ b/profiling/common/src/Processes.cpp
@@ -0,0 +1,29 @@
+//
+// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#include "Processes.hpp"
+
+#if defined(__unix__) || defined(__APPLE__)
+#include <unistd.h>
+#elif defined(_MSC_VER)
+#include <common/include/WindowsWrapper.hpp>
+#endif
+
+namespace arm
+{
+namespace pipe
+{
+
+int GetCurrentId()
+{
+#if defined(__unix__) || defined(__APPLE__)
+    return getpid();
+#elif defined(_MSC_VER)
+    return ::GetCurrentProcessId();
+#endif
+}
+
+} // namespace pipe
+} // namespace arm
diff --git a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
index a0af25fc65..9993fc7a75 100644
--- a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
+++ b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
@@ -8,7 +8,7 @@
 #include <BufferManager.hpp>
 #include <SendCounterPacket.hpp>
 #include <SocketProfilingConnection.hpp>
-#include <Processes.hpp>
+#include <common/include/Processes.hpp>
 
 #include <doctest/doctest.h>
 
@@ -57,7 +57,7 @@ TEST_CASE("BasePipeServerTest")
     bufferManager.MarkRead(packetBuffer);
 
     CHECK(basePipeServer.get()->WaitForStreamMetaData());
-    CHECK(basePipeServer.get()->GetStreamMetadataPid() == armnnUtils::Processes::GetCurrentId());
+    CHECK(basePipeServer.get()->GetStreamMetadataPid() == arm::pipe::GetCurrentId());
     CHECK(basePipeServer.get()->GetStreamMetadataMaxDataLen() == MAX_METADATA_PACKET_LENGTH);
 
     // Now try a simple PeriodicCounterSelectionPacket
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp
index 46c1ce58aa..a720769873 100644
--- a/src/armnn/LoadedNetwork.cpp
+++ b/src/armnn/LoadedNetwork.cpp
@@ -6,22 +6,26 @@
 #include "LoadedNetwork.hpp"
 #include "Layer.hpp"
 #include "Graph.hpp"
-#include <Processes.hpp>
 #include "Profiling.hpp"
 #include "HeapProfiling.hpp"
 #include "WorkingMemHandle.hpp"
 
+#include <armnn/BackendHelper.hpp>
 #include <armnn/BackendRegistry.hpp>
 #include <armnn/Logging.hpp>
-#include <armnn/utility/Assert.hpp>
 
 #include <armnn/backends/TensorHandle.hpp>
 #include <armnn/backends/IMemoryManager.hpp>
 #include <armnn/backends/MemCopyWorkload.hpp>
-#include <backendsCommon/MemSyncWorkload.hpp>
-#include <armnn/BackendHelper.hpp>
+
 #include <armnn/profiling/ArmNNProfiling.hpp>
 
+#include <armnn/utility/Assert.hpp>
+
+#include <backendsCommon/MemSyncWorkload.hpp>
+
+#include <common/include/Processes.hpp>
+
 #include <fmt/format.h>
 
 namespace armnn
@@ -262,7 +266,7 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<IOptimizedNetwork> net,
         // Mark the network with a start of life event
         timelineUtils->RecordEvent(networkGuid, LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS);
         // and with the process ID
-        int processID = armnnUtils::Processes::GetCurrentId();
+        int processID = arm::pipe::GetCurrentId();
         std::stringstream ss;
         ss << processID;
         timelineUtils->MarkEntityWithLabel(networkGuid, ss.str(), LabelsAndEventClasses::PROCESS_ID_GUID);
diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp
index 89a87197bd..fc16dbbad9 100644
--- a/src/armnn/test/RuntimeTests.cpp
+++ b/src/armnn/test/RuntimeTests.cpp
@@ -3,17 +3,20 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <armnn/Descriptors.hpp>
-#include <armnn/IRuntime.hpp>
-#include <armnn/INetwork.hpp>
-#include <armnn/profiling/ArmNNProfiling.hpp>
 #include <ArmNNProfilingServiceInitialiser.hpp>
 #include <ProfilingOptionsConverter.hpp>
-#include <Processes.hpp>
 #include <Runtime.hpp>
+
+#include <armnn/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.hpp>
 #include <armnn/TypesUtils.hpp>
 
+#include <armnn/profiling/ArmNNProfiling.hpp>
+
 #include <common/include/LabelsAndEventClasses.hpp>
+#include <common/include/Processes.hpp>
+
 #include <test/ProfilingTestUtils.hpp>
 
 #include <HeapProfiling.hpp>
@@ -733,7 +736,7 @@ TEST_CASE("ProfilingEnableCpuRef")
                                                offset);
 
     // Process ID Label
-    int processID = armnnUtils::Processes::GetCurrentId();
+    int processID = arm::pipe::GetCurrentId();
     std::stringstream ss;
     ss << processID;
     std::string processIdLabel = ss.str();
diff --git a/src/armnnUtils/Processes.cpp b/src/armnnUtils/Processes.cpp
deleted file mode 100644
index 8b401d4145..0000000000
--- a/src/armnnUtils/Processes.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "Processes.hpp"
-
-#if defined(__unix__) || defined(__APPLE__)
-#include <unistd.h>
-#elif defined(_MSC_VER)
-#include <common/include/WindowsWrapper.hpp>
-#endif
-
-namespace armnnUtils
-{
-namespace Processes
-{
-
-int GetCurrentId()
-{
-#if defined(__unix__) || defined(__APPLE__)
-    return getpid();
-#elif defined(_MSC_VER)
-    return ::GetCurrentProcessId();
-#endif
-}
-
-}
-}
diff --git a/src/armnnUtils/Processes.hpp b/src/armnnUtils/Processes.hpp
deleted file mode 100644
index 89704237db..0000000000
--- a/src/armnnUtils/Processes.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-namespace armnnUtils
-{
-namespace Processes
-{
-
-int GetCurrentId();
-
-}
-}
diff --git a/src/profiling/SendCounterPacket.cpp b/src/profiling/SendCounterPacket.cpp
index 4586d9acb8..d354d40aca 100644
--- a/src/profiling/SendCounterPacket.cpp
+++ b/src/profiling/SendCounterPacket.cpp
@@ -9,11 +9,10 @@
 #include <common/include/Conversion.hpp>
 #include <common/include/Constants.hpp>
 #include <common/include/EncodeVersion.hpp>
+#include <common/include/Processes.hpp>
 #include <common/include/ProfilingException.hpp>
 #include <common/include/SwTrace.hpp>
 
-#include <Processes.hpp>
-
 #include <fmt/format.h>
 
 #include <cstring>
@@ -110,7 +109,7 @@ void SendCounterPacket::SendStreamMetaDataPacket()
         offset += sizeUint32;
         WriteUint32(writeBuffer, offset, MAX_METADATA_PACKET_LENGTH); // max_data_length
         offset += sizeUint32;
-        int pid = armnnUtils::Processes::GetCurrentId();
+        int pid = arm::pipe::GetCurrentId();
         WriteUint32(writeBuffer, offset, arm::pipe::numeric_cast<uint32_t>(pid)); // pid
         offset += sizeUint32;
         uint32_t poolOffset = bodySize;
diff --git a/src/profiling/SendThread.cpp b/src/profiling/SendThread.cpp
index 1459ae5499..7fb8e659f5 100644
--- a/src/profiling/SendThread.cpp
+++ b/src/profiling/SendThread.cpp
@@ -7,11 +7,8 @@
 #include "ProfilingUtils.hpp"
 
 #include <common/include/NumericCast.hpp>
-
 #include <common/include/ProfilingException.hpp>
 
-#include <Processes.hpp>
-
 #include <cstring>
 
 namespace arm
diff --git a/src/profiling/test/ProfilingTestUtils.cpp b/src/profiling/test/ProfilingTestUtils.cpp
index a6ec66da2f..2cd20b4716 100644
--- a/src/profiling/test/ProfilingTestUtils.cpp
+++ b/src/profiling/test/ProfilingTestUtils.cpp
@@ -11,13 +11,13 @@
 #include <armnn/Descriptors.hpp>
 #include <armnn/profiling/ArmNNProfiling.hpp>
 
-#include <Processes.hpp>
 #include <ProfilingService.hpp>
 #include <armnnUtils/Threads.hpp>
 
 #include <common/include/Assert.hpp>
 #include <common/include/LabelsAndEventClasses.hpp>
 #include <common/include/NumericCast.hpp>
+#include <common/include/Processes.hpp>
 
 #include <TestUtils.hpp>
 
@@ -492,7 +492,7 @@ void VerifyPostOptimisationStructureTestImpl(armnn::BackendId backendId)
                                                offset);
 
     // Process ID Label
-    int processID = armnnUtils::Processes::GetCurrentId();
+    int processID = arm::pipe::GetCurrentId();
     std::stringstream ss;
     ss << processID;
     std::string processIdLabel = ss.str();
diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp
index 4ae2c5562b..abd4cee600 100644
--- a/src/profiling/test/SendCounterPacketTests.cpp
+++ b/src/profiling/test/SendCounterPacketTests.cpp
@@ -11,7 +11,6 @@
 #include <CounterDirectory.hpp>
 #include <ProfilingUtils.hpp>
 #include <SendCounterPacket.hpp>
-#include <Processes.hpp>
 
 #include <armnn/Utils.hpp>
 
@@ -20,6 +19,7 @@
 #include <common/include/Constants.hpp>
 #include <common/include/EncodeVersion.hpp>
 #include <common/include/NumericCast.hpp>
+#include <common/include/Processes.hpp>
 #include <common/include/ProfilingException.hpp>
 
 #include <doctest/doctest.h>
@@ -365,7 +365,7 @@ TEST_CASE("SendStreamMetaDataPacketTest")
     offset += sizeUint32;
     CHECK(ReadUint32(readBuffer2, offset) == MAX_METADATA_PACKET_LENGTH); // max_data_len
     offset += sizeUint32;
-    int pid = armnnUtils::Processes::GetCurrentId();
+    int pid = arm::pipe::GetCurrentId();
     CHECK(ReadUint32(readBuffer2, offset) == arm::pipe::numeric_cast<uint32_t>(pid));
     offset += sizeUint32;
     uint32_t poolOffset = 10 * sizeUint32;
-- 
cgit v1.2.1