mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check for invalid Thread pointers while logging. 

Null pointers to the current thread are a source of seemingly weird bugs which
indicate a more serious problem.
metadata
Edgar Velazquez-Armendariz 2013-01-26 20:47:17 -05:00
parent d1cc20b3ee
commit 2fa360036c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/mitsuba/core/logger.h
View File

@ -33,7 +33,10 @@ MTS_NAMESPACE_BEGIN
/// Write a Log message to the console (to be used within subclasses of <tt>Object</tt>) /// Write a Log message to the console (to be used within subclasses of <tt>Object</tt>)
#define Log(level, fmt, ...) do { \ #define Log(level, fmt, ...) do { \
mitsuba::Logger *logger = mitsuba::Thread::getThread()->getLogger(); \ mitsuba::Thread *thread = mitsuba::Thread::getThread(); \
if (EXPECT_NOT_TAKEN(thread == NULL)) \
throw std::runtime_error("Null thread pointer"); \
mitsuba::Logger *logger = thread->getLogger(); \
if (level >= logger->getLogLevel()) \ if (level >= logger->getLogLevel()) \
logger->log(level, m_theClass, \ logger->log(level, m_theClass, \
__FILE__, __LINE__, fmt, ## __VA_ARGS__); \ __FILE__, __LINE__, fmt, ## __VA_ARGS__); \
@ -44,7 +47,10 @@ MTS_NAMESPACE_BEGIN
* outside of classes that derive from Object) * outside of classes that derive from Object)
*/ */
#define SLog(level, fmt, ...) do { \ #define SLog(level, fmt, ...) do { \
mitsuba::Logger *logger = mitsuba::Thread::getThread()->getLogger(); \ mitsuba::Thread *thread = mitsuba::Thread::getThread(); \
if (EXPECT_NOT_TAKEN(thread == NULL)) \
throw std::runtime_error("Null thread pointer"); \
mitsuba::Logger *logger = thread->getLogger(); \
if (level >= logger->getLogLevel()) \ if (level >= logger->getLogLevel()) \
logger->log(level, NULL, \ logger->log(level, NULL, \
__FILE__, __LINE__, fmt, ## __VA_ARGS__); \ __FILE__, __LINE__, fmt, ## __VA_ARGS__); \