瀏覽代碼

use same report output format for reader and writer

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8201 8c9fc860-2736-0410-a75d-ab315db34111
eth.morozova 7 年之前
父節點
當前提交
8eaff72834
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      ARM/ARM.A2/TestFs.Mod

+ 3 - 3
ARM/ARM.A2/TestFs.Mod

@@ -321,10 +321,10 @@ VAR
 
 		IF i < writers.Length() THEN
 			w := writers.Get(i)(Writer);
-			ctx.out.String("byteCount="); ctx.out.Int(w.byteCount,0); ctx.out.Ln;
+			ctx.out.String("byte count="); ctx.out.Int(w.byteCount,0); ctx.out.Ln;
 
 			speed := 1000.0 * REAL(w.byteCount-w.startByteCount) / Kernel.Elapsed(w.tStart);
-			ctx.out.String("overall speed="); ctx.out.FloatFix(speed,0,5,0); ctx.out.String(" bytes/s"); ctx.out.Ln;
+			ctx.out.String("speed="); ctx.out.FloatFix(speed,0,5,0); ctx.out.String(" bytes/s"); ctx.out.Ln;
 			ctx.out.String("status: ");
 			IF w.Exited() THEN
 				ctx.out.String("Finished");
@@ -421,7 +421,7 @@ VAR
 		speed := 1000.0 * (r.byteCount-r.startByteCount) / Kernel.Elapsed(r.tStart);
 
 		ctx.out.String("byte count="); ctx.out.Int(r.byteCount, 0); ctx.out.Ln;
-		ctx.out.String("overall speed="); ctx.out.FloatFix(speed,0,5,0); ctx.out.Ln;
+		ctx.out.String("speed="); ctx.out.FloatFix(speed,0,5,0); ctx.out.String(" bytes/s"); ctx.out.Ln;
 		ctx.out.String("status: ");
 		IF r.Exited() THEN
 			ctx.out.String("Finished");