riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9247 from jcarrano/fix-tlsf-ps-ifdef

Browse Source 
sys/ps: Use correct define for TLSF information.
This commit is contained in:
Cenk Gündoğan 2018-05-30 15:11:24 +02:00 committed by GitHub
commit 4f16f1f1bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/ps/ps.c
View File

@ -26,7 +26,7 @@
#include "xtimer.h" #include "xtimer.h"
#endif #endif
#ifdef MODULE_TLSF #ifdef MODULE_TLSF_MALLOC
#include "tlsf.h" #include "tlsf.h"
#include "tlsf-malloc.h" #include "tlsf-malloc.h"
#endif #endif
@ -145,7 +145,7 @@ void ps(void)
#ifdef DEVELHELP #ifdef DEVELHELP
printf("\t%5s %-21s|%13s%6s %6i (%5i)\n", "|", "SUM", "|", "|", printf("\t%5s %-21s|%13s%6s %6i (%5i)\n", "|", "SUM", "|", "|",
overall_stacksz, overall_used); overall_stacksz, overall_used);
# ifdef MODULE_TLSF # ifdef MODULE_TLSF_MALLOC
puts("\nHeap usage:"); puts("\nHeap usage:");
tlsf_walk_pool(tlsf_get_pool(_tlsf_get_global_control()), NULL, NULL); tlsf_walk_pool(tlsf_get_pool(_tlsf_get_global_control()), NULL, NULL);
# endif # endif