atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correction log error

Browse Source
This commit is contained in:
Edouard DUPIN 2014-04-18 23:22:25 +02:00
parent 2e6fae8db5
commit 31f670a70b
3 changed files with 66 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
etk/Stream.cpp
View File

@ -63,11 +63,9 @@ etk::CStart etk::cstart;
etk::CCout& etk::operator <<(etk::CCout &_os, const enum etk::logLevel _obj) { etk::CCout& etk::operator <<(etk::CCout &_os, const enum etk::logLevel _obj) {
switch (_obj) { switch (_obj) {
case logLevelCritical: case logLevelCritical:
#if (!defined(__TARGET_OS__Windows) && !defined(__TARGET_OS__IOs)) if (_os.m_enableColor == true) {
if (_os.m_enableColor == true) { _os << ETK_BASH_COLOR_BOLD_RED;
_os << ETK_BASH_COLOR_BOLD_RED; }
}
#endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
_os.m_levelAndroid = ANDROID_LOG_FATAL; _os.m_levelAndroid = ANDROID_LOG_FATAL;
#else #else
@ -75,11 +73,9 @@ etk::CCout& etk::operator <<(etk::CCout &_os, const enum etk::logLevel _obj) {
#endif #endif
break; break;
case logLevelError: case logLevelError:
#if (!defined(__TARGET_OS__Windows) && !defined(__TARGET_OS__IOs)) if (_os.m_enableColor == true) {
if (_os.m_enableColor == true) { _os << ETK_BASH_COLOR_RED;
_os << ETK_BASH_COLOR_RED; }
}
#endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
_os.m_levelAndroid = ANDROID_LOG_ERROR; _os.m_levelAndroid = ANDROID_LOG_ERROR;
#else #else
@ -87,11 +83,9 @@ etk::CCout& etk::operator <<(etk::CCout &_os, const enum etk::logLevel _obj) {
#endif #endif
break; break;
case logLevelWarning: case logLevelWarning:
#if (!defined(__TARGET_OS__Windows) && !defined(__TARGET_OS__IOs)) if (_os.m_enableColor == true) {
if (_os.m_enableColor == true) { _os << ETK_BASH_COLOR_MAGENTA;
_os << ETK_BASH_COLOR_MAGENTA; }
}
#endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
_os.m_levelAndroid = ANDROID_LOG_WARN; _os.m_levelAndroid = ANDROID_LOG_WARN;
#else #else
@ -99,11 +93,9 @@ etk::CCout& etk::operator <<(etk::CCout &_os, const enum etk::logLevel _obj) {
#endif #endif
break; break;
case logLevelInfo: case logLevelInfo:
#if (!defined(__TARGET_OS__Windows) && !defined(__TARGET_OS__IOs)) if (_os.m_enableColor == true) {
if (_os.m_enableColor == true) { _os << ETK_BASH_COLOR_CYAN;
_os << ETK_BASH_COLOR_CYAN; }
}
#endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
_os.m_levelAndroid = ANDROID_LOG_INFO; _os.m_levelAndroid = ANDROID_LOG_INFO;
#else #else
@ -111,11 +103,9 @@ etk::CCout& etk::operator <<(etk::CCout &_os, const enum etk::logLevel _obj) {
#endif #endif
break; break;
case logLevelDebug: case logLevelDebug:
#if (!defined(__TARGET_OS__Windows) && !defined(__TARGET_OS__IOs)) if (_os.m_enableColor == true) {
if (_os.m_enableColor == true) { _os << ETK_BASH_COLOR_YELLOW;
_os << ETK_BASH_COLOR_YELLOW; }
}
#endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
_os.m_levelAndroid = ANDROID_LOG_DEBUG; _os.m_levelAndroid = ANDROID_LOG_DEBUG;
#else #else
@ -123,11 +113,9 @@ etk::CCout& etk::operator <<(etk::CCout &_os, const enum etk::logLevel _obj) {
#endif #endif
break; break;
case logLevelVerbose: case logLevelVerbose:
#if (!defined(__TARGET_OS__Windows) && !defined(__TARGET_OS__IOs)) if (_os.m_enableColor == true) {
if (_os.m_enableColor == true) { _os << ETK_BASH_COLOR_WHITE;
_os << ETK_BASH_COLOR_WHITE; }
}
#endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
_os.m_levelAndroid = ANDROID_LOG_VERBOSE; _os.m_levelAndroid = ANDROID_LOG_VERBOSE;
#else #else
@ -162,24 +150,20 @@ void etk::CCout::setOutputFile(bool _enable) {
TK_INFO("plop"); TK_INFO("plop");
} }
etk::CCout::CCout() : etk::CCout::CCout(void) :
m_enableColor(true), m_enableColor(true),
m_outputFile(NULL) { m_outputFile(NULL) {
#if ( defined(__TARGET_OS__Windows) \
|| defined(__TARGET_OS__IOs))
m_enableColor = false;
#endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
m_levelAndroid = 0; m_levelAndroid = 0;
#endif #endif
memset(m_tmpChar, 0, (MAX_LOG_SIZE+1)*sizeof(char)); memset(m_tmpChar, 0, (MAX_LOG_SIZE+1)*sizeof(char));
}; };
etk::CCout& etk::CCout::operator << (char32_t _t) {
etk::CCout::~CCout()
{
};
etk::CCout& etk::CCout::operator << (char32_t _t)
{
char output[5]; char output[5];
u32char::convertUtf8(_t, output); u32char::convertUtf8(_t, output);
snprintf(tmp, MAX_LOG_SIZE_TMP, "%s", output); snprintf(tmp, MAX_LOG_SIZE_TMP, "%s", output);
@ -187,35 +171,34 @@ etk::CCout& etk::CCout::operator << (char32_t _t)
return *this; return *this;
} }
#if (defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs)) #if ( defined(__TARGET_OS__MacOs) \
etk::CCout& etk::CCout::operator << (size_t _t) || defined(__TARGET_OS__IOs))
{ etk::CCout& etk::CCout::operator << (size_t _t) {
snprintf(tmp, MAX_LOG_SIZE_TMP, "%lld", (uint64_t)_t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%lld", (uint64_t)_t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
#endif #endif
etk::CCout& etk::CCout::operator << (int8_t _t) etk::CCout& etk::CCout::operator << (int8_t _t) {
{
snprintf(tmp, MAX_LOG_SIZE_TMP, "%d", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%d", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (int16_t _t)
{ etk::CCout& etk::CCout::operator << (int16_t _t) {
snprintf(tmp, MAX_LOG_SIZE_TMP, "%d", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%d", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (int32_t _t)
{ etk::CCout& etk::CCout::operator << (int32_t _t) {
snprintf(tmp, MAX_LOG_SIZE_TMP, "%d", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%d", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (int64_t _t)
{ etk::CCout& etk::CCout::operator << (int64_t _t) {
#if __WORDSIZE == 64 #if __WORDSIZE == 64
snprintf(tmp, MAX_LOG_SIZE_TMP, "%ld", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%ld", _t);
#else #else
@ -225,26 +208,25 @@ etk::CCout& etk::CCout::operator << (int64_t _t)
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (uint8_t _t) etk::CCout& etk::CCout::operator << (uint8_t _t) {
{
snprintf(tmp, MAX_LOG_SIZE_TMP, "%u", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%u", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (uint16_t _t)
{ etk::CCout& etk::CCout::operator << (uint16_t _t) {
snprintf(tmp, MAX_LOG_SIZE_TMP, "%u", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%u", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (uint32_t _t)
{ etk::CCout& etk::CCout::operator << (uint32_t _t) {
snprintf(tmp, MAX_LOG_SIZE_TMP, "%u", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%u", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (uint64_t _t)
{ etk::CCout& etk::CCout::operator << (uint64_t _t) {
#if __WORDSIZE == 64 #if __WORDSIZE == 64
snprintf(tmp, MAX_LOG_SIZE_TMP, "%lu", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%lu", _t);
#else #else
@ -255,48 +237,38 @@ etk::CCout& etk::CCout::operator << (uint64_t _t)
} }
etk::CCout& etk::CCout::operator << (double _t) etk::CCout& etk::CCout::operator << (double _t) {
{
snprintf(tmp, MAX_LOG_SIZE_TMP, "%f", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%f", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (float _t) etk::CCout& etk::CCout::operator << (float _t) {
{
snprintf(tmp, MAX_LOG_SIZE_TMP, "%f", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%f", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (char * _t) {
etk::CCout& etk::CCout::operator << (char * _t)
{
snprintf(tmp, MAX_LOG_SIZE_TMP, "%s", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%s", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (const char * _t) {
etk::CCout& etk::CCout::operator << (const char * _t)
{
snprintf(tmp, MAX_LOG_SIZE_TMP, "%s", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%s", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (char _t) {
etk::CCout& etk::CCout::operator << (char _t)
{
snprintf(tmp, MAX_LOG_SIZE_TMP, "%c", _t); snprintf(tmp, MAX_LOG_SIZE_TMP, "%c", _t);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (bool _t) {
etk::CCout& etk::CCout::operator << (bool _t)
{
if (_t) { if (_t) {
strncat(m_tmpChar, "true", MAX_LOG_SIZE); strncat(m_tmpChar, "true", MAX_LOG_SIZE);
} else { } else {
@ -305,30 +277,26 @@ etk::CCout& etk::CCout::operator << (bool _t)
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (CStart _ccc) {
etk::CCout& etk::CCout::operator << (CStart _ccc)
{
m_mutex.lock(); m_mutex.lock();
return *this; return *this;
} }
etk::CCout& etk::CCout::operator << (etk::CEndl _t) {
etk::CCout& etk::CCout::operator << (etk::CEndl _t) #if (!defined(__TARGET_OS__Windows) && !defined(__TARGET_OS__IOs))
{ if (m_enableColor == true) {
#if (!defined(__TARGET_OS__Windows) && !defined(__TARGET_OS__IOs)) strncat(m_tmpChar, ETK_BASH_COLOR_NORMAL, MAX_LOG_SIZE);
if (m_enableColor == true) { }
strncat(m_tmpChar, ETK_BASH_COLOR_NORMAL, MAX_LOG_SIZE); #endif
}
#endif
strncat(m_tmpChar, "\n", MAX_LOG_SIZE); strncat(m_tmpChar, "\n", MAX_LOG_SIZE);
m_tmpChar[MAX_LOG_SIZE] = '\0'; m_tmpChar[MAX_LOG_SIZE] = '\0';
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
__android_log_print(m_levelAndroid, "EWOL", "%s", m_tmpChar); __android_log_print(m_levelAndroid, "EWOL", "%s", m_tmpChar);
#elif defined(__TARGET_OS__IOs) #elif defined(__TARGET_OS__IOs)
iosNSLog(m_tmpChar); iosNSLog(m_tmpChar);
#else #else
printf("%s", m_tmpChar); printf("%s", m_tmpChar);
#endif #endif
if (m_outputFile != NULL) { if (m_outputFile != NULL) {
fprintf(m_outputFile, "%s", m_tmpChar); fprintf(m_outputFile, "%s", m_tmpChar);
fflush(m_outputFile); fflush(m_outputFile);

1
etk/Stream.h
View File

@ -36,7 +36,6 @@ namespace etk {
#endif #endif
public: public:
CCout(void); CCout(void);
~CCout(void);
CCout& operator << (char32_t _t); CCout& operator << (char32_t _t);
#if (defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs)) #if (defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs))
CCout& operator << (size_t _t); CCout& operator << (size_t _t);

2
etk/debugGeneric.cpp
View File

@ -61,6 +61,6 @@ enum etk::logLevel g_requestedLevel = etk::logLevelDebug;
enum etk::logLevel g_requestedLevel = etk::logLevelWarning; enum etk::logLevel g_requestedLevel = etk::logLevelWarning;
#endif #endif
void debug::setGeneralLevel(enum etk::logLevel _ccc) { void debug::setGeneralLevel(enum etk::logLevel _ccc) {
//g_requestedLevel = _ccc; g_requestedLevel = _ccc;
} }