X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fstructure%2Fsubsystem_mgr.hxx;h=60313fd4a3543a8f723f233dc66c660a0ecd2951;hb=c82df0590dd46347e2f1d0dca4cc3712f67f3654;hp=cd612335b97e43a0ff2cd9da9ead7cdf19d9923d;hpb=d22640ef4e938b523bdc30cd83370977d30de856;p=simgear.git
diff --git a/simgear/structure/subsystem_mgr.hxx b/simgear/structure/subsystem_mgr.hxx
index cd612335..60313fd4 100644
--- a/simgear/structure/subsystem_mgr.hxx
+++ b/simgear/structure/subsystem_mgr.hxx
@@ -14,7 +14,7 @@
//
// 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
@@ -25,23 +25,31 @@
#include
This method should set up all parts that depend on other + * subsystems. One example is the scripting/Nasal subsystem, which + * is initialized last. So, if a subsystem wants to execute Nasal + * code in subsystem-specific configuration files, it has to do that + * in its postinit() method.
+ */ + virtual void postinit (); + + /** * Reinitialize the subsystem. * @@ -149,6 +169,16 @@ public: virtual void reinit (); + /** + * Shutdown the subsystem. + * + *Release any state associated with subsystem. Shutdown happens in + * the reverse order to init(), so this is the correct place to do + * shutdown that depends on other subsystems. + *
+ */ + virtual void shutdown (); + /** * Acquire the subsystem's property bindings. * @@ -224,10 +254,42 @@ public: virtual bool is_suspended () const; + /** + * Keep track of execution time. + * + *This method keeps track of timing statistics for each subsystem.
+ * + * @param time execution time in ms of last call. + */ + void updateExecutionTime(double time); + + /** + * Print details of execution time. + * + *For debugging purposes, developers can place stamp() calls + * at strategic points in the update() function of each subsystem, which + * record the time between the successive calls to stamp. This method, + * printExecutionTime() is called after exectution of the subsystem + * update function itself to conduct a post-hoc analysis of excecution + * time
+ */ + void printTimingInformation(); + + /** + * Place time stamps at strategic points in the execution of subsystems + * update() member functions. Predominantly for debugging purposes. + */ + void stamp(const std::string& name); + + + protected: bool _suspended; + eventTimeVec timingInfo; + //int test; + }; @@ -243,7 +305,9 @@ public: virtual ~SGSubsystemGroup (); virtual void init (); + virtual void postinit (); virtual void reinit (); + virtual void shutdown (); virtual void bind (); virtual void unbind (); virtual void update (double delta_time_sec); @@ -251,32 +315,52 @@ public: virtual void resume (); virtual bool is_suspended () const; - virtual void set_subsystem (const string &name, + virtual void set_subsystem (const std::string &name, SGSubsystem * subsystem, double min_step_sec = 0); - virtual SGSubsystem * get_subsystem (const string &name); - virtual void remove_subsystem (const string &name); - virtual bool has_subsystem (const string &name) const; + virtual SGSubsystem * get_subsystem (const std::string &name); + virtual void remove_subsystem (const std::string &name); + virtual bool has_subsystem (const std::string &name) const; + + void collectDebugTiming(bool collect); + void printTimingStatistics(double minMaxTime=0.0,double minJitter=0.0); + /** + * + */ + void set_fixed_update_time(double fixed_dt); private: - struct Member { + class Member { - Member (); + private: Member (const Member &member); + public: + Member (); virtual ~Member (); virtual void update (double delta_time_sec); - - string name; + void printTimingInformation(double time); + void printTimingStatistics(double minMaxTime=0.0,double minJitter=0.0); + void updateExecutionTime(double time); + double getTimeWarningThreshold(); + void collectDebugTiming (bool collect) { collectTimeStats = collect; }; + + SampleStatistic timeStat; + std::string name; SGSubsystem * subsystem; double min_step_sec; double elapsed_sec; + bool collectTimeStats; + int exceptionCount; }; - Member * get_member (const string &name, bool create = false); + Member * get_member (const std::string &name, bool create = false); - vector