Browse Source
- Removed PLog as a dependency. Unreal requires me to use its custom allocator, which std::string doesn't really work with. I wrote a logger with an interface similar to PLog's that only uses C strings - AgentGoalDefs are in a dictionary now - Sublime can now detect compilation errors. This is mostly for my own conveniencecombatComponentRefactor
Macoy Madson
6 years ago
18 changed files with 361 additions and 113 deletions
@ -1,30 +1,121 @@ |
|||
#include "Logging.hpp" |
|||
|
|||
#include <plog/Formatters/FuncMessageFormatter.h> |
|||
#include <plog/Appenders/ColorConsoleAppender.h> |
|||
#include <cstring> |
|||
#include <cstdlib> |
|||
#include <cstdio> |
|||
#include <algorithm> |
|||
|
|||
#include <iostream> |
|||
|
|||
namespace gv |
|||
{ |
|||
static bool gs_LoggingInitialized = false; |
|||
namespace Logging |
|||
{ |
|||
Record::Record(Severity newSeverity, const char* func, size_t line, const char* file) |
|||
: severity(newSeverity), Function(func), Line(line), File(file), Offset(0) |
|||
{ |
|||
} |
|||
|
|||
Record& Record::operator<<(char data) |
|||
{ |
|||
Offset += snprintf(OutBuffer + Offset, sizeof(OutBuffer) - Offset, "%d", (int)data); |
|||
return *this; |
|||
} |
|||
|
|||
Record& Record::operator<<(const char* data) |
|||
{ |
|||
Offset += snprintf(OutBuffer + Offset, sizeof(OutBuffer) - Offset, "%s", data); |
|||
return *this; |
|||
} |
|||
|
|||
Record& Record::operator<<(const int data) |
|||
{ |
|||
Offset += snprintf(OutBuffer + Offset, sizeof(OutBuffer) - Offset, "%d", data); |
|||
return *this; |
|||
} |
|||
|
|||
Record& Record::operator<<(const unsigned int data) |
|||
{ |
|||
Offset += snprintf(OutBuffer + Offset, sizeof(OutBuffer) - Offset, "%u", data); |
|||
return *this; |
|||
} |
|||
|
|||
Record& Record::operator<<(const float data) |
|||
{ |
|||
Offset += snprintf(OutBuffer + Offset, sizeof(OutBuffer) - Offset, "%f", data); |
|||
return *this; |
|||
} |
|||
|
|||
Record& Record::operator<<(const bool data) |
|||
{ |
|||
Offset += |
|||
snprintf(OutBuffer + Offset, sizeof(OutBuffer) - Offset, "%s", data ? "True" : "False"); |
|||
return *this; |
|||
} |
|||
|
|||
Record& Record::operator<<(const size_t data) |
|||
{ |
|||
Offset += snprintf(OutBuffer + Offset, sizeof(OutBuffer) - Offset, "%lu", (unsigned long)data); |
|||
return *this; |
|||
} |
|||
|
|||
void InitializeConsoleOnlyLogging() |
|||
void FormatFuncName(char* buffer, const char* func, size_t bufferSize) |
|||
{ |
|||
static plog::ColorConsoleAppender<plog::FuncMessageFormatter> s_ConsoleLogAppender; |
|||
const char* funcBegin = func; |
|||
const char* funcEnd = strchr(funcBegin, '('); |
|||
|
|||
if (!gs_LoggingInitialized) |
|||
if (!funcEnd) |
|||
{ |
|||
plog::init(plog::debug, &s_ConsoleLogAppender); |
|||
gs_LoggingInitialized = true; |
|||
strncpy(buffer, func, bufferSize - 1); |
|||
return; |
|||
} |
|||
|
|||
for (const char* i = funcEnd - 1; i >= funcBegin; |
|||
--i) // search backwards for the first space char
|
|||
{ |
|||
if (*i == ' ') |
|||
{ |
|||
funcBegin = i + 1; |
|||
break; |
|||
} |
|||
} |
|||
|
|||
unsigned long numCharsToCopy = std::min((funcEnd - funcBegin), (long)bufferSize - 1); |
|||
strncpy(buffer, funcBegin, numCharsToCopy); |
|||
buffer[numCharsToCopy] = '\0'; |
|||
} |
|||
|
|||
// Feel free to pass in NULL to get the default log file
|
|||
void InitializeFileOnlyLogging(const char* filename) |
|||
Logger::Logger(Severity maxSeverity, CustomLogOutputFunc customOutputFunc) |
|||
: MaxSeverity(maxSeverity), CustomOutputFunc(customOutputFunc) |
|||
{ |
|||
if (!gs_LoggingInitialized) |
|||
Singleton = this; |
|||
std::cout << "Logger initialized at " << Singleton << "\n"; |
|||
} |
|||
bool Logger::checkSeverity(Severity severity) const |
|||
{ |
|||
return severity <= MaxSeverity; |
|||
} |
|||
|
|||
void Logger::operator+=(const Record& record) |
|||
{ |
|||
if (CustomOutputFunc) |
|||
CustomOutputFunc(record); |
|||
else |
|||
{ |
|||
plog::init(plog::debug, filename ? filename : "LOCAL_Galavant.log"); |
|||
gs_LoggingInitialized = true; |
|||
static char funcNameBuffer[256]; |
|||
FormatFuncName(funcNameBuffer, record.Function, sizeof(funcNameBuffer)); |
|||
std::cout << severityToString(record.severity) << " " << record.File << ":" |
|||
<< funcNameBuffer << "():" << record.Line << ": " << record.OutBuffer << "\n"; |
|||
} |
|||
} |
|||
Logger* Logger::GetSingleton() |
|||
{ |
|||
if (!Singleton) |
|||
std::cout << "Warning: something tried to access Logger before any Logger had been " |
|||
"initialized!\n"; |
|||
return Singleton; |
|||
} |
|||
|
|||
Logger* Logger::Singleton = nullptr; |
|||
} |
|||
} |
|||
Loading…
Reference in new issue