AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

More work on improved logging.

Browse Source
This commit is contained in:
Daviw Williams 2013-05-15 15:55:39 +02:00
parent 1010052ea6
commit a1355f6d50
3 changed files with 63 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/PolyVoxCore/include/PolyVoxCore/Impl/Config.h
View File

@ -25,7 +25,6 @@ freely, subject to the following restrictions:
#define __PolyVox_Config_H__ #define __PolyVox_Config_H__
#define POLYVOX_ASSERTS_ENABLED #define POLYVOX_ASSERTS_ENABLED
#define POLYVOX_LOGGING_ENABLED
#define POLYVOX_THROW_ENABLED #define POLYVOX_THROW_ENABLED
#endif #endif

24
library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
View File

@ -29,6 +29,7 @@ freely, subject to the following restrictions:
#include <cstdlib> // For std::exit #include <cstdlib> // For std::exit
#include <iostream> // For std::cerr #include <iostream> // For std::cerr
#include <stdexcept> #include <stdexcept>
#include <sstream>
#include <string.h> // Exception constuctors take strings. #include <string.h> // Exception constuctors take strings.
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -82,8 +83,15 @@ namespace PolyVox
LogHandler getLogHandler(); LogHandler getLogHandler();
void setLogHandler(LogHandler newHandler); void setLogHandler(LogHandler newHandler);
//The actual logging function // The actual logging function
void log(const std::string& message, LogLevel logLevel); void log(const std::string& message, LogLevel logLevel);
// Some handy wrappers
void logDebug (const std::string& message);
void logInfo (const std::string& message);
void logWarning(const std::string& message);
void logError (const std::string& message);
void logFatal (const std::string& message);
} }
/* /*
@ -106,12 +114,14 @@ namespace PolyVox
{ \ { \
if (!(condition)) \ if (!(condition)) \
{ \ { \
std::cerr << std::endl << std::endl; \ std::stringstream ss; \
std::cerr << " PolyVox Assertion Failed!" << std::endl; \ ss << std::endl << std::endl; \
std::cerr << " =========================" << std::endl; \ ss << " PolyVox Assertion Failed!" << std::endl; \
std::cerr << " Condition: " << #condition << std::endl; \ ss << " =========================" << std::endl; \
std::cerr << " Message: " << (message) << std::endl; \ ss << " Condition: " << #condition << std::endl; \
std::cerr << " Location: " << "Line " << __LINE__ << " of " << __FILE__ << std::endl << std::endl; \ ss << " Message: " << (message) << std::endl; \
ss << " Location: " << "Line " << __LINE__ << " of " << __FILE__ << std::endl << std::endl; \
logFatal(ss.str()); \
POLYVOX_HALT(); \ POLYVOX_HALT(); \
} \ } \
} while(0) \ } while(0) \

64
library/PolyVoxCore/source/Impl/ErrorHandling.cpp
View File

@ -82,29 +82,57 @@ namespace PolyVox
} }
} }
// Some handy wrappers
void logDebug(const std::string& message)
{
log(message, LogLevels::Debug );
}
void logInfo(const std::string& message)
{
log(message, LogLevels::Info);
}
void logWarning(const std::string& message)
{
log(message, LogLevels::Warning);
}
void logError(const std::string& message)
{
log(message, LogLevels::Error);
}
void logFatal(const std::string& message)
{
log(message, LogLevels::Fatal);
}
#ifndef POLYVOX_THROW_ENABLED #ifndef POLYVOX_THROW_ENABLED
void defaultThrowHandler(std::exception& e, const char* file, int line) void defaultThrowHandler(std::exception& e, const char* file, int line)
{ {
std::cerr << std::endl << std::endl; \ std::stringstream ss; \
std::cerr << " PolyVox exception thrown!" << std::endl; \ ss << std::endl << std::endl; \
std::cerr << " =========================" << std::endl; \ ss << " PolyVox exception thrown!" << std::endl; \
std::cerr << " PolyVox has tried to throw an exception but it was built without support" << std::endl; \ ss << " =========================" << std::endl; \
std::cerr << " for exceptions. In this scenario PolyVox will call a 'throw handler'" << std::endl; \ ss << " PolyVox has tried to throw an exception but it was built without support" << std::endl; \
std::cerr << " and this message is being printed by the default throw handler." << std::endl << std::endl; \ ss << " for exceptions. In this scenario PolyVox will call a 'throw handler'" << std::endl; \
ss << " and this message is being printed by the default throw handler." << std::endl << std::endl; \
std::cerr << " If you don't want to enable exceptions then you should try to determine why" << std::endl; \ ss << " If you don't want to enable exceptions then you should try to determine why" << std::endl; \
std::cerr << " this exception was thrown and make sure it doesn't happen again. If it was" << std::endl; \ ss << " this exception was thrown and make sure it doesn't happen again. If it was" << std::endl; \
std::cerr << " due to something like an invalid argument to a function then you should be" << std::endl; \ ss << " due to something like an invalid argument to a function then you should be" << std::endl; \
std::cerr << " able to fix it quite easily by validating parameters as appropriate. More" << std::endl; \ ss << " able to fix it quite easily by validating parameters as appropriate. More" << std::endl; \
std::cerr << " complex exception scenarios (out of memory, etc) might be harder to fix and" << std::endl; \ ss << " complex exception scenarios (out of memory, etc) might be harder to fix and" << std::endl; \
std::cerr << " you should replace this default handler with something which is more" << std::endl; \ ss << " you should replace this default handler with something which is more" << std::endl; \
std::cerr << " meaningful to your users." << std::endl << std::endl; \ ss << " meaningful to your users." << std::endl << std::endl; \
std::cerr << " Exception details" << std::endl; \ ss << " Exception details" << std::endl; \
std::cerr << " -----------------" << std::endl; \ ss << " -----------------" << std::endl; \
std::cerr << " Line: " << line << std::endl; \ ss << " Line: " << line << std::endl; \
std::cerr << " File: " << file << std::endl; \ ss << " File: " << file << std::endl; \
std::cerr << " Message: " << e.what() << std::endl << std::endl; \ ss << " Message: " << e.what() << std::endl << std::endl; \
logFatal(ss.str()); \
POLYVOX_HALT(); \ POLYVOX_HALT(); \
} }