fs/fs.c: do_fsload: measure throughput

[karo-tx-uboot.git] / fs / fs.c

diff --git a/fs/fs.c b/fs/fs.c
index e148a07406fe93365ef3f9154b9b02be7ee1833f..023e7ef16a3e86a12b48b416638bbcd972b84fc9 100644 (file)
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -247,8 +247,8 @@ int fs_read(const char *filename, ulong addr, int offset, int len)
        return ret;
 }
 
-int do_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
-               int fstype)
+int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
+               int fstype, int cmdline_base)
 {
        unsigned long addr;
        const char *addr_str;
@@ -257,15 +257,18 @@ int do_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
        unsigned long pos;
        int len_read;
        char buf[12];
+       unsigned long time;
 
-       if (argc < 5)
+       if (argc < 2)
+               return CMD_RET_USAGE;
+       if (argc > 7)
                return CMD_RET_USAGE;
 
-       if (fs_set_blk_dev(argv[1], argv[2], fstype))
+       if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype))
                return 1;
 
        if (argc >= 4) {
-               addr = simple_strtoul(argv[3], NULL, 0);
+               addr = simple_strtoul(argv[3], NULL, cmdline_base);
        } else {
                addr_str = getenv("loadaddr");
                if (addr_str != NULL)
@@ -283,19 +286,27 @@ int do_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
                }
        }
        if (argc >= 6)
-               bytes = simple_strtoul(argv[5], NULL, 0);
+               bytes = simple_strtoul(argv[5], NULL, cmdline_base);
        else
                bytes = 0;
        if (argc >= 7)
-               pos = simple_strtoul(argv[6], NULL, 0);
+               pos = simple_strtoul(argv[6], NULL, cmdline_base);
        else
                pos = 0;
 
+       time = get_timer(0);
        len_read = fs_read(filename, addr, pos, bytes);
+       time = get_timer(time);
        if (len_read <= 0)
                return 1;
 
-       printf("%d bytes read\n", len_read);
+       printf("%d bytes read in %lu ms", len_read, time);
+       if (time > 0) {
+               puts(" (");
+               print_size(len_read / time * 1000, "/s");
+               puts(")");
+       }
+       puts("\n");
 
        sprintf(buf, "0x%x", len_read);
        setenv("filesize", buf);
@@ -308,11 +319,13 @@ int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
 {
        if (argc < 2)
                return CMD_RET_USAGE;
+       if (argc > 4)
+               return CMD_RET_USAGE;
 
        if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype))
                return 1;
 
-       if (fs_ls(argc == 4 ? argv[3] : "/"))
+       if (fs_ls(argc >= 4 ? argv[3] : "/"))
                return 1;
 
        return 0;