X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fstructure%2Fsubsystem_mgr.hxx;h=212ce58455330b4d2db7e0e48ea6c3758d08f344;hb=ddf9e08069406be1beb95ce3ac00ae59731a6d78;hp=cd612335b97e43a0ff2cd9da9ead7cdf19d9923d;hpb=d22640ef4e938b523bdc30cd83370977d30de856;p=simgear.git diff --git a/simgear/structure/subsystem_mgr.hxx b/simgear/structure/subsystem_mgr.hxx index cd612335..212ce584 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 -#if 0 -#ifdef HAVE_WINDOWS_H -# include -# include -#endif +#include +#include +#include -#include STL_STRING -SG_USING_STD(string); +#include +#include +#include "SGSmplstat.hxx" -#include -SG_USING_STD(vector); -#endif -#include -SG_USING_STD(map); +class TimingInfo +{ +private: + std::string eventName; + SGTimeStamp time; + +public: + TimingInfo(const std::string& name, const SGTimeStamp &t) : + eventName(name), time(t) + { } + const std::string& getName() const { return eventName; } + const SGTimeStamp& getTime() const { return time; } +}; -#include +typedef std::vector eventTimeVec; +typedef std::vector::iterator eventTimeVecIterator; @@ -113,7 +121,7 @@ SG_USING_STD(map); * subsystems may also override the suspend() and resume() methods to * take different actions.

*/ -class SGSubsystem +class SGSubsystem : public SGReferenced { public: @@ -140,6 +148,18 @@ public: virtual void init (); + /** + * Initialize parts that depend on other subsystems having been initialized. + * + *

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. * @@ -224,10 +244,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,6 +295,7 @@ public: virtual ~SGSubsystemGroup (); virtual void init (); + virtual void postinit (); virtual void reinit (); virtual void bind (); virtual void unbind (); @@ -251,32 +304,51 @@ 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 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(); + 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 _members; + std::vector _members; + + double _fixedUpdateTime; + double _updateTimeRemainder; }; @@ -308,6 +380,9 @@ public: enum GroupType { INIT = 0, GENERAL, + FDM, ///< flight model, autopilot, instruments that run coupled + POST_FDM, ///< certain subsystems depend on FDM data + DISPLAY, ///< view, camera, rendering updates MAX_GROUPS }; @@ -315,6 +390,7 @@ public: virtual ~SGSubsystemMgr (); virtual void init (); + virtual void postinit (); virtual void reinit (); virtual void bind (); virtual void unbind (); @@ -328,14 +404,24 @@ public: GroupType group = GENERAL, double min_time_sec = 0); + /** + * remove a subsystem, and return a pointer to it. + * returns NULL if the subsystem was not found. + */ + virtual SGSubsystem* remove(const char* name); + virtual SGSubsystemGroup * get_group (GroupType group); - virtual SGSubsystem * get_subsystem(const string &name); + virtual SGSubsystem * get_subsystem(const std::string &name) const; + + void collectDebugTiming(bool collect); private: SGSubsystemGroup _groups[MAX_GROUPS]; - map _subsystem_map; + + typedef std::map SubsystemDict; + SubsystemDict _subsystem_map; };