Changes in src/SymTab/Indexer.cc [79de2210: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 {
-                auto idtable_group = new Stats::Counters::CounterGroup("IdTable");
-                auto idtable_find  = new Stats::Counters::SimpleCounter("Find calls", idtable_group);
-                auto idtable_size  = new Stats::Counters::AverageCounter<double>("Average Size", idtable_group);
-                auto idtable_key   = new Stats::Counters::AverageCounter<double>("Average Key Size", idtable_group);
-
-                auto indexers_group = new Stats::Counters::CounterGroup("Indexers");
-                auto indexers_count = new Stats::Counters::SimpleCounter("Count", indexers_group);
-                auto indexers_size  = new Stats::Counters::AverageCounter<double>("Average Size", indexers_group);
-                auto indexers_depth_a  = new Stats::Counters::AverageCounter<double>("Average Depth", indexers_group);
-                auto indexers_depth_m  = new Stats::Counters::MaxCounter<size_t>("Max Depth", indexers_group);
-        }
-
         std::ostream & operator<<( std::ostream & out, const Indexer::IdData & data ) {
                 return out << "(" << data.id << "," << data.baseExpr << ")";
@@ -213 +197 @@
         }
 
-        Indexer::Indexer() : tables( 0 ), scope( 0 ) {
-                (*indexers_count)++;
-        }
-
-        Indexer::Indexer( const Indexer &that ) : doDebug( that.doDebug ), tables( newRef( that.tables ) ), scope( that.scope ) {
-                (*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 ) {
@@ -226 +206 @@
 
         Indexer::~Indexer() {
-                if(tables) {
-                        indexers_size->push( tables->idTable.size() );
-                        size_t depth = 1;
-                        for( auto crnt = tables->base.tables; crnt; crnt = crnt->base.tables ) {
-                                ++depth;
-                        }
-                        indexers_depth_a->push( depth );
-                        indexers_depth_m->push( depth );
-                }
                 deleteRef( tables );
         }
@@ -266 +237 @@
                 while ( searchTables ) {
 
-                        (*idtable_find)++;
-                        idtable_key->push( id.size() );
-                        idtable_size->push( searchTables->idTable.size() );
                         IdTable::const_iterator decls = searchTables->idTable.find( id );
                         if ( decls != searchTables->idTable.end() ) {
@@ -345 +313 @@
                 if ( tables->scope < scope ) return nullptr;
 
-                (*idtable_find)++;
-                idtable_key->push( id.size() );
-                idtable_size->push( tables->idTable.size() );
                 IdTable::const_iterator decls = tables->idTable.find( id );
                 if ( decls != tables->idTable.end() ) {
@@ -366 +331 @@
                 if ( tables->scope < scope ) return false;
 
-                (*idtable_find)++;
-                idtable_key->push( id.size() );
-                idtable_size->push( tables->idTable.size() );
                 IdTable::const_iterator decls = tables->idTable.find( id );
                 if ( decls != tables->idTable.end() ) {
@@ -385 +347 @@
                 if ( tables->scope < scope ) return false;
 
-                (*idtable_find)++;
-                idtable_key->push( id.size() );
-                idtable_size->push( tables->idTable.size() );
                 IdTable::const_iterator decls = tables->idTable.find( id );
                 if ( decls != tables->idTable.end() ) {