Changeset 3c0d4cd for src/Common

Timestamp:

Mar 5, 2019, 2:17:45 PM (6 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c884f2d

Parents:

79eaeb7

Message:

Fixed/implemented % of parent printing in timing sections

File:

• src/Common/Stats/Time.cc (modified) (6 diffs)

src/Common/Stats/Time.cc

@@ -33 +33 @@
                         typedef  std::chrono::time_point<std::chrono::high_resolution_clock> point_t;
                         std::chrono::duration<double> total;
-                        std::chrono::duration<double> parent;
 
                         point_t global_begin;
+
+                        size_t prevl = 0;
+                        size_t currl = 0;
 
                         template<typename T>
@@ -85 +87 @@
 
                                 virtual void print(std::ostream & os) override {
+                                        if(currl > prevl) {
+                                                parents.push(last);
+                                        } else if(currl < prevl) {
+                                                parents.pop();
+                                        } else {
+                                                last = end - begin;
+                                        }
+
                                         assert(finished);
                                         std::chrono::duration<double> diff = end - begin;
                                         os << diff << " | ";
-                                        os << std::setw(7) << std::setprecision(0);
-                                        os << size_t(100.0 * diff.count() / total.count()) << "% | ";
+                                        if(parents.empty()) {
+                                                os << "     N/A | ";
+                                        } else {
+                                                os << std::setw(7) << std::setprecision(0);
+                                                os << size_t(100.0 * diff.count() / parents.top().count()) << "% | ";
+                                        }
                                         os << std::setw(5) << std::setprecision(0);
                                         os << size_t(100.0 * diff.count() / total.count()) << "% ";
@@ -111 +125 @@
                                 point_t begin;
                                 point_t end;
+
+                                static std::chrono::duration<double> last;
+                                static std::stack<std::chrono::duration<double>> parents;
                         };
 
                         std::stack<TimerNode *> nodes;
+
+                        std::chrono::duration<double> TimerNode::last = {};
+                        std::stack<std::chrono::duration<double>> TimerNode::parents = {};
 
                         void StartGlobal() {
@@ -139 +159 @@
                                 auto global_end = std::chrono::high_resolution_clock::now();
                                 total = global_end - global_begin;
-                                parent = total;
 
                                 size_t nc = 0;
@@ -161 +180 @@
 
                                 Base::ForAll(top, 0, [&](Base::TreeImpl * node, size_t level) {
+                                        currl = level;
                                         std::cerr << std::string(level * 4, ' ');
                                         std::cerr << node->name;
@@ -168 +188 @@
                                         std::cerr << " |";
                                         std::cerr << '\n';
+                                        prevl = level;
                                 }, true);