maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove TimeValue usage from two files 

llvm-svn: 285801
This commit is contained in:
Pavel Labath 2016-11-02 12:18:42 +00:00
parent 75d2f1b10d
commit 774103c831
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lldb/source/Core/Communication.cpp
View File

@ -305,8 +305,9 @@ lldb::thread_result_t Communication::ReadThread(lldb::thread_arg_t p) {
ConnectionStatus status = eConnectionStatusSuccess;
bool done = false;
while (!done && comm->m_read_thread_enabled) {
const int timeout_us = 5000000;
size_t bytes_read = comm->ReadFromConnection(
buf, sizeof(buf), 5 * TimeValue::MicroSecPerSec, status, &error);
buf, sizeof(buf), timeout_us, status, &error);
if (bytes_read > 0)
comm->AppendBytesToCache(buf, bytes_read, true, status);
else if ((bytes_read == 0) && status == eConnectionStatusEndOfFile) {

37
lldb/source/Core/Log.cpp
View File

@ -7,6 +7,22 @@
//
//===----------------------------------------------------------------------===//
// Project includes
#include "lldb/Core/Log.h"
#include "lldb/Core/PluginManager.h"
#include "lldb/Core/StreamFile.h"
#include "lldb/Core/StreamString.h"
#include "lldb/Host/Host.h"
#include "lldb/Host/ThisThread.h"
#include "lldb/Interpreter/Args.h"
#include "lldb/Utility/NameMatches.h"
// Other libraries and framework includes
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/Chrono.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/raw_ostream.h"
// C Includes
// C++ Includes
#include <cstdarg>
@ -16,22 +32,6 @@
#include <mutex>
#include <string>
// Other libraries and framework includes
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/raw_ostream.h"
// Project includes
#include "lldb/Core/Log.h"
#include "lldb/Core/PluginManager.h"
#include "lldb/Core/StreamFile.h"
#include "lldb/Core/StreamString.h"
#include "lldb/Host/Host.h"
#include "lldb/Host/ThisThread.h"
#include "lldb/Host/TimeValue.h"
#include "lldb/Interpreter/Args.h"
#include "lldb/Utility/NameMatches.h"
using namespace lldb;
using namespace lldb_private;
@ -81,8 +81,9 @@ void Log::VAPrintf(const char *format, va_list args) {
// Timestamp if requested
if (m_options.Test(LLDB_LOG_OPTION_PREPEND_TIMESTAMP)) {
TimeValue now = TimeValue::Now();
header.Printf("%9d.%9.9d ", now.seconds(), now.nanoseconds());
auto now = std::chrono::duration<double>(
std::chrono::system_clock::now().time_since_epoch());
header.Printf("%.9f ", now.count());
}
// Add the process and thread if requested