Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/ptrettner/aion

src/aion/ActionAnalyzer.cc

@@ -159,6 +159,8 @@ void ActionAnalyzer::dumpSummary(std::ostream &oss, bool verbose)
             oss << "  " << desc << std::string(nameLength - desc.size(), ' ') << "   ";
             oss << aion_fmt::format(cntFmt, a->count()) << "x ";
             aion_systime::formatHuman(a->averageNS(), oss);
+            oss << " = ";
+            aion_systime::formatHuman(a->totalTimeNS(), oss);
             oss << " (";
             aion_systime::formatHuman(a->minNS(), oss);
             oss << " ~ ";

src/aion/ActionLabel.cc

@@ -102,6 +102,16 @@ void ActionLabel::startEntry()
     ActionEntry e;
     e.labelIdx = mIndex;
     writeTime(e);
+    if (!sEntries)
+    {
+        sLabelLock.lock();
+        if (!sEntries)
+        {
+            sEntries = new std::vector<ActionEntry>();
+            sEntriesPerThread.push_back(sEntries);
+        }
+        sLabelLock.unlock();
+    }
     sEntries->push_back(e);
 }
 

src/aion/ActionTree.cc

@@ -76,7 +76,7 @@ SharedActionTree ActionTree::construct(const std::vector<ActionEntry> &entries,
 
     _ actionIdx = size_t{0};
     Action *prevAction = nullptr;
-    int64_t lastTime;
+    int64_t lastTime = -1;
     for (_ const &e : entries)
     {
         // start action

src/aion/common/NetMessage.cc

@@ -160,6 +160,7 @@ void NetMessage::verifyTypeInfo(const std::string &type, const std::string &fiel
                 std::cerr << "Trying to read a std::string with size " << size << "which is quite too long" << std::endl;
                 assert(0);
             }
+            delete[] stype;
             mGood = false;
             return;
         }