Changeset 53bb8f1 for src/SymTab/Indexer.cc

Timestamp:

Mar 12, 2019, 3:00:54 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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:

30e32b2, a2545593

Parents:

9d9a451 (diff), 91d6584 (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 second draft of Aaron's thesis

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...
@@ -41 +42 @@
 
 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 << ")";
@@ -197 +235 @@
         }
 
-        Indexer::Indexer() : tables( 0 ), scope( 0 ) {}
-
-        Indexer::Indexer( const Indexer &that ) : doDebug( that.doDebug ), tables( newRef( that.tables ) ), scope( that.scope ) {}
+        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( Indexer &&that ) : doDebug( that.doDebug ), tables( that.tables ), scope( that.scope ) {
@@ -206 +248 @@
 
         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 );
         }
@@ -237 +288 @@
                 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() ) {
@@ -313 +367 @@
                 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() ) {
@@ -331 +388 @@
                 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() ) {
@@ -347 +407 @@
                 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() ) {