From 1b4d8f962695d27abfd188f6468da170e710947c Mon Sep 17 00:00:00 2001
From: rakshasa <sundell.software@gmail.com>
Date: Thu, 16 Feb 2012 15:08:30 +0900
Subject: [PATCH] Removed old thread test code.

---
 src/command_events.cc |  9 ---------
 src/rpc/scgi_task.cc  |  4 ++--
 src/thread_worker.cc  | 18 ------------------
 src/thread_worker.h   |  2 --
 4 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/src/command_events.cc b/src/command_events.cc
index 6b11537d..a05a36bf 100644
--- a/src/command_events.cc
+++ b/src/command_events.cc
@@ -306,17 +306,8 @@ d_multicall(const torrent::Object::list_type& args) {
   return resultRaw;
 }
 
-torrent::Object
-test_thread_locking() {
-  worker_thread->queue_item(&ThreadWorker::start_log_counter);
-
-  return torrent::Object();
-}
-
 void
 initialize_command_events() {
-  CMD2_ANY("test.thread_locking", std::bind(&test_thread_locking));
-
   CMD2_ANY_STRING  ("on_ratio",        std::bind(&apply_on_ratio, std::placeholders::_2));
 
   CMD2_ANY         ("start_tied",      std::bind(&apply_start_tied));
diff --git a/src/rpc/scgi_task.cc b/src/rpc/scgi_task.cc
index 22668dba..218c4ce0 100644
--- a/src/rpc/scgi_task.cc
+++ b/src/rpc/scgi_task.cc
@@ -185,7 +185,7 @@ SCgiTask::event_read() {
     result = write(m_parent->log_fd(), "\n---\n", sizeof("\n---\n"));
   }
 
-  lt_log_print(torrent::LOG_RPC_DEBUG, "---\n%*s\n---", m_bufferSize - std::distance(m_buffer, m_body), m_body);
+  lt_log_print_dump(torrent::LOG_RPC_DEBUG, m_body, m_bufferSize - std::distance(m_buffer, m_body), "SCGI RPC read.", 0);
 
   // Close if the call failed, else stay open to write back data.
   if (!m_parent->receive_call(this, m_body, m_bufferSize - std::distance(m_buffer, m_body)))
@@ -246,7 +246,7 @@ SCgiTask::receive_write(const char* buffer, uint32_t length) {
     result = write(m_parent->log_fd(), "\n---\n", sizeof("\n---\n"));
   }
 
-  lt_log_print(torrent::LOG_RPC_DEBUG, "---\n%*s\n---", m_bufferSize, m_buffer);
+  lt_log_print_dump(torrent::LOG_RPC_DEBUG, m_buffer, m_bufferSize, "SCGI RPC write.", 0);
 
   event_write();
   return true;
diff --git a/src/thread_worker.cc b/src/thread_worker.cc
index 79cd49ea..d6fa2f61 100644
--- a/src/thread_worker.cc
+++ b/src/thread_worker.cc
@@ -52,7 +52,6 @@
 #include "rpc/parse_commands.h"
 
 ThreadWorker::ThreadWorker() {
-  m_taskTouchLog.slot() = std::tr1::bind(&ThreadWorker::task_touch_log, this);
 }
 
 ThreadWorker::~ThreadWorker() {
@@ -100,14 +99,6 @@ ThreadWorker::start_scgi(ThreadBase* baseThread) {
   thread->m_safe.scgi->activate();
 }
 
-void
-ThreadWorker::start_log_counter(ThreadBase* baseThread) {
-  ThreadWorker* thread = (ThreadWorker*)baseThread;
-
-  if (!thread->m_taskTouchLog.is_queued())
-    priority_queue_insert(&thread->m_taskScheduler, &thread->m_taskTouchLog, cachedTime);
-}
-
 void
 ThreadWorker::msg_change_xmlrpc_log(ThreadBase* baseThread) {
   ThreadWorker* thread = (ThreadWorker*)baseThread;
@@ -139,12 +130,3 @@ ThreadWorker::change_xmlrpc_log() {
 
   control->core()->push_log_std("Logging XMLRPC events to '" + m_xmlrpcLog + "'.");
 }
-
-void
-ThreadWorker::task_touch_log() {
-  priority_queue_insert(&m_taskScheduler, &m_taskTouchLog, cachedTime + rak::timer::from_seconds(1));
-
-  acquire_global_lock();
-  control->core()->push_log("Tick Tock.");
-  release_global_lock();
-}
diff --git a/src/thread_worker.h b/src/thread_worker.h
index e3a9f06a..088058bb 100644
--- a/src/thread_worker.h
+++ b/src/thread_worker.h
@@ -63,7 +63,6 @@ public:
   void                set_xmlrpc_log(const std::string& filename);
 
   static void         start_scgi(ThreadBase* thread);
-  static void         start_log_counter(ThreadBase* thread);
   static void         msg_change_xmlrpc_log(ThreadBase* thread);
 
 private:
@@ -77,7 +76,6 @@ private:
     rpc::SCgi* scgi;
   };
 
-  rak::priority_item  m_taskTouchLog;
   safe_type           m_safe;
 
   // The following types shall only be modified while holding the