cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

parent | child

Description:

change memory resolution in report to kbytes

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r164:447fdbbeac2c - Mon, 15 Sep 2014 15:54:56 - 3 files changed: 4 inserted, 4 deleted

lib/test_request_helper.rb ¶ +1 -1

                     else
                       seconds = nil
                       time_stat = "Time used: n/a sec."
                     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
                     end
                     return {

std-script/box64-new.c ¶ +2 -2

               			double system_time,
               			int mem_usage)
               {
                 //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);
               }
               static void
               final_stats(struct rusage *rus)
               {
                     }
                   }
                 print_running_stat(
                       (double)wall_ms/1000,
                       (double)total_ms/1000,
                       (double)sys_ms/1000,
-            -         (mem_peak_kb + 1023) / 1024);
+            +         mem_peak_kb);
                 meta_close();
                 exit(rc);
               }
               static void
               flush_line(void)

std-script/grade ¶ +1 -1

                   RUN_ERROR_MARK  # these are run time errors
                 end
               end
               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}
                   #puts "ERROR READING RUNNING TIME: #{t}"
                   raise "Error reading running time: #{t}"
                 end

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings