Menu
▾
▴
[Tora-cvs] SF.net SVN: tora:[3350] branches/tora-trotl/src
|
From: <ibr...@us...> - 2009-11-10 18:47:36
|
Revision: 3350
http://tora.svn.sourceforge.net/tora/?rev=3350&view=rev
Author: ibre5041
Date: 2009-11-10 18:47:28 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
more logging to noblockquery.cpp, plus some const-correctness
Modified Paths:
--------------
branches/tora-trotl/src/tonoblockquery.cpp
branches/tora-trotl/src/tonoblockquery.h
Modified: branches/tora-trotl/src/tonoblockquery.cpp
===================================================================
--- branches/tora-trotl/src/tonoblockquery.cpp 2009-11-10 18:43:34 UTC (rev 3349)
+++ branches/tora-trotl/src/tonoblockquery.cpp 2009-11-10 18:47:28 UTC (rev 3350)
@@ -96,10 +96,10 @@
toLocker lock (Parent.Lock)
;
Parent.ReadingValues.insert(Parent.ReadingValues.end(), value);
- get_log().ts( std::string(__HERE__))
- << "Value read:"
- << value.toString().toUtf8().constData()
- << std::endl;
+ get_log().ts( std::string(__HERE__))
+ << "Value read:"
+ << value.toString().toUtf8().constData()
+ << std::endl;
if (Parent.ReadingValues.size() == 1)
{
@@ -139,21 +139,21 @@
}
catch (const toConnection::exception &str)
{
- //get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl;
+ get_log().ts( std::string(__HERE__)) << "Exception caught(a)" << std::endl;
toLocker lock (Parent.Lock)
;
Parent.Error = str;
}
catch (const QString &str)
{
- //get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl;
+ get_log().ts( std::string(__HERE__)) << "Exception caught(b)" << std::endl;
toLocker lock (Parent.Lock)
;
Parent.Error = str;
}
catch (...)
{
- //get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl;
+ get_log().ts( std::string(__HERE__)) << "Exception caught(c): " << std::endl;
toLocker lock (Parent.Lock)
;
Parent.Error = qApp->translate("toNoBlockQuery", "Unknown exception");
@@ -164,17 +164,17 @@
if (!Parent.Error.isNull() && !Parent.Query->eof())
try
{
- Parent.Query->cancel();
+ Parent.Query->cancel();
}
catch (...)
- {
-// get_log().ts( std::string(__HERE__))
-// << "Unhandled exception: " << __HERE__ << std::endl;
- }
+ {
+ get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << std::endl;
+ }
delete Parent.Query;
Parent.Query = NULL;
Parent.Running.up();
Parent.EOQ = true;
+ get_log().ts( std::string(__HERE__)) << "toNoBlockQuery::queryTask::run finished." << std::endl;
}
toQValue toNoBlockQuery::readValueNull()
@@ -193,10 +193,10 @@
Values = ReadingValues;
CurrentValue = Values.begin();
ReadingValues.clear();
- get_log().ts( std::string(__HERE__))
- << "Value read:"
- << (*CurrentValue).toString().toUtf8().constData()
- << std::endl;
+ get_log().ts( std::string(__HERE__))
+ << "Value read: '"
+ << (*CurrentValue).toString().toUtf8().constData()
+ << "'" << std::endl;
Continue.up();
if (CurrentValue == Values.end())
throw qApp->translate("toNoBlockQuery", "Reading past end of query");
@@ -335,7 +335,7 @@
}
}
-toQDescList &toNoBlockQuery::describe(void)
+toQDescList const &toNoBlockQuery::describe(void) const
{
toLocker lock (Lock)
;
@@ -348,8 +348,13 @@
toLocker lock (Lock)
;
checkError();
- bool cv = (CurrentValue == Values.end());
- bool sz = !(ReadingValues.size());
+// bool cv = (CurrentValue == Values.end());
+// bool sz = !(ReadingValues.size());
+// toQValue ret = *CurrentValue;
+// get_log().ts( std::string(__HERE__))
+// << "cv: " << cv << "\'" << (CurrentValue!=Values.end() ? (*CurrentValue).toUtf8().toAscii().constData(): "NULL") << "'\t"
+// << "sz: " << Values.size() << '\t' << "rs: " << ReadingValues.size() << '\t'
+// << "EOQ: " << EOQ << '\t' << "Processed: " << Processed << std::endl;
return EOQ && CurrentValue == Values.end() && !ReadingValues.size();
}
@@ -442,6 +447,7 @@
ReadingValues.clear();
Values.clear();
CurrentValue = Values.end();
+ get_log().ts( std::string(__HERE__)) << "CurrentValue=Values.end()" << std::endl;
Quit = EOQ = false;
Processed = 0;
@@ -454,7 +460,7 @@
}
catch (...)
{
- //get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl;
+ get_log().ts( std::string(__HERE__)) << "Exception(a): toNoBlockQuery::poll()" << std::endl;
Statistics = NULL;
}
@@ -463,7 +469,7 @@
}
catch (...)
{
- //get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl;
+ get_log().ts( std::string(__HERE__)) << "Exception(b): toNoBlockQuery::poll()" << std::endl;
Error = qApp->translate("toNoBlockQuery", "Failed to start background query thread");
while (Running.getValue())
Running.down();
@@ -481,7 +487,7 @@
return false;
}
-void toNoBlockQuery::checkError()
+void toNoBlockQuery::checkError() const
{
if (!Error.isNull())
{
Modified: branches/tora-trotl/src/tonoblockquery.h
===================================================================
--- branches/tora-trotl/src/tonoblockquery.h 2009-11-10 18:43:34 UTC (rev 3349)
+++ branches/tora-trotl/src/tonoblockquery.h 2009-11-10 18:47:28 UTC (rev 3350)
@@ -82,7 +82,7 @@
toSemaphore Continue;
/** Lock for all this stuff
*/
- toLock Lock;
+ mutable toLock Lock;
/** Current location that values are being read.
*/
toQList::iterator CurrentValue;
@@ -124,7 +124,7 @@
toQuery *Query;
/** Throw error if any.
*/
- void checkError();
+ void checkError() const;
/** Stop reading query
*/
void stop();
@@ -161,7 +161,7 @@
/** Get description of columns.
* @return Description of columns list. Don't modify this list.
*/
- toQDescList &describe(void);
+ const toQDescList &describe(void) const;
/** Read the next value from the query.
* @return The next available value.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|