Changeset 91d6584

Timestamp:

Mar 10, 2019, 10:57:03 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, pthread-emulation, qualifiedEnum

Children:

1c35c78, 53bb8f1

Parents:

9e6955d (diff), fca6ca6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/Common/Stats/Time.cc

@@ -36 +36 @@
                         point_t global_begin;
 
-                        size_t prevl = 0;
-                        size_t currl = 0;
+                        int prevl = 0;
+                        int currl = 0;
 
                         template<typename T>
@@ -88 +88 @@
                                 virtual void print(std::ostream & os) override {
                                         if(currl > prevl) {
-                                                // std::cerr << "push last " << last << std::endl;
                                                 parents.push(last);
-                                        } else if(currl < prevl) {
+                                        }
+                                        for(auto lvl = prevl - currl; lvl > 0; lvl--) {
                                                 parents.pop();
-                                                // std::cerr << "pop, top = " << parents.top() << std::endl;
                                         }
-                                        // else {
-                                                last = end - begin;
-                                                // std::cerr << "last = " << last << "\t";
-                                        // }
+                                        last = end - begin;
 
                                         assert(finished);
@@ -136 +132 @@
                         std::stack<TimerNode *> nodes;
 
-                        std::chrono::duration<double> TimerNode::last = {};
-                        std::stack<std::chrono::duration<double>> TimerNode::parents = {};
+                        std::chrono::duration<double> TimerNode::last;
+                        std::stack<std::chrono::duration<double>> TimerNode::parents;
 
                         void StartGlobal() {