Commit 772d0779 authored by Roland Moser's avatar Roland Moser
Browse files

references #658: collected flashlists sent out once a second


git-svn-id: file:///tmp/cmsos_migration/cmsos.svndb/releases/baseline9/trunk@15902 c528359e-2999-456a-ae53-7ba8edf254b3
parent b6a762e4
......@@ -18,9 +18,9 @@
#define XMASCOLLECTOR2G_VERSION_MAJOR 2
#define XMASCOLLECTOR2G_VERSION_MINOR 0
#define XMASCOLLECTOR2G_VERSION_PATCH 0
#define XMASCOLLECTOR2G_VERSION_PATCH 1
// If any previous versions available E.g. #define XMASCOLLECTOR2G_PREVIOUS_VERSIONS "3.8.0,3.8.1"
#undef XMASCOLLECTOR2G_PREVIOUS_VERSIONS
#define XMASCOLLECTOR2G_PREVIOUS_VERSIONS "2.0.0"
//
......
......@@ -447,9 +447,10 @@ toolbox::task::AsynchronousEventDispatcher& xmas::collector2g::Collector::getDis
bool xmas::collector2g::Collector::hasChanged()
{
toolbox::TimeVal current = toolbox::TimeVal::gettimeofday();
bool changed = false;
mutex_.take();
changed = lastUpdate_ > lastOutput_;
changed = (lastUpdate_ > lastOutput_) && ( (double)(current - lastOutput_) > (double)(settings_.getStagingPeriod()));
mutex_.give();
return changed;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment