Description:
accommodate mem limit in php and java, using new box64
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r187:76f782257f01 - - 1 file changed: 2 inserted, 2 deleted
@@ -95,31 +95,31 | |||||
|
95 | PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -s set_robust_list -s openat -s recvmsg -s connect -s socket -s sendto -s futex -E PYTHONNOUSERSITE=yes" |
|
95 | PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -s set_robust_list -s openat -s recvmsg -s connect -s socket -s sendto -s futex -E PYTHONNOUSERSITE=yes" |
|
96 | PHP_OPTION = "-p /usr/lib64/ -p/lib64/ -p /usr/bin/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p /usr/share/ -s setfsuid -s setfsgid -s openat -s set_robust_list -s futex -s clone -s socket -s connect" |
|
96 | PHP_OPTION = "-p /usr/lib64/ -p/lib64/ -p /usr/bin/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p /usr/share/ -s setfsuid -s setfsgid -s openat -s set_robust_list -s futex -s clone -s socket -s connect" |
|
97 |
|
97 | ||
|
98 | case language |
|
98 | case language |
|
99 | when "java" |
|
99 | when "java" |
|
100 | # for java, extract the classname |
|
100 | # for java, extract the classname |
|
101 | # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...) |
|
101 | # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...) |
|
102 | classname = 'DUMMY' |
|
102 | classname = 'DUMMY' |
|
103 | File.open(program_name,"r").each do |line| |
|
103 | File.open(program_name,"r").each do |line| |
|
104 | classname = line |
|
104 | classname = line |
|
105 | end |
|
105 | end |
|
106 | #for java, we cannot really check the memory limit... |
|
106 | #for java, we cannot really check the memory limit... |
|
107 | - run_command = "#{problem_home}/script/box -a 3 -f -T -t #{time_limit} #{JAVA_OPTION} -i #{input_file_name} -o output.txt /usr/bin/java #{classname} " |
|
107 | + run_command = "#{problem_home}/script/box -a 3 -f -T -t #{time_limit} #{JAVA_OPTION} -i #{input_file_name} -o output.txt /usr/bin/java -A -Xmx#{mem_limit}k -A #{classname} " |
|
108 | when "ruby" |
|
108 | when "ruby" |
|
109 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{RUBY_OPTION} -i #{input_file_name} -o output.txt /usr/bin/ruby #{program_name} " |
|
109 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{RUBY_OPTION} -i #{input_file_name} -o output.txt /usr/bin/ruby #{program_name} " |
|
110 | when "python" |
|
110 | when "python" |
|
111 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python #{program_name} " |
|
111 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python #{program_name} " |
|
112 | when "php" |
|
112 | when "php" |
|
113 | - run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} #{PHP_OPTION} -i #{input_file_name} -o output.txt /usr/bin/php #{program_name} " |
|
113 | + run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[128*1024,mem_limit].max} #{PHP_OPTION} -i #{input_file_name} -o output.txt /usr/bin/php -A -d -A memory_limit=#{mem_limit}k -A #{program_name} " |
|
114 | else # for c++, pascal, we do the normal checking |
|
114 | else # for c++, pascal, we do the normal checking |
|
115 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name} " |
|
115 | run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name} " |
|
116 | end |
|
116 | end |
|
117 |
|
117 | ||
|
118 |
|
118 | ||
|
119 | log "Running test #{test_num}..." |
|
119 | log "Running test #{test_num}..." |
|
120 | log run_command |
|
120 | log run_command |
|
121 | log |
|
121 | log |
|
122 | system(run_command,err: 'run_result') |
|
122 | system(run_command,err: 'run_result') |
|
123 |
|
123 | ||
|
124 | # Restore PROBLEM_HOME |
|
124 | # Restore PROBLEM_HOME |
|
125 | ENV['PROBLEM_HOME'] = problem_home |
|
125 | ENV['PROBLEM_HOME'] = problem_home |
You need to be logged in to leave comments.
Login now