Changeset b38433b for src/Common/Stats/Counter.cc

Timestamp:

Mar 5, 2019, 6:17:55 PM (6 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, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

b830e046, c101756

Parents:

34737de (diff), 972540e (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/Counter.cc (modified) (4 diffs)

src/Common/Stats/Counter.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Heap.h --
+// Counter.cc --
 //
 // Author           : Thierry Delisle
@@ -18 +18 @@
 #include <algorithm>
 #include <cstring>
+#include <functional>
 #include <iomanip>
 
 namespace Stats {
         namespace Counters {
-
-                template<typename T>
-                void ForAllCounters(BaseCounter::list_t & range, size_t level, T func) {
-                        auto it = range.head;
-                        while(it) {
-                                auto next = it->next;
-                                func(it, level);
-                                ForAllCounters(it->children, level + 1, func);
-                                it = next;
-                        }
-                }
-
                 void print() {
-                        if(!BaseCounter::top.head) return;
+                        if(!top.head) return;
                         size_t nc = 0;
-                        ForAllCounters(BaseCounter::top, 0, [&](BaseCounter * node, size_t level) {
+                        Base::ForAll(top, 0, [&](Base::TreeImpl * node, size_t level) {
                                 nc = std::max(nc, (4 * level) + std::strlen(node->name));
                         });
@@ -49 +38 @@
 
 
-                        ForAllCounters(BaseCounter::top, 0, [&](BaseCounter * node, size_t level) {
+                        Base::ForAll(top, 0, [&](Base::TreeImpl * node, size_t level) {
                                 std::cerr << std::string(level * 4, ' ');
                                 std::cerr << node->name;
@@ -58 +47 @@
                                 std::cerr << " |";
                                 std::cerr << '\n';
-                                delete node;
-                        });
+                        }, true);
 
                         std::cerr << std::string(nct, '-') << std::endl;
                 }
 
-                BaseCounter::list_t BaseCounter::top;
+                Base::TreeTop top;
+
+                extern bool enabled;
         }
 }