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
@@ -18,12 +18,17 | |||||
|
18 | i += 1 |
|
18 | i += 1 |
|
19 | end |
|
19 | end |
|
20 | i += 1 |
|
20 | i += 1 |
|
21 | end |
|
21 | end |
|
22 | end |
|
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 | GRADER_DIR = File.dirname(__FILE__) |
|
29 | GRADER_DIR = File.dirname(__FILE__) |
|
25 |
|
30 | ||
|
26 | # print usage |
|
31 | # print usage |
|
27 | if ARGV.length < 2 |
|
32 | if ARGV.length < 2 |
|
28 | puts <<USAGE |
|
33 | puts <<USAGE |
|
29 | using: new_problem problem number_of_testcase [options] |
|
34 | using: new_problem problem number_of_testcase [options] |
@@ -55,13 +60,13 | |||||
|
55 | system("mkdir #{problem}/test_cases/#{i}") |
|
60 | system("mkdir #{problem}/test_cases/#{i}") |
|
56 | end |
|
61 | end |
|
57 |
|
62 | ||
|
58 | # generating all_tests.cfg |
|
63 | # generating all_tests.cfg |
|
59 | puts "generating testcase config file" |
|
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 | all_test_cfg = ERB.new(template) |
|
67 | all_test_cfg = ERB.new(template) |
|
63 |
|
68 | ||
|
64 | cfg_file = File.open("#{problem}/test_cases/all_tests.cfg","w") |
|
69 | cfg_file = File.open("#{problem}/test_cases/all_tests.cfg","w") |
|
65 | cfg_file.puts all_test_cfg.result |
|
70 | cfg_file.puts all_test_cfg.result |
|
66 | cfg_file.close |
|
71 | cfg_file.close |
|
67 |
|
72 |
@@ -41,12 +41,13 | |||||
|
41 |
|
41 | ||
|
42 | static pid_t box_pid; |
|
42 | static pid_t box_pid; |
|
43 | static int is_ptraced; |
|
43 | static int is_ptraced; |
|
44 | static volatile int timer_tick; |
|
44 | static volatile int timer_tick; |
|
45 | static time_t start_time; |
|
45 | static time_t start_time; |
|
46 | static int ticks_per_sec; |
|
46 | static int ticks_per_sec; |
|
|
47 | + static int page_size; | ||
|
47 |
|
48 | ||
|
48 | #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0 |
|
49 | #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0 |
|
49 | /* glibc 2.1 or newer -> has lseek64 */ |
|
50 | /* glibc 2.1 or newer -> has lseek64 */ |
|
50 | #define long_seek(f,o,w) lseek64(f,o,w) |
|
51 | #define long_seek(f,o,w) lseek64(f,o,w) |
|
51 | #else |
|
52 | #else |
|
52 | /* Touching clandestine places in glibc */ |
|
53 | /* Touching clandestine places in glibc */ |
@@ -381,15 +382,17 | |||||
|
381 | if(fp!=NULL) { |
|
382 | if(fp!=NULL) { |
|
382 | char line[1000]; |
|
383 | char line[1000]; |
|
383 | fgets(line,999,fp); |
|
384 | fgets(line,999,fp); |
|
384 | //printf("%s\n",line); |
|
385 | //printf("%s\n",line); |
|
385 | int m; |
|
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 | if(m>max_mem_used) |
|
390 | if(m>max_mem_used) |
|
389 | max_mem_used = m; |
|
391 | max_mem_used = m; |
|
|
392 | + } | ||
|
390 |
|
393 | ||
|
391 | fclose(fp); |
|
394 | fclose(fp); |
|
392 | } |
|
395 | } |
|
393 | } |
|
396 | } |
|
394 |
|
397 | ||
|
395 | static void |
|
398 | static void |
@@ -401,12 +404,13 | |||||
|
401 | is_ptraced = 1; |
|
404 | is_ptraced = 1; |
|
402 | bzero(&sa, sizeof(sa)); |
|
405 | bzero(&sa, sizeof(sa)); |
|
403 | sa.sa_handler = signal_int; |
|
406 | sa.sa_handler = signal_int; |
|
404 | sigaction(SIGINT, &sa, NULL); |
|
407 | sigaction(SIGINT, &sa, NULL); |
|
405 | start_time = time(NULL); |
|
408 | start_time = time(NULL); |
|
406 | ticks_per_sec = sysconf(_SC_CLK_TCK); |
|
409 | ticks_per_sec = sysconf(_SC_CLK_TCK); |
|
|
410 | + page_size = getpagesize(); | ||
|
407 | if (ticks_per_sec <= 0) |
|
411 | if (ticks_per_sec <= 0) |
|
408 | die("Invalid ticks_per_sec!"); |
|
412 | die("Invalid ticks_per_sec!"); |
|
409 |
|
413 | ||
|
410 | check_memory_usage(); |
|
414 | check_memory_usage(); |
|
411 |
|
415 | ||
|
412 | sa.sa_handler = signal_alarm; |
|
416 | sa.sa_handler = signal_alarm; |
You need to be logged in to leave comments.
Login now