Description:
[grader] obsolete new_problem, fixed memory measurement bug in box.cc
git-svn-id: http://theory.cpe.ku.ac.th/grader/judge/trunk/scripts@186 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r49:5746784ead66 - - 2 files changed: 11 inserted, 2 deleted
@@ -21,6 +21,11 | |||
|
21 | 21 | end |
|
22 | 22 | end |
|
23 | 23 | |
|
24 | + | |
|
25 | + puts "This script is out of dated, shall be fixed soon" | |
|
26 | + puts "Right now, you can create raw_ev and import" | |
|
27 | + exit(0) | |
|
28 | + | |
|
24 | 29 | GRADER_DIR = File.dirname(__FILE__) |
|
25 | 30 | |
|
26 | 31 | # print usage |
@@ -58,7 +63,7 | |||
|
58 | 63 | # generating all_tests.cfg |
|
59 | 64 | puts "generating testcase config file" |
|
60 | 65 | |
|
61 | - template = File.open(File.dirname(__FILE__) + "/all_tests.cfg.erb").read | |
|
66 | + template = File.open(File.dirname(__FILE__) + "/templates/all_tests.cfg.erb").read | |
|
62 | 67 | all_test_cfg = ERB.new(template) |
|
63 | 68 | |
|
64 | 69 | cfg_file = File.open("#{problem}/test_cases/all_tests.cfg","w") |
@@ -44,6 +44,7 | |||
|
44 | 44 | static volatile int timer_tick; |
|
45 | 45 | static time_t start_time; |
|
46 | 46 | static int ticks_per_sec; |
|
47 | + static int page_size; | |
|
47 | 48 | |
|
48 | 49 | #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0 |
|
49 | 50 | /* glibc 2.1 or newer -> has lseek64 */ |
@@ -384,9 +385,11 | |||
|
384 | 385 | //printf("%s\n",line); |
|
385 | 386 | int m; |
|
386 | 387 | |
|
387 | - if(sscanf(line,"%d",&m)==1) | |
|
388 | + if(sscanf(line,"%d",&m)==1) { | |
|
389 | + m = (m*page_size+1023)/1024; | |
|
388 | 390 | if(m>max_mem_used) |
|
389 | 391 | max_mem_used = m; |
|
392 | + } | |
|
390 | 393 | |
|
391 | 394 | fclose(fp); |
|
392 | 395 | } |
@@ -404,6 +407,7 | |||
|
404 | 407 | sigaction(SIGINT, &sa, NULL); |
|
405 | 408 | start_time = time(NULL); |
|
406 | 409 | ticks_per_sec = sysconf(_SC_CLK_TCK); |
|
410 | + page_size = getpagesize(); | |
|
407 | 411 | if (ticks_per_sec <= 0) |
|
408 | 412 | die("Invalid ticks_per_sec!"); |
|
409 | 413 |
You need to be logged in to leave comments.
Login now