Changes in src/SymTab/Indexer.cc [1cb7fab2:ed34540]

File:

• src/SymTab/Indexer.cc (modified) (8 diffs)

src/SymTab/Indexer.cc

@@ -26 +26 @@
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for cloneAll
-#include "Common/Stats/Counter.h" // for counters
 #include "GenPoly/GenPoly.h"
 #include "InitTweak/InitTweak.h"   // for isConstructor, isCopyFunction, isC...
@@ -42 +41 @@
 
 namespace SymTab {
-
-        // Statistics block
-        namespace {
-
-                static inline auto stats_idtable() {
-                        using namespace Stats::Counters;
-                        static auto group = build<CounterGroup>("IdTable");
-                        static struct {
-                                SimpleCounter * find;
-                                AverageCounter<double> * size;
-                                AverageCounter<double> * key;
-                        } ret = {
-                                .find = build<SimpleCounter>("Find calls", group),
-                                .size = build<AverageCounter<double>>("Average Size", group),
-                                .key  = build<AverageCounter<double>>("Average Key Size", group),
-                        };
-                        return ret;
-                }
-
-                static inline auto stats_indexers() {
-                        using namespace Stats::Counters;
-                        static auto group   = build<CounterGroup>("Indexers");
-                        static struct {
-                                SimpleCounter * count;
-                                AverageCounter<double> * size;
-                                AverageCounter<double> * depth_a;
-                                MaxCounter<size_t> * depth_m;
-                        } ret = {
-                                .count   = build<SimpleCounter>("Count", group),
-                                .size    = build<AverageCounter<double>>("Average Size", group),
-                                .depth_a = build<AverageCounter<double>>("Average Depth", group),
-                                .depth_m = build<MaxCounter<size_t>>("Max Depth", group),
-                        };
-                        return ret;
-                }
-        }
-
         std::ostream & operator<<( std::ostream & out, const Indexer::IdData & data ) {
                 return out << "(" << data.id << "," << data.baseExpr << ")";
@@ -235 +197 @@
         }
 
-        Indexer::Indexer() : tables( 0 ), scope( 0 ) {
-                (*stats_indexers().count)++;
-        }
-
-        Indexer::Indexer( const Indexer &that ) : doDebug( that.doDebug ), tables( newRef( that.tables ) ), scope( that.scope ) {
-                (*stats_indexers().count)++;
-        }
+        Indexer::Indexer() : tables( 0 ), scope( 0 ) {}
+
+        Indexer::Indexer( const Indexer &that ) : doDebug( that.doDebug ), tables( newRef( that.tables ) ), scope( that.scope ) {}
 
         Indexer::Indexer( Indexer &&that ) : doDebug( that.doDebug ), tables( that.tables ), scope( that.scope ) {
@@ -248 +206 @@
 
         Indexer::~Indexer() {
-                if(tables) {
-                        stats_indexers().size->push( tables->idTable.size() );
-                        size_t depth = 1;
-                        for( auto crnt = tables->base.tables; crnt; crnt = crnt->base.tables ) {
-                                ++depth;
-                        }
-                        stats_indexers().depth_a->push( depth );
-                        stats_indexers().depth_m->push( depth );
-                }
                 deleteRef( tables );
         }
@@ -288 +237 @@
                 while ( searchTables ) {
 
-                        (*stats_idtable().find)++;
-                        stats_idtable().key->push( id.size() );
-                        stats_idtable().size->push( searchTables->idTable.size() );
                         IdTable::const_iterator decls = searchTables->idTable.find( id );
                         if ( decls != searchTables->idTable.end() ) {
@@ -367 +313 @@
                 if ( tables->scope < scope ) return nullptr;
 
-                (*stats_idtable().find)++;
-                stats_idtable().key->push( id.size() );
-                stats_idtable().size->push( tables->idTable.size() );
                 IdTable::const_iterator decls = tables->idTable.find( id );
                 if ( decls != tables->idTable.end() ) {
@@ -388 +331 @@
                 if ( tables->scope < scope ) return false;
 
-                (*stats_idtable().find)++;
-                stats_idtable().key->push( id.size() );
-                stats_idtable().size->push( tables->idTable.size() );
                 IdTable::const_iterator decls = tables->idTable.find( id );
                 if ( decls != tables->idTable.end() ) {
@@ -407 +347 @@
                 if ( tables->scope < scope ) return false;
 
-                (*stats_idtable().find)++;
-                stats_idtable().key->push( id.size() );
-                stats_idtable().size->push( tables->idTable.size() );
                 IdTable::const_iterator decls = tables->idTable.find( id );
                 if ( decls != tables->idTable.end() ) {