Changeset fca78d4 in mainline

Timestamp:

2011-03-23T21:51:21Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

54e90cc

Parents:

6b3e7f7f

Message:

Enhanced testread

File:

• uspace/app/testread/testread.c (modified) (5 diffs)

uspace/app/testread/testread.c

@@ -75 +75 @@
         aoff64_t last_mark;
         unsigned int i;
+        bool check_enabled = true;
+        bool progress = true;
         
         if (argc < 2) {
@@ -84 +86 @@
         // Skip program name
         --argc; ++argv;
+        
+        if (argc > 0 && str_cmp(*argv, "--no-check") == 0) {
+                check_enabled = false;
+                --argc; ++argv;
+        }
+        
+        if (argc > 0 && str_cmp(*argv, "--no-progress") == 0) {
+                progress = false;
+                --argc; ++argv;
+        }
         
         if (argc != 1) {
@@ -131 +143 @@
                 
                 for (i = 0; i < elems; i++) {
-                        if (uint64_t_le2host(buf[i]) != expected) {
+                        if (check_enabled && uint64_t_le2host(buf[i]) != expected) {
                                 printf("Unexpected value at offset %" PRIuOFF64 "\n", offset);
                                 fclose(file);
@@ -141 +153 @@
                 }
                 
-                if (offset >= next_mark) {
+                if (progress && offset >= next_mark) {
                         struct timeval cur_time;
                         rc = gettimeofday(&cur_time, NULL);
@@ -165 +177 @@
         }
         
+        struct timeval final_time;
+        rc = gettimeofday(&final_time, NULL);
+        if (rc != EOK) {
+                printf("gettimeofday failed\n");
+                fclose(file);
+                free(buf);
+                return 1;
+        }
+        
+        uint32_t total_run_time = final_time.tv_sec - start_time.tv_sec;
+        if (total_run_time > 0) {
+                printf("total bytes: %" PRIuOFF64 
+                    ", total time: %u s, avg speed: %" PRIuOFF64 " B/s\n",
+                    offset,
+                    total_run_time,
+                    offset/total_run_time);
+        }
+        
         fclose(file);
         free(buf);