Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-07 09:13:32 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

Reduces wasted FLASH by > 4K (#4994)

Browse Source 
* Reduces wasted FLASH by > 4K

* Removed PX4_IMPLEMENT_PX4_LOG_MODULENAME

* Moved implamentation of px4_log_modulename to px4_log.c
This commit is contained in:
David Sidrane
2016-07-06 11:52:08 -10:00
committed by Lorenz Meier
parent 056f73f5d2
commit 1d5c5497b5
2 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/posix/px4_layer/px4_log.c
+18
View File
@@ -30,3 +30,21 @@ void px4_backtrace()
free(callstack);
#endif
}
__EXPORT void px4_log_modulename(int level, const char *moduleName, const char *fmt, ...)
{
if (level <= __px4_log_level_current) {
PX4_LOG_COLOR_START
printf(__px4__log_level_fmt __px4__log_level_arg(level));
PX4_LOG_COLOR_MODULE
printf(__px4__log_modulename_pfmt, moduleName);
PX4_LOG_COLOR_MESSAGE
va_list argptr;
va_start(argptr, fmt);
vprintf(fmt, argptr);
va_end(argptr);
PX4_LOG_COLOR_END
printf("\n");
}
}
src/platforms/px4_log.h
+8 -33
View File
@@ -134,6 +134,8 @@ __EXPORT extern const char *__px4_log_level_str[_PX4_LOG_LEVEL_PANIC + 1];
__EXPORT extern const char *__px4_log_level_color[_PX4_LOG_LEVEL_PANIC + 1];
__EXPORT extern int __px4_log_level_current;
__EXPORT extern void px4_backtrace(void);
__EXPORT void px4_log_modulename(int level, const char *moduleName, const char *fmt, ...);
__END_DECLS
#define PX4_BACKTRACE() px4_backtrace()
@@ -166,6 +168,7 @@ __END_DECLS
#define __px4__log_thread_fmt "%#X "
#define __px4__log_thread_arg ,(unsigned int)pthread_self()
#define __px4__log_modulename_fmt "%-10s "
#define __px4__log_modulename_pfmt "[%s] "
#define __px4__log_modulename_arg ,"[" MODULE_NAME "]"
#define __px4__log_file_and_line_fmt " (file %s line %u)"
@@ -246,42 +249,14 @@ __END_DECLS
* Convert a message in the form:
* PX4_WARN("val is %d", val);
* to
* printf("%-5s [%-10s] val is %d\n", __px4_log_level_str[3],
* printf("%-5s [%s] val is %d\n", __px4_log_level_str[3],
* MODULENAME, val);
****************************************************************************/
/* It turns out the macro below uses a lot more flash space than a static
* inline function. */
#if 0
#define __px4_log_modulename(level, FMT, ...) \
__px4__log_printline(level,\
__px4__log_level_fmt\
__px4__log_modulename_fmt\
FMT\
__px4__log_end_fmt\
__px4__log_level_arg(level)\
__px4__log_modulename_arg\
, ##__VA_ARGS__\
)
#endif
static inline void __px4_log_modulename(int level, const char *fmt, ...)
{
if (level <= __px4_log_level_current) {
PX4_LOG_COLOR_START
printf(__px4__log_level_fmt __px4__log_level_arg(level));
PX4_LOG_COLOR_MODULE
printf(__px4__log_modulename_fmt __px4__log_modulename_arg);
PX4_LOG_COLOR_MESSAGE
va_list argptr;
va_start(argptr, fmt);
vprintf(fmt, argptr);
va_end(argptr);
PX4_LOG_COLOR_END
printf("\n");
}
}
#define __px4_log_modulename(level, fmt, ...) \
do { \
px4_log_modulename(level, MODULE_NAME, fmt, ##__VA_ARGS__); \
} while(0)
/****************************************************************************
* __px4_log_timestamp:
* Convert a message in the form: