diff options
| author | Pavel Labath <labath@google.com> | 2016-11-02 10:13:54 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2016-11-02 10:13:54 +0000 |
| commit | 5cddd608cde770e48e7260c06f054a3bed34898d (patch) | |
| tree | d15116a37cacccf3df24e2685ef590f16f493c0b | |
| parent | 1f1751182eac4d6267f09b4e1e00bd6d4668f0eb (diff) | |
| download | bcm5719-llvm-5cddd608cde770e48e7260c06f054a3bed34898d.tar.gz bcm5719-llvm-5cddd608cde770e48e7260c06f054a3bed34898d.zip | |
Remove TimeValue usages from MacOSX-Kernel process plugin. NFC
llvm-svn: 285795
3 files changed, 7 insertions, 10 deletions
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp index c016677674a..50f92680dcd 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp @@ -24,7 +24,6 @@ #include "lldb/Core/UUID.h" #include "lldb/Host/FileSpec.h" #include "lldb/Host/Host.h" -#include "lldb/Host/TimeValue.h" #include "lldb/Target/Process.h" // Project includes @@ -107,7 +106,8 @@ bool CommunicationKDP::SendRequestAndGetReply( const uint8_t request_sequence_id = (uint8_t)request_packet.GetData()[1]; while (1) { if (WaitForPacketWithTimeoutMicroSecondsNoLock( - reply_packet, GetPacketTimeoutInMicroSeconds())) { + reply_packet, + std::chrono::microseconds(GetPacketTimeout()).count())) { offset = 0; const uint8_t reply_command = reply_packet.GetU8(&offset); const uint8_t reply_sequence_id = reply_packet.GetU8(&offset); diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h index 6e02cb22d51..eed3daa4647 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h @@ -22,7 +22,6 @@ #include "lldb/Core/Listener.h" #include "lldb/Core/StreamBuffer.h" #include "lldb/Host/Predicate.h" -#include "lldb/Host/TimeValue.h" #include "lldb/lldb-private.h" class CommunicationKDP : public lldb_private::Communication { @@ -110,15 +109,13 @@ public: // get used, and if it doesn't this should be moved to the // CommunicationKDPClient. //------------------------------------------------------------------ - uint32_t SetPacketTimeout(uint32_t packet_timeout) { - const uint32_t old_packet_timeout = m_packet_timeout; + std::chrono::seconds SetPacketTimeout(std::chrono::seconds packet_timeout) { + const auto old_packet_timeout = m_packet_timeout; m_packet_timeout = packet_timeout; return old_packet_timeout; } - uint32_t GetPacketTimeoutInMicroSeconds() const { - return m_packet_timeout * lldb_private::TimeValue::MicroSecPerSec; - } + std::chrono::seconds GetPacketTimeout() const { return m_packet_timeout; } //------------------------------------------------------------------ // Public Request Packets @@ -239,7 +236,7 @@ protected: //------------------------------------------------------------------ uint32_t m_addr_byte_size; lldb::ByteOrder m_byte_order; - uint32_t m_packet_timeout; + std::chrono::seconds m_packet_timeout; std::recursive_mutex m_sequence_mutex; // Restrict access to sending/receiving // packets to a single thread at a time lldb_private::Predicate<bool> m_is_running; diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp index 756b145b3d6..77b9fc86eba 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -162,7 +162,7 @@ ProcessKDP::ProcessKDP(TargetSP target_sp, ListenerSP listener_sp) const uint64_t timeout_seconds = GetGlobalPluginProperties()->GetPacketTimeout(); if (timeout_seconds > 0) - m_comm.SetPacketTimeout(timeout_seconds); + m_comm.SetPacketTimeout(std::chrono::seconds(timeout_seconds)); } //---------------------------------------------------------------------- |

