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

[DEBUG] correction of the STDint in the android mode ==> not set the min/max

Browse Source 
and correct the log system
This commit is contained in:
Edouard DUPIN 2013-05-29 21:31:08 +02:00
parent a2c5f8ac4e
commit 1c21a6f3d5
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etk/Stream.cpp
View File

@ -66,7 +66,7 @@ etk::CCout& etk::operator <<(etk::CCout &os, const etk::logLevel_te obj)
os << ETK_BASH_COLOR_BOLD_RED; os << ETK_BASH_COLOR_BOLD_RED;
#endif #endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
m_levelAndroid = ANDROID_LOG_FATAL; os.m_levelAndroid = ANDROID_LOG_FATAL;
#endif #endif
os << "[C]"; os << "[C]";
break; break;
@ -75,7 +75,7 @@ etk::CCout& etk::operator <<(etk::CCout &os, const etk::logLevel_te obj)
os << ETK_BASH_COLOR_RED; os << ETK_BASH_COLOR_RED;
#endif #endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
m_levelAndroid = ANDROID_LOG_ERROR; os.m_levelAndroid = ANDROID_LOG_ERROR;
#endif #endif
os << "[E]"; os << "[E]";
break; break;
@ -84,7 +84,7 @@ etk::CCout& etk::operator <<(etk::CCout &os, const etk::logLevel_te obj)
os << ETK_BASH_COLOR_MAGENTA; os << ETK_BASH_COLOR_MAGENTA;
#endif #endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
m_levelAndroid = ANDROID_LOG_WARN; os.m_levelAndroid = ANDROID_LOG_WARN;
#endif #endif
os << "[W]"; os << "[W]";
break; break;
@ -93,7 +93,7 @@ etk::CCout& etk::operator <<(etk::CCout &os, const etk::logLevel_te obj)
os << ETK_BASH_COLOR_CYAN; os << ETK_BASH_COLOR_CYAN;
#endif #endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
m_levelAndroid = ANDROID_LOG_INFO; os.m_levelAndroid = ANDROID_LOG_INFO;
#endif #endif
os << "[I]"; os << "[I]";
break; break;
@ -102,7 +102,7 @@ etk::CCout& etk::operator <<(etk::CCout &os, const etk::logLevel_te obj)
os << ETK_BASH_COLOR_YELLOW; os << ETK_BASH_COLOR_YELLOW;
#endif #endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
m_levelAndroid = ANDROID_LOG_DEBUG; os.m_levelAndroid = ANDROID_LOG_DEBUG;
#endif #endif
os << "[D]"; os << "[D]";
break; break;
@ -111,7 +111,7 @@ etk::CCout& etk::operator <<(etk::CCout &os, const etk::logLevel_te obj)
os << ETK_BASH_COLOR_WHITE; os << ETK_BASH_COLOR_WHITE;
#endif #endif
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
m_levelAndroid = ANDROID_LOG_VERBOSE; os.m_levelAndroid = ANDROID_LOG_VERBOSE;
#endif #endif
os << "[V]"; os << "[V]";
break; break;
@ -142,7 +142,7 @@ etk::CCout::~CCout()
etk::CCout& etk::CCout::operator << (const etk::UniChar& t) etk::CCout& etk::CCout::operator << (const etk::UniChar& t)
{ {
char output[5]; char output[5];
int32_t len = t.GetUtf8(output); t.GetUtf8(output);
snprintf(tmp, MAX_LOG_SIZE_TMP, "%s", output); snprintf(tmp, MAX_LOG_SIZE_TMP, "%s", output);
strncat(m_tmpChar, tmp, MAX_LOG_SIZE); strncat(m_tmpChar, tmp, MAX_LOG_SIZE);
return *this; return *this;

3
etk/Stream.h
View File

@ -24,10 +24,11 @@ namespace etk
private: private:
char m_tmpChar[MAX_LOG_SIZE+1]; char m_tmpChar[MAX_LOG_SIZE+1];
char tmp[MAX_LOG_SIZE_TMP]; char tmp[MAX_LOG_SIZE_TMP];
etk::Mutex m_mutex;
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
public:
int8_t m_levelAndroid; //!< specific level for Android int8_t m_levelAndroid; //!< specific level for Android
#endif #endif
etk::Mutex m_mutex;
public: public:
CCout(void); CCout(void);
~CCout(void); ~CCout(void);

19
etk/types.h
View File

@ -16,7 +16,26 @@
#include <assert.h> #include <assert.h>
// defien type : uintXX_t and intXX_t // defien type : uintXX_t and intXX_t
#define __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS
// note in android include the macro of min max are overwitten
#include <stdint.h> #include <stdint.h>
// in case of android error ...
#ifndef __STDINT_LIMITS
#define INT8_MIN (-128)
#define INT8_MAX (127)
#define UINT8_MAX (255U)
#define INT16_MIN (-32768)
#define INT16_MAX (32767)
#define UINT16_MAX (65535U)
#define INT32_MIN (-2147483647-1)
#define INT32_MAX (2147483647)
#define UINT32_MAX (4294967295U)
#define INT64_MIN (__INT64_C(-9223372036854775807)-1)
#define INT64_MAX (__INT64_C(9223372036854775807))
#define UINT64_MAX (__UINT64_C(18446744073709551615))
#endif
typedef enum { typedef enum {
ERR_NONE = 0, //!< No error, luckily everything went fine ERR_NONE = 0, //!< No error, luckily everything went fine

2
lutin_etk.py
View File

@ -61,6 +61,8 @@ def Create(target):
if target.name=="Windows": if target.name=="Windows":
None None
elif target.name=="Android":
None
else: else:
myModule.AddExportflag_LD("-lpthread") myModule.AddExportflag_LD("-lpthread")