fly/flightgear
1
0
Fork 0
Code Activity

Error-reporting: capture some properties to report

Browse source 
In the full error report, capture various property values to
aid debugging / investigation.
This commit is contained in:
James Turner 2021-04-02 10:48:39 +01:00
parent 5dae2d129e
commit 664652ae39
1 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/Main/ErrorReporter.cxx
View file

@ -229,6 +229,8 @@ public:
using AggregateErrors = std::vector<AggregateReport>; using AggregateErrors = std::vector<AggregateReport>;
AggregateErrors _aggregated; AggregateErrors _aggregated;
int _activeReportIndex = -1; int _activeReportIndex = -1;
string_list _significantProperties; ///< properties we want to include in reports, for debugging
/** /**
find the appropriate agrgegate for an error, based on its context find the appropriate agrgegate for an error, based on its context
*/ */
@ -335,6 +337,7 @@ public:
void writeReportToStream(const AggregateReport& report, std::ostream& os) const; void writeReportToStream(const AggregateReport& report, std::ostream& os) const;
void writeContextToStream(const ErrorOcurrence& error, std::ostream& os) const; void writeContextToStream(const ErrorOcurrence& error, std::ostream& os) const;
void writeLogToStream(const ErrorOcurrence& error, std::ostream& os) const; void writeLogToStream(const ErrorOcurrence& error, std::ostream& os) const;
void writeSignificantPropertiesToStream(std::ostream& os) const;
bool dismissReportCommand(const SGPropertyNode* args, SGPropertyNode*); bool dismissReportCommand(const SGPropertyNode* args, SGPropertyNode*);
bool saveReportCommand(const SGPropertyNode* args, SGPropertyNode*); bool saveReportCommand(const SGPropertyNode* args, SGPropertyNode*);
@ -486,8 +489,25 @@ void ErrorReporter::ErrorReporterPrivate::writeReportToStream(const AggregateRep
os << "\t" << o << "\n"; os << "\t" << o << "\n";
} }
os << endl; os << endl;
writeSignificantPropertiesToStream(os);
} }
void ErrorReporter::ErrorReporterPrivate::writeSignificantPropertiesToStream(std::ostream& os) const
{
os << "Properties:" << endl;
for (const auto& ps : _significantProperties) {
auto node = fgGetNode(ps);
if (!node) {
os << "\t" << ps << ": not defined\n";
} else {
os << "\t" << ps << ": " << node->getStringValue() << "\n";
}
}
os << endl;
}
bool ErrorReporter::ErrorReporterPrivate::dismissReportCommand(const SGPropertyNode* args, SGPropertyNode*) bool ErrorReporter::ErrorReporterPrivate::dismissReportCommand(const SGPropertyNode* args, SGPropertyNode*)
{ {
std::lock_guard<std::mutex> g(_lock); std::lock_guard<std::mutex> g(_lock);
@ -585,6 +605,29 @@ bool ErrorReporter::ErrorReporterPrivate::AggregateReport::addOccurence(const Er
ErrorReporter::ErrorReporter() : d(new ErrorReporterPrivate) ErrorReporter::ErrorReporter() : d(new ErrorReporterPrivate)
{ {
d->_logCallback.reset(new RecentLogCallback); d->_logCallback.reset(new RecentLogCallback);
// define significant properties
d->_significantProperties = {
"/sim/aircraft-id",
"/sim/aircraft-dir",
"/sim/rendering/gl-version",
"/sim/rendering/gl-renderer",
"/sim/rendering/gl-shading-language-version",
"/sim/rendering/max-texture-size",
"/sim/rendering/max-texture-units",
"/sim/rendering/shaders/skydome",
"/sim/rendering/shaders/water",
"/sim/rendering/shaders/model",
"/sim/rendering/shaders/landmass",
"/sim/rendering/shaders/vegetation-effects",
"/sim/rendering/shaders/transition",
"/sim/rendering/max-paged-lod",
"/sim/rendering/photoscenery/enabled",
"/sim/rendering/preset-description",
"/sim/rendering/multithreading-mode",
"/sim/rendering/multi-sample-buffers",
"/sim/rendering/multi-samples",
"/scenery/use-vpb"};
} }
void ErrorReporter::bind() void ErrorReporter::bind()