atria-soft/libagg
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 db2626136b
commit 8bf2d17b61
5 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agg/agg_color_rgba.h
View File

@ -486,7 +486,7 @@ namespace agg
}
return false;
};
friend etk::CCout& operator <<( etk::CCout &os,const self_type& obj);
friend std::ostream& operator <<( std::ostream &os,const self_type& obj);
};

2
draw/Color.cpp
View File

@ -469,7 +469,7 @@ void draw::parseColor(const char* _input, struct agg::rgba8& color)
TK_VERBOSE("Parse color : \"" << inputData << "\" == > " << color);
}
etk::CCout& agg::operator <<(etk::CCout &os, const struct agg::rgba8& obj)
std::ostream& agg::operator <<(std::ostream &os, const struct agg::rgba8& obj)
{
char tmpData[256];
snprintf(tmpData, 256, "#%02X%02X%02X%02X", obj.r, obj.g, obj.b, obj.a);

2
draw/Color.h
View File

@ -28,7 +28,7 @@
#include <etk/types.h>
#include <agg/agg_color_rgba.h>
namespace agg {
etk::CCout& operator <<(etk::CCout &os, const struct agg::rgba8& obj);
std::ostream& operator <<(std::ostream &os, const struct agg::rgba8& obj);
};
namespace draw {

6
draw/debug.cpp
View File

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

48
draw/debug.h
View File

@ -25,20 +25,44 @@
#ifndef __DRAW_DEBUG_H__
#define __DRAW_DEBUG_H__
#include <etk/types.h>
#include <etk/debugGeneric.h>
#include <etk/log.h>
extern const char * drawLibName;
namespace draw {
int32_t getLogId(void);
};
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
#define DRAW_BASE(info,data) \
do { \
if (info <= etk::log::getLevel(draw::getLogId())) { \
std::stringbuf sb; \
std::ostream tmpStream(&sb); \
tmpStream << data; \
etk::log::logStream(draw::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \
} \
} while(0)
#define DRAW_CRITICAL(data) ETK_CRITICAL(drawLibName, data)
#define DRAW_WARNING(data) ETK_WARNING(drawLibName, data)
#define DRAW_ERROR(data) ETK_ERROR(drawLibName, data)
#define DRAW_INFO(data) ETK_INFO(drawLibName, data)
#define DRAW_DEBUG(data) ETK_DEBUG(drawLibName, data)
#define DRAW_VERBOSE(data) ETK_VERBOSE(drawLibName, data)
#define DRAW_ASSERT(cond, data) ETK_ASSERT(drawLibName, cond, data)
#define DRAW_CHECK_INOUT(cond) ETK_CHECK_INOUT(drawLibName, cond)
#define DRAW_TODO(cond) ETK_TODO(drawLibName, cond)
#define DRAW_CRITICAL(data) DRAW_BASE(1, data)
#define DRAW_ERROR(data) DRAW_BASE(2, data)
#define DRAW_WARNING(data) DRAW_BASE(3, data)
#ifdef DEBUG
#define DRAW_INFO(data) DRAW_BASE(4, data)
#define DRAW_DEBUG(data) DRAW_BASE(5, data)
#define DRAW_VERBOSE(data) DRAW_BASE(6, data)
#define DRAW_TODO(data) DRAW_BASE(4, "TODO : " << data)
#else
#define DRAW_INFO(data) do { } while(false)
#define DRAW_DEBUG(data) do { } while(false)
#define DRAW_VERBOSE(data) do { } while(false)
#define DRAW_TODO(data) do { } while(false)
#endif
#define DRAW_ASSERT(cond,data) \
do { \
if (!(cond)) { \
DRAW_CRITICAL(data); \
assert(!#cond); \
} \
} while (0)
#endif