From 4397b410d4eaae05c8c970168190884f5b1b96e4 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Fri, 27 Nov 2015 09:53:23 +0100 Subject: [PATCH 1/2] Fixed typo in buffer size calculation. --- src/input/input_buffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/input/input_buffer.cpp b/src/input/input_buffer.cpp index e992159a..4501ce84 100644 --- a/src/input/input_buffer.cpp +++ b/src/input/input_buffer.cpp @@ -60,7 +60,7 @@ namespace Mist { if (it->second.firstms < firstms) { firstms = it->second.firstms; } - if (it->second.firstms > lastms) { + if (it->second.lastms > lastms){ lastms = it->second.lastms; } } From c9ddc3fe1a8b5ef53239b1ca338bf8624409656c Mon Sep 17 00:00:00 2001 From: Thulinma Date: Fri, 27 Nov 2015 10:01:24 +0100 Subject: [PATCH 2/2] Fixed level of waiting for track debug message. --- src/output/output.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/output/output.cpp b/src/output/output.cpp index fe090486..b1bcabe9 100644 --- a/src/output/output.cpp +++ b/src/output/output.cpp @@ -373,7 +373,7 @@ namespace Mist { bool Output::seek(unsigned int tid, unsigned long long pos, bool getNextKey){ loadPageForKey(tid, getKeyForTime(tid, pos) + (getNextKey?1:0)); if (!curPage.count(tid) || !curPage[tid].mapped){ - DEBUG_MSG(DLVL_DEVEL, "Aborting seek to %llums in track %u, not available.", pos, tid); + INFO_MSG("Aborting seek to %llums in track %u, not available.", pos, tid); return false; } sortedPageInfo tmp; @@ -396,13 +396,13 @@ namespace Mist { if (curPage[tid].mapped[tmp.offset] != 0){ DEBUG_MSG(DLVL_FAIL, "Noes! Couldn't find packet on track %d because of some kind of corruption error or somesuch.", tid); }else{ - DEBUG_MSG(DLVL_FAIL, "Track %d no data (key %u @ %u) - waiting...", tid, getKeyForTime(tid, pos) + (getNextKey?1:0), tmp.offset); + VERYHIGH_MSG("Track %d no data (key %u @ %u) - waiting...", tid, getKeyForTime(tid, pos) + (getNextKey?1:0), tmp.offset); unsigned int i = 0; while (curPage[tid].mapped[tmp.offset] == 0 && ++i < 42){ Util::wait(100); } if (curPage[tid].mapped[tmp.offset] == 0){ - DEBUG_MSG(DLVL_FAIL, "Track %d no data (key %u) - timeout", tid, getKeyForTime(tid, pos) + (getNextKey?1:0)); + FAIL_MSG("Track %d no data (key %u) - timeout", tid, getKeyForTime(tid, pos) + (getNextKey?1:0)); }else{ return seek(tid, pos, getNextKey); }