[Lldb-commits] [lldb] r285795 - Remove TimeValue usages from MacOSX-Kernel process plugin. NFC
Pavel Labath via lldb-commits
lldb-commits at lists.llvm.org
Wed Nov 2 03:13:54 PDT 2016
Author: labath
Date: Wed Nov 2 05:13:54 2016
New Revision: 285795
URL: http://llvm.org/viewvc/llvm-project?rev=285795&view=rev
Log:
Remove TimeValue usages from MacOSX-Kernel process plugin. NFC
Modified:
lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h
lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp?rev=285795&r1=285794&r2=285795&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp Wed Nov 2 05:13:54 2016
@@ -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::SendRequestAndGet
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);
Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h?rev=285795&r1=285794&r2=285795&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.h Wed Nov 2 05:13:54 2016
@@ -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;
Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp?rev=285795&r1=285794&r2=285795&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp Wed Nov 2 05:13:54 2016
@@ -162,7 +162,7 @@ ProcessKDP::ProcessKDP(TargetSP target_s
const uint64_t timeout_seconds =
GetGlobalPluginProperties()->GetPacketTimeout();
if (timeout_seconds > 0)
- m_comm.SetPacketTimeout(timeout_seconds);
+ m_comm.SetPacketTimeout(std::chrono::seconds(timeout_seconds));
}
//----------------------------------------------------------------------
More information about the lldb-commits
mailing list