From 01651be95bed36ce55f5b8b2c7d55c2224bcade2 Mon Sep 17 00:00:00 2001 From: Nav Date: Thu, 15 Sep 2022 00:35:06 +0100 Subject: [PATCH] Renamed CLion process check function --- src/DebugServer/Gdb/CommandPackets/Detach.cpp | 2 +- src/DebugServer/Gdb/GdbRspDebugServer.cpp | 2 +- src/Helpers/Process.cpp | 2 +- src/Helpers/Process.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DebugServer/Gdb/CommandPackets/Detach.cpp b/src/DebugServer/Gdb/CommandPackets/Detach.cpp index 00c6462d..42feefdd 100644 --- a/src/DebugServer/Gdb/CommandPackets/Detach.cpp +++ b/src/DebugServer/Gdb/CommandPackets/Detach.cpp @@ -24,7 +24,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets Logger::debug("Handling Detach packet"); try { - if (Process::isProcessManagedByClion(Process::getParentProcessId())) { + if (Process::isManagedByClion(Process::getParentProcessId())) { targetControllerConsole.suspendTargetController(); } diff --git a/src/DebugServer/Gdb/GdbRspDebugServer.cpp b/src/DebugServer/Gdb/GdbRspDebugServer.cpp index f0fe3289..c50e4985 100644 --- a/src/DebugServer/Gdb/GdbRspDebugServer.cpp +++ b/src/DebugServer/Gdb/GdbRspDebugServer.cpp @@ -125,7 +125,7 @@ namespace Bloom::DebugServer::Gdb std::bind(&GdbRspDebugServer::onTargetExecutionStopped, this, std::placeholders::_1) ); - if (Process::isProcessManagedByClion(Process::getParentProcessId())) { + if (Process::isManagedByClion(Process::getParentProcessId())) { Logger::warning( "Bloom's process is being managed by CLion - Bloom will automatically shutdown upon detaching from GDB." ); diff --git a/src/Helpers/Process.cpp b/src/Helpers/Process.cpp index ed068d25..6938e7da 100644 --- a/src/Helpers/Process.cpp +++ b/src/Helpers/Process.cpp @@ -13,7 +13,7 @@ namespace Bloom return getppid(); } - bool Process::isProcessManagedByClion(::pid_t processId) { + bool Process::isManagedByClion(::pid_t processId) { static auto cachedResult = std::optional(); if (cachedResult.has_value()) { diff --git a/src/Helpers/Process.hpp b/src/Helpers/Process.hpp index bf3b910d..f49e7157 100644 --- a/src/Helpers/Process.hpp +++ b/src/Helpers/Process.hpp @@ -28,7 +28,7 @@ namespace Bloom * @param processId * @return */ - static bool isProcessManagedByClion(::pid_t processId); + static bool isManagedByClion(::pid_t processId); private: static std::optional<::proc_t*> getProcessInfo(::pid_t processId);