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

[DEV] change log system

Browse Source
This commit is contained in:
Edouard DUPIN 2014-04-30 22:18:00 +02:00
parent a231aa2305
commit 92ea8abb9e
4 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exml/Node.cpp
View File

@ -22,7 +22,7 @@ static bool isWhiteChar(char32_t _val) {
return false; return false;
} }
etk::CCout& exml::operator <<(etk::CCout& _os, const exml::filePos& _obj) { std::ostream& exml::operator <<(std::ostream& _os, const exml::filePos& _obj) {
_os << "(l="; _os << "(l=";
_os << _obj.getLine(); _os << _obj.getLine();
_os << ",c="; _os << ",c=";

2
exml/Node.h
View File

@ -116,7 +116,7 @@ namespace exml {
return m_line; return m_line;
}; };
}; };
etk::CCout& operator <<(etk::CCout& _os, const filePos& _obj); std::ostream& operator <<(std::ostream& _os, const filePos& _obj);
class Node { class Node {
public: public:

6
exml/debug.cpp
View File

@ -8,4 +8,8 @@
#include <exml/debug.h> #include <exml/debug.h>
const char * g_exmlLibName = "exml "; int32_t exml::getLogId(void) {
static int32_t g_val = etk::log::registerInstance("exml");
return g_val;
}

48
exml/debug.h
View File

@ -9,20 +9,44 @@
#ifndef __EXML_DEBUG_H__ #ifndef __EXML_DEBUG_H__
#define __EXML_DEBUG_H__ #define __EXML_DEBUG_H__
#include <etk/types.h> #include <etk/log.h>
#include <etk/debugGeneric.h>
extern const char * g_exmlLibName; namespace exml {
int32_t getLogId(void);
};
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
#define EXML_BASE(info,data) \
do { \
if (info <= etk::log::getLevel(exml::getLogId())) { \
std::stringbuf sb; \
std::ostream tmpStream(&sb); \
tmpStream << data; \
etk::log::logStream(exml::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \
} \
} while(0)
#define EXML_CRITICAL(data) ETK_CRITICAL(g_exmlLibName, data) #define EXML_CRITICAL(data) EXML_BASE(1, data)
#define EXML_WARNING(data) ETK_WARNING(g_exmlLibName, data) #define EXML_ERROR(data) EXML_BASE(2, data)
#define EXML_ERROR(data) ETK_ERROR(g_exmlLibName, data) #define EXML_WARNING(data) EXML_BASE(3, data)
#define EXML_INFO(data) ETK_INFO(g_exmlLibName, data) #ifdef DEBUG
#define EXML_DEBUG(data) ETK_DEBUG(g_exmlLibName, data) #define EXML_INFO(data) EXML_BASE(4, data)
#define EXML_VERBOSE(data) ETK_VERBOSE(g_exmlLibName, data) #define EXML_DEBUG(data) EXML_BASE(5, data)
#define EXML_ASSERT(cond, data) ETK_ASSERT(g_exmlLibName, cond, data) #define EXML_VERBOSE(data) EXML_BASE(6, data)
#define EXML_CHECK_INOUT(cond) ETK_CHECK_INOUT(g_exmlLibName, cond) #define EXML_TODO(data) EXML_BASE(4, "TODO : " << data)
#define EXML_TODO(cond) ETK_TODO(g_exmlLibName, cond) #else
#define EXML_INFO(data) do { } while(false)
#define EXML_DEBUG(data) do { } while(false)
#define EXML_VERBOSE(data) do { } while(false)
#define EXML_TODO(data) do { } while(false)
#endif
#define EXML_ASSERT(cond,data) \
do { \
if (!(cond)) { \
EXML_CRITICAL(data); \
assert(!#cond); \
} \
} while (0)
#endif #endif