From eb5b532d3f3e7696da43acedfe607a61f00fac33 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Mon, 7 May 2007 18:12:03 +0000
Subject: [PATCH] removed boost.date_time dependency from DHT logging code

---
 src/kademlia/dht_tracker.cpp | 16 +++++++---------
 src/kademlia/rpc_manager.cpp |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/kademlia/dht_tracker.cpp b/src/kademlia/dht_tracker.cpp
index 7b2383866..3d033d11f 100644
--- a/src/kademlia/dht_tracker.cpp
+++ b/src/kademlia/dht_tracker.cpp
@@ -399,9 +399,8 @@ namespace libtorrent { namespace dht
 				, m_in_buf[current_buffer].end());
 
 #ifdef TORRENT_DHT_VERBOSE_LOGGING
-			TORRENT_LOG(dht_tracker) << microsec_clock::universal_time()
-				<< " RECEIVED [" << m_remote_endpoint[current_buffer]
-				<< "]:";
+			TORRENT_LOG(dht_tracker) << time_now_string() << " RECEIVED ["
+				<< m_remote_endpoint[current_buffer] << "]:";
 #endif
 
 			libtorrent::dht::msg m;
@@ -784,10 +783,9 @@ namespace libtorrent { namespace dht
 		e["v"] = version_str;
 
 #ifdef TORRENT_DHT_VERBOSE_LOGGING
-		TORRENT_LOG(dht_tracker) << microsec_clock::universal_time()
+		TORRENT_LOG(dht_tracker) << time_now_string()
 			<< " SENDING [" << m.addr << "]:";
 		TORRENT_LOG(dht_tracker) << "   transaction: " << m.transaction_id;
-//		e.print(std::cerr);
 #endif
 
 		if (m.message_id == messages::error)
@@ -799,8 +797,8 @@ namespace libtorrent { namespace dht
 			error_list.list().push_back(entry(m.error_msg));
 			e["e"] = error_list;
 #ifdef TORRENT_DHT_VERBOSE_LOGGING
-		TORRENT_LOG(dht_tracker) << "   error: " << m.error_code << " "
-			<< m.error_msg;
+		TORRENT_LOG(dht_tracker) << time_now_string()
+			<< "   error: " << m.error_code << " " << m.error_msg;
 #endif
 		}
 		else if (m.reply)
@@ -811,8 +809,8 @@ namespace libtorrent { namespace dht
 			r["id"] = std::string(m.id.begin(), m.id.end());
 
 #ifdef TORRENT_DHT_VERBOSE_LOGGING
-			TORRENT_LOG(dht_tracker) << "   reply: "
-				<< messages::ids[m.message_id];
+			TORRENT_LOG(dht_tracker) << time_now_string()
+				<< "   reply: " << messages::ids[m.message_id];
 #endif
 
 			if (m.write_token.type() != entry::undefined_t)
diff --git a/src/kademlia/rpc_manager.cpp b/src/kademlia/rpc_manager.cpp
index 8dd60f9bd..985cb7ae6 100644
--- a/src/kademlia/rpc_manager.cpp
+++ b/src/kademlia/rpc_manager.cpp
@@ -161,8 +161,8 @@ bool rpc_manager::incoming(msg const& m)
 
 #ifdef TORRENT_DHT_VERBOSE_LOGGING
 		std::ofstream reply_stats("libtorrent_logs/round_trip_ms.log", std::ios::app);
-		reply_stats << m.addr << "\t" << (microsec_clock::universal_time()
-			- o->sent).total_milliseconds() << std::endl;
+		reply_stats << m.addr << "\t" << total_milliseconds(time_now() - o->sent)
+			<< std::endl;
 #endif
 		o->reply(m);
 		m_transactions[tid].reset();