diff --git a/.gitignore b/.gitignore index e2f73fc4d..5c6dc182c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ *.gch ,valgrind.log* *.pyc +/.sconf_temp +/.settings optcache Makefile.in build/* diff --git a/src/proc/play/output-slot-connection.hpp b/src/proc/play/output-slot-connection.hpp index 332943ae5..f83b789c6 100644 --- a/src/proc/play/output-slot-connection.hpp +++ b/src/proc/play/output-slot-connection.hpp @@ -215,6 +215,8 @@ namespace play { static DataSink connectOutputSink (CON& connection) { + TRACE (test, "activating Con=%p", &connection ); + DataSink newSink; newSink.activate(&connection, shutdownConnection); return newSink; diff --git a/tests/components/proc/play/diagnostic-output-slot.hpp b/tests/components/proc/play/diagnostic-output-slot.hpp index 6ec40d009..7e7a2f91d 100644 --- a/tests/components/proc/play/diagnostic-output-slot.hpp +++ b/tests/components/proc/play/diagnostic-output-slot.hpp @@ -117,6 +117,8 @@ namespace play { BuffHandle trackFrame (FrameID frameNr, BuffHandle const& newBuffer) { + TRACE (test, "Con=%p : track buffer %zu for frame-#%lu" + , this, newBuffer.entryID(), frameNr); REQUIRE (!contains (frameTrackingIndex_,frameNr), "attempt to lock already used frame %lu", frameNr); @@ -140,7 +142,9 @@ namespace play { BuffHandle claimBufferFor(FrameID frameNr) { + TRACE (test, "Con=%p : lock buffer for frame-#%lu", this, frameNr); REQUIRE (!closed_); + return trackFrame (frameNr, buffProvider_.lockBuffer (bufferType_)); } @@ -149,16 +153,22 @@ namespace play { bool isTimely (FrameID frameNr, TimeValue currentTime) { + TRACE (test, "Con=%p : timely? frame-#%lu" + , this, frameNr); + if (Time::ANYTIME == currentTime) return true; - - return currentTime < deadlineFor (frameNr); + else + return currentTime < deadlineFor (frameNr); } void transfer (BuffHandle const& filledBuffer) { + TRACE (test, "Con=%p : transfer buffer %zu" + , this, filledBuffer.entryID()); REQUIRE (!closed_); + pushout (filledBuffer); } @@ -191,13 +201,13 @@ namespace play { , frameGrid_(getTestTimeGrid()) /////////////TODO should rather pass that in as part of a "timings" definition , closed_(false) { - INFO (engine_dbg, "building in-memory diagnostic output sequence"); + INFO (engine_dbg, "building in-memory diagnostic output sequence (at %p)", this); } virtual ~TrackingInMemoryBlockSequence() { - INFO (engine_dbg, "releasing diagnostic output sequence"); + INFO (engine_dbg, "releasing diagnostic output sequence (at %p)", this); } @@ -224,6 +234,8 @@ namespace play { bool wasAllocated (uint frameNr) const { + TRACE (test, "query wasAllocated. Con=%p", this); + return contains (frameTrackingIndex_, frameNr); } @@ -424,11 +436,6 @@ namespace play { return block && block->was_used(); } - - - - private: - };