# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2014-09-15 15:54:56
# Node ID 447fdbbeac2ca216b7d59fc3c45bda82ba759572
# Parent  fd533c5e394bfa2d1a01fa4b909b0bce66a7b698

change memory resolution in report to kbytes

diff --git a/lib/test_request_helper.rb b/lib/test_request_helper.rb
--- a/lib/test_request_helper.rb
+++ b/lib/test_request_helper.rb
@@ -198,7 +198,7 @@
       end
 
       # extract memory usage
-      if res = /s(.*)m/.match(running_stat_line)
+      if res = /s(.*)kbytes/.match(running_stat_line)
         memory_used = res[1].to_i
       else
         memory_used = -1
diff --git a/std-script/box64-new.c b/std-script/box64-new.c
--- a/std-script/box64-new.c
+++ b/std-script/box64-new.c
@@ -160,7 +160,7 @@
   //total is user
   //wall is wall
   //
-  fprintf(stderr,"%.4lfr%.4lfu%.4lfs%dm\n", 
+  fprintf(stderr,"%.4lfr%.4lfu%.4lfs%dkbytes\n", 
 	  wall_time, user_time, system_time, mem_usage);
 }
 
@@ -209,7 +209,7 @@
         (double)wall_ms/1000,
         (double)total_ms/1000,
         (double)sys_ms/1000,
-        (mem_peak_kb + 1023) / 1024);
+        mem_peak_kb);
   meta_close();
   exit(rc);
 }
diff --git a/std-script/grade b/std-script/grade
--- a/std-script/grade
+++ b/std-script/grade
@@ -33,7 +33,7 @@
 
 def extract_time(t)
   puts "TIME: #{t}"
-  if (result=/^(.*)r(.*)u(.*)s(.*)m/.match(t))
+  if (result=/^(.*)r(.*)u(.*)s(.*)kbytes/.match(t))
     {:real => result[1], :user => result[2], :sys => result[3], :mem => result[4]}
   else
     #{:real => 0, :user => 0, :sys => 0}