diff options
| -rwxr-xr-x | apps/ChangeLog.txt | 2 | ||||
| -rw-r--r-- | apps/examples/usbstorage/usbstrg_main.c | 27 |
2 files changed, 21 insertions, 8 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 4ac76ed5c..658d99ecc 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -87,3 +87,5 @@ the USB storage device. * apps/examples/nx*: All NX header files moved from nuttx/include/nuttx to nuttx/include/nuttx/nx. + * apps/examples/usbstorage: Added instrumentation to monitor memory usage + to check for memory leaks in the USB storage driver. diff --git a/apps/examples/usbstorage/usbstrg_main.c b/apps/examples/usbstorage/usbstrg_main.c index 6b1e0fe0e..c48bd3394 100644 --- a/apps/examples/usbstorage/usbstrg_main.c +++ b/apps/examples/usbstorage/usbstrg_main.c @@ -114,13 +114,23 @@ struct usbstrg_state_s g_usbstrg; static void show_memory_usage(struct mallinfo *mmbefore, struct mallinfo *mmafter) { - message("VARIABLE BEFORE AFTER\n"); - message("======== ======== ========\n"); - message("arena %8x %8x\n", mmbefore->arena, mmafter->arena); - message("ordblks %8d %8d\n", mmbefore->ordblks, mmafter->ordblks); - message("mxordblk %8x %8x\n", mmbefore->mxordblk, mmafter->mxordblk); - message("uordblks %8x %8x\n", mmbefore->uordblks, mmafter->uordblks); - message("fordblks %8x %8x\n", mmbefore->fordblks, mmafter->fordblks); + int diff; + + message(" total used free largest\n"); + message("Before:%11d%11d%11d%11d\n", + mmbefore->arena, mmbefore->uordblks, mmbefore->fordblks, mmbefore->mxordblk); + message("After: %11d%11d%11d%11d\n", + mmafter->arena, mmafter->uordblks, mmafter->fordblks, mmafter->mxordblk); + + diff = mmbefore->uordblks - mmafter->uordblks; + if (diff < 0) + { + message("Change:%11d allocated\n", -diff); + } + else if (diff > 0) + { + message("Change:%11d freed\n", diff); + } } #else # define show_memory_usage(mm1, mm2) @@ -533,7 +543,7 @@ int MAIN_NAME(int argc, char *argv[]) message(MAIN_NAME_STRING ": Connected\n"); g_usbstrg.mshandle = handle; - check_test_memory_usage("Final connection memory usage"); + check_test_memory_usage("After MS connection"); #else /* defined(CONFIG_DISABLE_SIGNALS) */ @@ -569,6 +579,7 @@ int msdis_main(int argc, char *argv[]) message("msdis: ERROR: Not connected\n"); return 1; } + check_test_memory_usage("Since MS connection"); /* Then disconnect the device and uninitialize the USB mass storage driver */ |