X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fstructure%2Fsubsystem_mgr.hxx;h=5b449ccab160063b5539e8ae46cff2062d3f531c;hb=1f6555c9ad3fb75cb474fbf99b46333830285514;hp=c13c25d9ae0da4cfa78c9802bccd3f0fb49e6c35;hpb=dcb95d131bc6aef1abe25d1f415e309f06e52436;p=simgear.git

diff --git a/simgear/structure/subsystem_mgr.hxx b/simgear/structure/subsystem_mgr.hxx
index c13c25d9..5b449cca 100644
--- a/simgear/structure/subsystem_mgr.hxx
+++ b/simgear/structure/subsystem_mgr.hxx
@@ -25,23 +25,35 @@
 
 #include <simgear/compiler.h>
 
-#if 0
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#  include <float.h>
-#endif
-
-#include STL_STRING
-SG_USING_STD(string);
-
+#include <string>
+#include <map>
 #include <vector>
-SG_USING_STD(vector);
-#endif
 
-#include <map>
-SG_USING_STD(map);
+using std::map;
+using std::vector;
+using std::string;
 
 #include <simgear/props/props.hxx>
+#include <simgear/timing/timestamp.hxx>
+#include "SGSmplstat.hxx"
+
+
+class TimingInfo
+{
+private:
+    string eventName;
+    SGTimeStamp time;
+
+public: 
+    TimingInfo(const string& name, const SGTimeStamp &t) :
+        eventName(name), time(t)
+    { }
+    const string& getName() const { return eventName; }
+    const SGTimeStamp& getTime() const { return time; }
+};
+
+typedef vector<TimingInfo> eventTimeVec;
+typedef vector<TimingInfo>::iterator eventTimeVecIterator;
 
 
 
@@ -113,7 +125,7 @@ SG_USING_STD(map);
  * subsystems may also override the suspend() and resume() methods to
  * take different actions.</p>
  */
-class SGSubsystem
+class SGSubsystem : public SGReferenced
 {
 public:
 
@@ -236,10 +248,42 @@ public:
   virtual bool is_suspended () const;
 
 
+  /**
+   * Keep track of execution time.
+   *
+   * <p>This method keeps track of timing statistics for each subsystem.</p>
+   * 
+   * @param time execution time in ms of last call.
+   */
+  void updateExecutionTime(double time);
+
+  /**
+   * Print details of execution time.
+   *
+   * <p>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</p>
+   */ 
+  void printTimingInformation();
+
+  /**
+   * Place time stamps at strategic points in the execution of subsystems 
+   * update() member functions. Predominantly for debugging purposes.
+   */
+  void stamp(const string& name);
+  
+
+
 protected:
 
   bool _suspended;
 
+  eventTimeVec timingInfo;
+  //int test;
+
 };
 
 
@@ -271,25 +315,44 @@ public:
     virtual void remove_subsystem (const string &name);
     virtual bool has_subsystem (const 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);
+	void printTimingInformation(double time);
+        void printTimingStatistics();
+        void updateExecutionTime(double time);
+        double getTimeWarningThreshold();
+        void collectDebugTiming (bool collect) { collectTimeStats = collect; };
 
+        SampleStatistic timeStat;
         string name;
         SGSubsystem * subsystem;
         double min_step_sec;
         double elapsed_sec;
+        bool collectTimeStats;
+        int exceptionCount;
     };
 
     Member * get_member (const string &name, bool create = false);
 
     vector<Member *> _members;
+    
+    double _fixedUpdateTime;
+    double _updateTimeRemainder;
 };
 
 
@@ -321,6 +384,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
     };
 
@@ -346,6 +412,8 @@ public:
 
     virtual SGSubsystem * get_subsystem(const string &name);
 
+   void collectDebugTiming(bool collect);
+
 private:
 
     SGSubsystemGroup _groups[MAX_GROUPS];