epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Win32: friend incosistent linkage

Browse Source
This commit is contained in:
Matej Sekoranja
2014-06-19 21:24:14 +02:00
parent 652ef4bc82
commit c0c6213c7c
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/misc/timer.cpp
View File

@@ -196,23 +196,27 @@ void Timer::schedulePeriodic(
if(isFirst) waitForWork.signal();
}
std::ostream& operator<<(std::ostream& o, Timer& timer)
void Timer::dump(std::ostream& o)
{
Lock xx(timer.mutex);
if(!timer.alive) return o;
Lock xx(mutex);
if(!alive) return;
TimeStamp currentTime;
TimerCallbackPtr nodeToCall(timer.head);
TimerCallbackPtr nodeToCall(head);
currentTime.getCurrent();
while(true) {
if(nodeToCall.get()==NULL) return o;
if(nodeToCall.get()==NULL) return;
TimeStamp timeToRun = nodeToCall->timeToRun;
double period = nodeToCall->period;
double diff = TimeStamp::diff(timeToRun,currentTime);
o << "timeToRun " << diff << " period " << period << std::endl;
nodeToCall = nodeToCall->next;
}
return o;
}
std::ostream& operator<<(std::ostream& o, Timer& timer)
{
timer.dump(o);
return o;
}
}}