wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework how rolled events are logged. Not very efficient, but it doesn't modify the cached version returned in queries.

This commit is contained in:
A.J. Beamon 2018-05-11 11:24:20 -07:00
parent 02df30149f
commit e2e69b5632
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flow/Trace.cpp
View File

@ -203,7 +203,7 @@ struct XmlTraceLogFormatter : public TraceLogFormatter, ReferenceCounted<XmlTrac
}
}
std::string formatEvent(TraceEventFields fields) {
std::string formatEvent(const TraceEventFields &fields) {
std::string event = "<Event ";
for(auto itr : fields) {
@ -511,11 +511,12 @@ public:
}
void writeEvent( TraceEventFields fields, std::string trackLatestKey, bool trackError ) {
fields.addField("logGroup", logGroup);
if(localAddress.present()) {
fields.addField("Machine", format("%d.%d.%d.%d:%d", (localAddress.get().ip>>24)&0xff, (localAddress.get().ip>>16)&0xff, (localAddress.get().ip>>8)&0xff, localAddress.get().ip&0xff, localAddress.get().port));
}
fields.addField("logGroup", logGroup);
if(!trackLatestKey.empty()) {
fields.addField("TrackLatestType", "Original");
}
@ -584,17 +585,17 @@ public:
std::vector<TraceEventFields> events = latestEventCache.getAllUnsafe();
for (int idx = 0; idx < events.size(); idx++) {
if(events[idx].size() > 0) {
TraceEventFields rolledFields = events[idx];
// TODO: do this better
std::string originalTime;
for(int i = 0; i < rolledFields.size(); ++i) {
if(rolledFields[i].first == "Time") {
rolledFields.addField("OriginalTime", rolledFields[i].second);
rolledFields.replaceValue(i, format("%.6f", (g_trace_clock == TRACE_CLOCK_NOW) ? now() : timer()));
TraceEventFields rolledFields;
for(auto itr = events[idx].begin(); itr != events[idx].end(); ++itr) {
if(itr->first == "Time") {
rolledFields.addField("Time", format("%.6f", (g_trace_clock == TRACE_CLOCK_NOW) ? now() : timer()));
rolledFields.addField("OriginalTime", itr->second);
}
else if(rolledFields[i].first == "TrackLatestType") {
rolledFields.replaceValue(i, "Rolled");
else if(itr->first == "TrackLatestType") {
rolledFields.addField("TrackLatestType", "Rolled");
}
else {
rolledFields.addField(itr->first, itr->second);
}
}
@ -1203,11 +1204,6 @@ const TraceEventFields::Field &TraceEventFields::operator[] (int index) const {
return fields.at(index);
}
void TraceEventFields::replaceValue(int index, std::string value) {
ASSERT(index >= 0 && index < size());
fields[index].second = value;
}
bool TraceEventFields::tryGetValue(std::string key, std::string &outValue) const {
for(auto itr = begin(); itr != end(); ++itr) {
if(itr->first == key) {

3
flow/Trace.h
View File

@ -63,7 +63,6 @@ public:
FieldIterator end() const;
void addField(std::string key, std::string value);
void replaceValue(int index, std::string value);
const Field &operator[] (int index) const;
bool tryGetValue(std::string key, std::string &outValue) const;
@ -198,7 +197,7 @@ struct TraceLogFormatter {
virtual const char* getExtension() = 0;
virtual const char* getHeader() = 0; // Called when starting a new file
virtual const char* getFooter() = 0; // Called when ending a file
virtual std::string formatEvent(TraceEventFields) = 0; // Called for each event
virtual std::string formatEvent(const TraceEventFields&) = 0; // Called for each event
virtual void addref() = 0;
virtual void delref() = 0;