ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix inconsistent mbed-trace dummy defines and original function declarations.

pull/4706/head
Yogesh Pande 2017-07-04 23:14:54 -07:00
parent 1af8aef5dc
commit fbb12adbc4
6 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/FEATURE_COMMON_PAL/mbed-trace/.gitignore vendored
View File

@ -36,3 +36,7 @@ build/
test_coverage/
**/*.info
**/*~
output/*
# Yotta files
.yotta.json

1
features/FEATURE_COMMON_PAL/mbed-trace/CMakeLists.txt Executable file → Normal file
View File

@ -7,6 +7,7 @@ project(mbedTrace)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mbed-trace/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../nanostack-libservice/mbed-client-libservice/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../nanostack-libservice/)

2
features/FEATURE_COMMON_PAL/mbed-trace/mbed-trace/mbed_trace.h
View File

@ -408,7 +408,7 @@ char* mbed_trace_array(const uint8_t* buf, uint16_t len);
#elif !defined(MBED_TRACE_DUMMIES_DEFINED)
// define dummies, hiding the real functions
#define MBED_TRACE_DUMMIES_DEFINED
#define mbed_trace_init(...) ((void) 0)
#define mbed_trace_init(...) ((int) 0)
#define mbed_trace_free(...) ((void) 0)
#define mbed_trace_buffer_sizes(...) ((void) 0)
#define mbed_trace_config_set(...) ((void) 0)

2
features/FEATURE_COMMON_PAL/mbed-trace/module.json
View File

@ -1,6 +1,6 @@
{
"name": "mbed-trace",
"version": "1.2.1",
"version": "1.3.0",
"description": "Trace library for mbed devices",
"keywords": [
"trace",

13
features/FEATURE_COMMON_PAL/mbed-trace/source/mbed_trace.c
View File

@ -339,11 +339,6 @@ void mbed_vtracef(uint8_t dlevel, const char* grp, const char *fmt, va_list ap)
if (plain == true || dlevel == TRACE_LEVEL_CMD) {
//add trace data
retval = vsnprintf(ptr, bLeft, fmt, ap);
//convenience - trim off one trailing \n. Useful if trying to directly
//connect debug layers that do expect callers to pass \n to mbed_trace.
if (retval > 0 && retval < bLeft && ptr[retval - 1] == '\n') {
ptr[--retval] = '\0';
}
if (dlevel == TRACE_LEVEL_CMD && m_trace.cmd_printf) {
m_trace.cmd_printf(m_trace.line);
m_trace.cmd_printf("\n");
@ -446,12 +441,6 @@ void mbed_vtracef(uint8_t dlevel, const char* grp, const char *fmt, va_list ap)
if (retval > 0) {
ptr += retval;
bLeft -= retval;
//convenience - trim off one trailing \n. Useful if trying to directly
//connect debug layers that do expect callers to pass \n to mbed_trace.
if (ptr[-1] == '\n') {
*--ptr = '\0';
++bLeft;
}
}
}
@ -569,7 +558,7 @@ char *mbed_trace_array(const uint8_t *buf, uint16_t len)
int i, bLeft = tmp_data_left();
char *str, *wptr;
str = m_trace.tmp_data_ptr;
if (str == NULL || bLeft == 0) {
if (len == 0 || str == NULL || bLeft == 0) {
return "";
}
if (buf == NULL) {

13
features/FEATURE_COMMON_PAL/mbed-trace/test/Test.cpp
View File

@ -91,6 +91,19 @@ TEST(trace, Array)
mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "%s", mbed_trace_array(longStr, 200) );
}
TEST(trace, Null0Array)
{
static const unsigned char array[2] = { 0x23, 0x45 };
mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "%s", mbed_trace_array(array, 2));
STRCMP_EQUAL("23:45", buf);
mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "%s", mbed_trace_array(array, 0));
STRCMP_EQUAL("", buf);
mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "%s", mbed_trace_array(NULL, 0));
STRCMP_EQUAL("", buf);
mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "%s", mbed_trace_array(NULL, 2));
STRCMP_EQUAL("<null>", buf);
}
TEST(trace, LongString)
{
char longStr[1000] = {0x36};