From f48c2c9b5c3861249675c13ef140b4b9782a34ca Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 12 Sep 2011 07:28:40 +0200
Subject: [PATCH] * Cleanup debug output a bit.

---
 src/libtomahawk/database/databaseworker.cpp | 24 +++++++++++++++++----
 src/libtomahawk/database/tomahawksqlquery.h |  2 +-
 src/libtomahawk/pipeline.cpp                |  2 +-
 src/libtomahawk/query.cpp                   |  2 +-
 src/libtomahawk/utils/logger.cpp            |  2 +-
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/libtomahawk/database/databaseworker.cpp b/src/libtomahawk/database/databaseworker.cpp
index 5634eddd6..9f5e2d8aa 100644
--- a/src/libtomahawk/database/databaseworker.cpp
+++ b/src/libtomahawk/database/databaseworker.cpp
@@ -26,6 +26,9 @@
 #include "database/databasecommandloggable.h"
 #include "utils/logger.h"
 
+#ifndef QT_NO_DEBUG
+    //#define DEBUG_TIMING TRUE
+#endif
 
 DatabaseWorker::DatabaseWorker( DatabaseImpl* lib, Database* db, bool mutates )
     : QThread()
@@ -46,7 +49,12 @@ DatabaseWorker::~DatabaseWorker()
     tDebug() << Q_FUNC_INFO << m_outstanding;
 
     if ( m_outstanding )
-        tDebug() << "Outstanding db commands to finish:" << m_commands;
+    {
+        foreach ( const QSharedPointer<DatabaseCommand>& cmd, m_commands )
+        {
+            tDebug() << "Outstanding db command to finish:" << cmd->guid() << cmd->commandname();
+        }
+    }
 
     thread()->quit();
     wait();
@@ -91,8 +99,10 @@ DatabaseWorker::doWork()
 
      */
 
+#ifdef DEBUG_TIMING
     QTime timer;
     timer.start();
+#endif
 
     QSharedPointer<DatabaseCommand> cmd;
     {
@@ -160,10 +170,16 @@ DatabaseWorker::doWork()
                 }
             }
 
-            //uint duration = timer.elapsed();
-            //qDebug() << "DBCmd Duration:" << duration << "ms, now running postcommit for" << cmd->commandname();
+#ifdef DEBUG_TIMING
+            uint duration = timer.elapsed();
+            tDebug() << "DBCmd Duration:" << duration << "ms, now running postcommit for" << cmd->commandname();
+#endif
+
             cmd->postCommit();
-            //qDebug() << "Post commit finished for"<<  cmd->commandname();
+
+#ifdef DEBUG_TIMING
+            tDebug() << "Post commit finished in" << timer.elapsed() - duration << "ms for" << cmd->commandname();
+#endif
         }
     }
     catch( const char * msg )
diff --git a/src/libtomahawk/database/tomahawksqlquery.h b/src/libtomahawk/database/tomahawksqlquery.h
index 827476df8..f3bef2f62 100644
--- a/src/libtomahawk/database/tomahawksqlquery.h
+++ b/src/libtomahawk/database/tomahawksqlquery.h
@@ -59,7 +59,7 @@ public:
 
         int e = t.elapsed();
         if ( e >= TOMAHAWK_QUERY_THRESHOLD )
-            tLog() << "TomahawkSqlQuery (" << lastQuery() << ") finished in" << t.elapsed() << "ms";
+            tLog( LOGVERBOSE ) << "TomahawkSqlQuery (" << lastQuery() << ") finished in" << t.elapsed() << "ms";
 
         return ret;
     }
diff --git a/src/libtomahawk/pipeline.cpp b/src/libtomahawk/pipeline.cpp
index e6cf63aa3..e636591a8 100644
--- a/src/libtomahawk/pipeline.cpp
+++ b/src/libtomahawk/pipeline.cpp
@@ -337,7 +337,7 @@ Pipeline::shunt( const query_ptr& q )
 
     if ( r )
     {
-        tDebug() << "Dispatching to resolver" << r->name() << q->toString() << q->solved() << q->id();
+        tLog( LOGEXTRA ) << "Dispatching to resolver" << r->name() << q->toString() << q->solved() << q->id();
 
         q->setCurrentResolver( r );
         r->resolve( q );
diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp
index 01961adf0..83535139d 100644
--- a/src/libtomahawk/query.cpp
+++ b/src/libtomahawk/query.cpp
@@ -200,7 +200,7 @@ Query::removeResult( const Tomahawk::result_ptr& result )
 void
 Query::onResolvingFinished()
 {
-    tDebug() << "Finished resolving:" << toString();
+    tDebug( LOGVERBOSE ) << "Finished resolving:" << toString();
     if ( !m_resolveFinished )
     {
         m_resolveFinished = true;
diff --git a/src/libtomahawk/utils/logger.cpp b/src/libtomahawk/utils/logger.cpp
index 2a53b871c..846e2586b 100644
--- a/src/libtomahawk/utils/logger.cpp
+++ b/src/libtomahawk/utils/logger.cpp
@@ -72,7 +72,7 @@ log( const char *msg, unsigned int debugLevel, bool toDisk = true )
         logfile.flush();
     }
 
-    if ( debugLevel <= LOGVERBOSE || (int)debugLevel <= s_threshold )
+    if ( debugLevel <= LOGEXTRA || (int)debugLevel <= s_threshold )
     {
         cout << msg << endl;
         cout.flush();