commit 4440af8f596f1ec4e2148e55389c4d5b0c52da43
author David Brown <david.brown@linaro.org> Mon Jan 09 12:15:05 2017 -0700
committer David Brown <david.brown@linaro.org> Mon Jan 09 12:28:10 2017 -0700
tree 5d0aa36ff66619e5996c7c7d0e39d5b11a712a96
parent de7729e6ec2a2d9d0804f4776519e7d1ae4c9b97

sim: Use logging to control output

Use the Rust logging so that normal messaging isn't overwhelmed by
messages printed.  The default level is 'error' which will only print
full errors (including the failures at the end).

To run with warnings:

   RUST_LOG=warn ./target/release/bootsim ...

This will print warnings, showing the particular failures in mind.
Using 'info' instead of 'warn' will print lots of progress as it runs.

sim/src/main.rs

diff --git a/sim/src/main.rs b/sim/src/main.rs
index 6822605..1f17f17 100644
--- a/sim/src/main.rs
+++ b/sim/src/main.rs
@@ -1,3 +1,5 @@
+#[macro_use] extern crate log;
+extern crate env_logger;
 extern crate docopt;
 extern crate libc;
 extern crate rand;
@@ -65,6 +67,8 @@
 }
 
 fn main() {
+    env_logger::init().unwrap();
+
     let args: Args = Docopt::new(USAGE)
         .and_then(|d| d.decode())
         .unwrap_or_else(|e| e.exit());
@@ -117,33 +121,33 @@
     mark_upgrade(&mut flash, 0x060000 - trailer_size as usize);
 
     let (fl2, total_count) = try_upgrade(&flash, &areadesc, None);
-    println!("First boot, count={}", total_count);
+    info!("First boot, count={}", total_count);
     assert!(verify_image(&fl2, 0x020000, &upgrade));
 
     let mut bad = 0;
     // Let's try an image halfway through.
     for i in 1 .. total_count {
-        println!("Try interruption at {}", i);
+        info!("Try interruption at {}", i);
         let (fl3, total_count) = try_upgrade(&flash, &areadesc, Some(i));
-        println!("Second boot, count={}", total_count);
+        info!("Second boot, count={}", total_count);
         if !verify_image(&fl3, 0x020000, &upgrade) {
-            println!("FAIL");
+            warn!("FAIL at step {} of {}", i, total_count);
             bad += 1;
         }
         if !verify_image(&fl3, 0x040000, &primary) {
-            println!("Slot 1 FAIL");
+            warn!("Slot 1 FAIL at step {} of {}", i, total_count);
             bad += 1;
         }
     }
-    println!("{} out of {} failed {:.2}%",
-             bad, total_count,
-             bad as f32 * 100.0 / total_count as f32);
+    error!("{} out of {} failed {:.2}%",
+           bad, total_count,
+           bad as f32 * 100.0 / total_count as f32);
 
-    println!("Try revert");
+    info!("Try revert");
     let fl2 = try_revert(&flash, &areadesc);
     assert!(verify_image(&fl2, 0x020000, &primary));
 
-    println!("Try norevert");
+    info!("Try norevert");
     let fl2 = try_norevert(&flash, &areadesc);
     assert!(verify_image(&fl2, 0x020000, &upgrade));
 
@@ -276,7 +280,7 @@
     if buf != &copy[..] {
         for i in 0 .. buf.len() {
             if buf[i] != copy[i] {
-                println!("First failure at {:#x}", offset + i);
+                info!("First failure at {:#x}", offset + i);
                 break;
             }
         }