FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stderr log filtering.

Browse Source 
Thanks to Stuart for pointing this out!
This commit is contained in:
James Turner 2013-02-08 09:51:58 +00:00
parent 979aea5212
commit a72a3ce5f3
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
simgear/debug/logstream.cxx
View File

@ -98,7 +98,9 @@ private:
class StderrLogCallback : public simgear::LogCallback class StderrLogCallback : public simgear::LogCallback
{ {
public: public:
StderrLogCallback() StderrLogCallback(sgDebugClass c, sgDebugPriority p) :
m_class(c),
m_priority(p)
{ {
#ifdef _WIN32 #ifdef _WIN32
AllocConsole(); // but only if we want a console AllocConsole(); // but only if we want a console
@ -107,10 +109,18 @@ public:
freopen("conout$", "w", stderr); freopen("conout$", "w", stderr);
#endif #endif
} }
void setLogLevels( sgDebugClass c, sgDebugPriority p )
{
m_priority = p;
m_class = c;
}
virtual void operator()(sgDebugClass c, sgDebugPriority p, virtual void operator()(sgDebugClass c, sgDebugPriority p,
const char* file, int line, const std::string& aMessage) const char* file, int line, const std::string& aMessage)
{ {
if ((c & m_class) == 0 || p < m_priority) return;
// if running under MSVC, we could use OutputDebugString here // if running under MSVC, we could use OutputDebugString here
fprintf(stderr, "%s\n", aMessage.c_str()); fprintf(stderr, "%s\n", aMessage.c_str());
@ -119,7 +129,8 @@ public:
fflush(stderr); fflush(stderr);
} }
private: private:
sgDebugClass m_class;
sgDebugPriority m_priority;
}; };
namespace simgear namespace simgear
@ -196,9 +207,13 @@ private:
}; };
public: public:
LogStreamPrivate() : LogStreamPrivate() :
m_logClass(SG_ALL), m_logPriority(SG_WARN), m_logClass(SG_ALL),
m_logPriority(SG_ALERT),
m_isRunning(false) m_isRunning(false)
{ } {
m_stderrCallback = new StderrLogCallback(m_logClass, m_logPriority);
addCallback(m_stderrCallback);
}
SGMutex m_lock; SGMutex m_lock;
SGBlockingQueue<LogEntry> m_entries; SGBlockingQueue<LogEntry> m_entries;
@ -206,6 +221,7 @@ public:
sgDebugClass m_logClass; sgDebugClass m_logClass;
sgDebugPriority m_logPriority; sgDebugPriority m_logPriority;
bool m_isRunning; bool m_isRunning;
StderrLogCallback* m_stderrCallback;
void startLog() void startLog()
{ {
@ -219,6 +235,8 @@ public:
{ {
while (1) { while (1) {
LogEntry entry(m_entries.pop()); LogEntry entry(m_entries.pop());
// special marker entry detected, terminate the thread since we are
// making a configuration change or quitting the app
if ((entry.debugClass == SG_NONE) && !strcmp(entry.file, "done")) { if ((entry.debugClass == SG_NONE) && !strcmp(entry.file, "done")) {
return; return;
} }
@ -256,6 +274,17 @@ public:
} }
} }
void setLogLevels( sgDebugClass c, sgDebugPriority p )
{
bool wasRunning = stop();
m_logPriority = p;
m_logClass = c;
m_stderrCallback->setLogLevels(c, p);
if (wasRunning) {
startLog();
}
}
bool would_log( sgDebugClass c, sgDebugPriority p ) const bool would_log( sgDebugClass c, sgDebugPriority p ) const
{ {
if (p >= SG_INFO) return true; if (p >= SG_INFO) return true;
@ -278,17 +307,13 @@ static LogStreamPrivate* global_privateLogstream = NULL;
logstream::logstream() logstream::logstream()
{ {
global_privateLogstream = new LogStreamPrivate; global_privateLogstream = new LogStreamPrivate;
global_privateLogstream->addCallback(new StderrLogCallback);
global_privateLogstream->startLog(); global_privateLogstream->startLog();
} }
void void
logstream::setLogLevels( sgDebugClass c, sgDebugPriority p ) logstream::setLogLevels( sgDebugClass c, sgDebugPriority p )
{ {
// we don't guard writing these with a mutex, since we assume setting global_privateLogstream->setLogLevels(c, p);
// occurs very rarely, and any data races are benign.
global_privateLogstream->m_logClass = c;
global_privateLogstream->m_logPriority = p;
} }
void void