FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Subsystems: only record timings if enabled

Browse Source 
Avoid some overhead in copying std::map<>, in the common case where
subsystem timing reporting is not enabled.
This commit is contained in:
James Turner 2022-03-24 16:06:09 +00:00
parent de0ab92cca
commit 2993671fa4
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
simgear/structure/subsystem_mgr.cxx
View File

@ -416,6 +416,30 @@ SGSubsystemGroup::update (double delta_time_sec)
}
const bool recordTime = (reportTimingCb != nullptr);
if (recordTime) {
// recording timing adds some overhead at present, this is
// an easy way to ensure in the case where recording is not actually
// enabled, we don't pay that cost.
// Longer-term solution: add timing information to the Member struct,
// so that it can be recorded without the TimerStats strucutres being
// copied/created/cleared each update()
updateMembersWithTiming(loopCount, delta_time_sec);
} else {
updateMembers(loopCount, delta_time_sec);
}
}
void SGSubsystemGroup::updateMembers(int loopCount, double delta_time_sec)
{
while (loopCount-- > 0) {
for (auto member : _members) {
member->update(delta_time_sec); // indirect call
}
} // of multiple update loop
}
void SGSubsystemGroup::updateMembersWithTiming(int loopCount, double delta_time_sec)
{
SGTimeStamp timeStamp;
TimerStats lvTimerStats(_timerStats);
TimerStats overrunItems;
@ -435,7 +459,7 @@ SGSubsystemGroup::update (double delta_time_sec)
if (member->name.size())
_timerStats[member->name] += timeStamp.elapsedMSec() / 1000.0;
if (recordTime && reportTimingCb) {
if (reportTimingCb) {
member->updateExecutionTime(timeStamp.elapsedMSec()*1000);
if (timeStamp.elapsedMSec() > SGSubsystemMgr::maxTimePerFrame_ms) {
overrunItems[member->name] += timeStamp.elapsedMSec();
@ -444,6 +468,7 @@ SGSubsystemGroup::update (double delta_time_sec)
}
}
} // of multiple update loop
_lastExecutionTime = _executionTime;
_executionTime += outerTimeStamp.elapsedMSec();
if (overrun) {
@ -493,8 +518,8 @@ SGSubsystemGroup::update (double delta_time_sec)
}
_lastTimerStats.clear();
_lastTimerStats.insert(_timerStats.begin(), _timerStats.end());
}
void SGSubsystem::reportTimingStats(TimerStats *__lastValues) {
std::string _name = "";

3
simgear/structure/subsystem_mgr.hxx
View File

@ -446,6 +446,9 @@ private:
void notifyWillChange(SGSubsystem* sub, SGSubsystem::State s);
void notifyDidChange(SGSubsystem* sub, SGSubsystem::State s);
void updateMembers(int loopCount, double dt);
void updateMembersWithTiming(int loopCount, double dt);
friend class SGSubsystemMgr;
void set_manager(SGSubsystemMgr* manager);