Commit 016ffa04 authored by Philip Trettner's avatar Philip Trettner
parents f946a7bc c801d2bc
......@@ -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 << " ~ ";
......
......@@ -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);
}
......
......@@ -49,6 +49,6 @@ public:
private:
ActionLabel(std::string const& name, std::string const& function, std::string const& file, int line, int idx);
friend class ActionPackage;
friend class ActionPackage;
};
}
......@@ -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
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment