sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NSH: dd command will show statistics

Browse Source
This commit is contained in:
Masayuki Ishikawa 2016-12-19 18:33:34 -06:00 committed by Gregory Nutt
parent 741db21f70
commit 4bf85f7c7b
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nshlib/Kconfig
View File

@ -557,6 +557,11 @@ config NSH_CMDOPT_DF_H
default y if !DEFAULT_SMALL default y if !DEFAULT_SMALL
depends on !NSH_DISABLE_DF depends on !NSH_DISABLE_DF
config NSH_CMDOPT_DD_STATS
bool "dd: Support transfer statistics"
default n
depends on !NSH_DISABLE_DD
config NSH_CODECS_BUFSIZE config NSH_CODECS_BUFSIZE
int "File buffer size used by CODEC commands" int "File buffer size used by CODEC commands"
default 128 default 128

34
nshlib/nsh_ddcmd.c
View File

@ -50,6 +50,7 @@
#include <string.h> #include <string.h>
#include <debug.h> #include <debug.h>
#include <errno.h> #include <errno.h>
#include <time.h>
#include "nsh.h" #include "nsh.h"
#include "nsh_console.h" #include "nsh_console.h"
@ -215,6 +216,12 @@ int cmd_dd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
struct dd_s dd; struct dd_s dd;
char *infile = NULL; char *infile = NULL;
char *outfile = NULL; char *outfile = NULL;
#ifdef CONFIG_NSH_CMDOPT_DD_STATS
struct timespec ts0;
struct timespec ts1;
uint64_t elapsed;
uint64_t total;
#endif
int ret = ERROR; int ret = ERROR;
int i; int i;
@ -302,6 +309,14 @@ int cmd_dd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
/* Then perform the data transfer */ /* Then perform the data transfer */
#ifdef CONFIG_NSH_CMDOPT_DD_STATS
#ifdef CONFIG_CLOCK_MONOTONIC
(void)clock_gettime(CLOCK_MONOTONIC, &ts0);
#else
(void)clock_gettime(CLOCK_REALTIME, &ts0);
#endif
#endif
dd.sector = 0; dd.sector = 0;
while (!dd.eof && dd.nsectors > 0) while (!dd.eof && dd.nsectors > 0)
{ {
@ -347,6 +362,25 @@ int cmd_dd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
ret = OK; ret = OK;
#ifdef CONFIG_NSH_CMDOPT_DD_STATS
#ifdef CONFIG_CLOCK_MONOTONIC
(void)clock_gettime(CLOCK_MONOTONIC, &ts1);
#else
(void)clock_gettime(CLOCK_REALTIME, &ts1);
#endif
elapsed = (((uint64_t)ts1.tv_sec * NSEC_PER_SEC) + ts1.tv_nsec);
elapsed -= (((uint64_t)ts0.tv_sec * NSEC_PER_SEC) + ts0.tv_nsec);
elapsed /= NSEC_PER_MSEC; /* msec */
total = ((uint64_t)dd.sector * (uint64_t)dd.sectsize);
nsh_output(vtbl, "%llu bytes copied, %u msec, ",
total, (unsigned int)elapsed);
nsh_output(vtbl, "%u KB/s\n" ,
(unsigned int)((double)total / (double)elapsed));
#endif
errout_with_outf: errout_with_outf:
(void)close(dd.outfd); (void)close(dd.outfd);