X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fstructure%2Fsubsystem_mgr.cxx;h=1e1425528e1a94f595e7b4de4e088c188b15d9a3;hb=a60d293759ef26d03d3dc7198561808e56db9b61;hp=6e5b42411ff4de7acbf75a176a25b45ea93f049e;hpb=feab25d0bee2c65a9b5c0a27802fb71c9a1a1190;p=simgear.git diff --git a/simgear/structure/subsystem_mgr.cxx b/simgear/structure/subsystem_mgr.cxx index 6e5b4241..1e142552 100644 --- a/simgear/structure/subsystem_mgr.cxx +++ b/simgear/structure/subsystem_mgr.cxx @@ -1,3 +1,26 @@ +// Written by David Megginson, started 2000-12 +// +// Copyright (C) 2000 David Megginson, david@megginson.com +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 2 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// +// $Id$ + +#ifdef HAVE_CONFIG_H +# include +#endif #include #include @@ -6,13 +29,18 @@ #include "subsystem_mgr.hxx" #include +#include "SGSmplstat.hxx" +const int SG_MAX_SUBSYSTEM_EXCEPTIONS = 4; + +using std::string; -const int SG_MAX_SUBSYSTEM_EXCEPTIONS = 4; //////////////////////////////////////////////////////////////////////// // Implementation of SGSubsystem //////////////////////////////////////////////////////////////////////// +SGSubsystemTimingCb SGSubsystem::reportTimingCb = NULL; +void* SGSubsystem::reportTimingUserData = NULL; SGSubsystem::SGSubsystem () : _suspended(false) @@ -28,6 +56,13 @@ SGSubsystem::init () { } +SGSubsystem::InitStatus +SGSubsystem::incrementalInit () +{ + init(); + return INIT_DONE; +} + void SGSubsystem::postinit () { @@ -77,28 +112,6 @@ SGSubsystem::is_suspended () const return _suspended; } - -void -SGSubsystem::printTimingInformation () -{ - SGTimeStamp startTime; - for ( eventTimeVecIterator i = timingInfo.begin(); - i != timingInfo.end(); - ++i) { - if (i == timingInfo.begin()) { - startTime = i->getTime(); - } else { - SGTimeStamp endTime = i->getTime(); - SG_LOG(SG_GENERAL, SG_ALERT, "- Getting to timestamp : " - << i->getName() << " takes " << endTime - startTime - << " sec."); - startTime = endTime; - } - } -} - - - void SGSubsystem::stamp(const string& name) { timingInfo.push_back(TimingInfo(name, SGTimeStamp::now())); @@ -109,9 +122,35 @@ void SGSubsystem::stamp(const string& name) // Implementation of SGSubsystemGroup. //////////////////////////////////////////////////////////////////////// +class SGSubsystemGroup::Member +{ +private: + Member (const Member &member); +public: + Member (); + virtual ~Member (); + + virtual void update (double delta_time_sec); + + void reportTiming(void) { if (reportTimingCb) reportTimingCb(reportTimingUserData, name, &timeStat); } + void updateExecutionTime(double time) { timeStat += time;} + + SampleStatistic timeStat; + std::string name; + SGSubsystem * subsystem; + double min_step_sec; + double elapsed_sec; + bool collectTimeStats; + int exceptionCount; + int initTime; +}; + + + SGSubsystemGroup::SGSubsystemGroup () : _fixedUpdateTime(-1.0), - _updateTimeRemainder(0.0) + _updateTimeRemainder(0.0), + _initPosition(0) { } @@ -120,7 +159,6 @@ SGSubsystemGroup::~SGSubsystemGroup () // reverse order to prevent order dependency problems for (unsigned int i = _members.size(); i > 0; i--) { - _members[i-1]->printTimingStatistics(); delete _members[i-1]; } } @@ -132,6 +170,23 @@ SGSubsystemGroup::init () _members[i]->subsystem->init(); } +SGSubsystem::InitStatus +SGSubsystemGroup::incrementalInit() +{ + if (_initPosition >= _members.size()) + return INIT_DONE; + + SGTimeStamp st; + st.stamp(); + InitStatus memberStatus = _members[_initPosition]->subsystem->incrementalInit(); + _members[_initPosition]->initTime += st.elapsedMSec(); + + if (memberStatus == INIT_DONE) + ++_initPosition; + + return INIT_CONTINUE; +} + void SGSubsystemGroup::postinit () { @@ -152,6 +207,7 @@ SGSubsystemGroup::shutdown () // reverse order to prevent order dependency problems for (unsigned int i = _members.size(); i > 0; i--) _members[i-1]->subsystem->shutdown(); + _initPosition = 0; } void @@ -183,28 +239,31 @@ SGSubsystemGroup::update (double delta_time_sec) delta_time_sec = _fixedUpdateTime; } + bool recordTime = (reportTimingCb != NULL); + SGTimeStamp timeStamp; while (loopCount-- > 0) { for (unsigned int i = 0; i < _members.size(); i++) { - SGTimeStamp timeStamp = SGTimeStamp::now(); - _members[i]->update(delta_time_sec); // indirect call - timeStamp = timeStamp - SGTimeStamp::now(); - double b = timeStamp.toUSecs(); - _members[i]->updateExecutionTime(b); - double threshold = _members[i]->getTimeWarningThreshold(); - if (( b > threshold ) && (b > 10000)) { - _members[i]->printTimingInformation(b); - } + if (recordTime) + timeStamp = SGTimeStamp::now(); + + _members[i]->update(delta_time_sec); // indirect call + + if ((recordTime)&&(reportTimingCb)) + { + timeStamp = SGTimeStamp::now() - timeStamp; + _members[i]->updateExecutionTime(timeStamp.toUSecs()); + } } } // of multiple update loop } -void -SGSubsystemGroup::collectDebugTiming(bool collect) +void +SGSubsystemGroup::reportTiming(void) { - for (unsigned int i = 0; i < _members.size(); i++) + for (unsigned int i = _members.size(); i > 0; i--) { - _members[i]->collectDebugTiming(collect); + _members[i-1]->reportTiming(); } } @@ -222,6 +281,16 @@ SGSubsystemGroup::resume () _members[i]->subsystem->resume(); } +string_list +SGSubsystemGroup::member_names() const +{ + string_list result; + for (unsigned int i = 0; i < _members.size(); i++) + result.push_back( _members[i]->name ); + + return result; +} + bool SGSubsystemGroup::is_suspended () const { @@ -267,26 +336,6 @@ SGSubsystemGroup::set_fixed_update_time(double dt) _fixedUpdateTime = dt; } -void -SGSubsystemGroup::Member::printTimingStatistics () -{ - if (collectTimeStats) { - double minTime = timeStat.min() / 1000; - double maxTime = timeStat.max() / 1000; - double meanTime = timeStat.mean() / 1000; - double stddev = timeStat.stdDev() / 1000; - - char buffer[256]; - snprintf(buffer, 256, "Timing summary for %20s.\n" - "- mean time: %04.2f ms.\n" - "- min time : %04.2f ms.\n" - "- max time : %04.2f ms.\n" - "- stddev : %04.2f ms.\n", name.c_str(), meanTime, minTime, maxTime, stddev); - SG_LOG(SG_GENERAL, SG_ALERT, buffer); - } -} - - bool SGSubsystemGroup::has_subsystem (const string &name) const { @@ -321,8 +370,8 @@ SGSubsystemGroup::Member::Member () subsystem(0), min_step_sec(0), elapsed_sec(0), - collectTimeStats(false), - exceptionCount(0) + exceptionCount(0), + initTime(0) { } @@ -364,37 +413,13 @@ SGSubsystemGroup::Member::update (double delta_time_sec) } -void -SGSubsystemGroup::Member::printTimingInformation(double time) -{ - if (collectTimeStats) { - SG_LOG(SG_GENERAL, SG_ALERT, "Subsystem Timing Alert : " << time << " " << name); - subsystem->printTimingInformation(); - } -} - -double SGSubsystemGroup::Member::getTimeWarningThreshold() -{ - return (timeStat.mean() + 3 * timeStat.stdDev()); -} - -void SGSubsystemGroup::Member::updateExecutionTime(double time) -{ - if (collectTimeStats) { - timeStat += time; - } -} - - - - - //////////////////////////////////////////////////////////////////////// // Implementation of SGSubsystemMgr. //////////////////////////////////////////////////////////////////////// -SGSubsystemMgr::SGSubsystemMgr () +SGSubsystemMgr::SGSubsystemMgr () : + _initPosition(0) { for (int i = 0; i < MAX_GROUPS; i++) { _groups[i] = new SGSubsystemGroup; @@ -419,6 +444,19 @@ SGSubsystemMgr::init () _groups[i]->init(); } +SGSubsystem::InitStatus +SGSubsystemMgr::incrementalInit() +{ + if (_initPosition >= MAX_GROUPS) + return INIT_DONE; + + InitStatus memberStatus = _groups[_initPosition]->incrementalInit(); + if (memberStatus == INIT_DONE) + ++_initPosition; + + return INIT_CONTINUE; +} + void SGSubsystemMgr::postinit () { @@ -439,6 +477,8 @@ SGSubsystemMgr::shutdown () // reverse order to prevent order dependency problems for (int i = MAX_GROUPS-1; i >= 0; i--) _groups[i]->shutdown(); + + _initPosition = 0; } @@ -465,14 +505,6 @@ SGSubsystemMgr::update (double delta_time_sec) } } -void -SGSubsystemMgr::collectDebugTiming(bool collect) -{ - for (int i = 0; i < MAX_GROUPS; i++) { - _groups[i]->collectDebugTiming(collect); - } -} - void SGSubsystemMgr::suspend () { @@ -547,4 +579,13 @@ SGSubsystemMgr::get_subsystem (const string &name) const return s->second; } -// end of fgfs.cxx +/** Trigger the timing callback to report data for all subsystems. */ +void +SGSubsystemMgr::reportTiming() +{ + for (int i = 0; i < MAX_GROUPS; i++) { + _groups[i]->reportTiming(); + } // of groups iteration +} + +// end of subsystem_mgr.cxx