diff --git a/judger/uoj_judger/run/run_program_conf.h b/judger/uoj_judger/run/run_program_conf.h index 6988e1e..461d86b 100644 --- a/judger/uoj_judger/run/run_program_conf.h +++ b/judger/uoj_judger/run/run_program_conf.h @@ -370,17 +370,16 @@ void init_conf(const RunProgramConfig &config) { readable_file_name_set.insert("/usr/bin/python3"); readable_file_name_set.insert("/usr/lib/python3/"); - # ifndef UOJ_JUDGER_PYTHON3_VERSION - readable_file_name_set.insert("/usr/bin/python3.4"); - readable_file_name_set.insert("/usr/lib/python3.4/"); - readable_file_name_set.insert("/usr/bin/lib/python3.4/"); - readable_file_name_set.insert("/usr/local/lib/python3.4/"); - # endif # ifdef UOJ_JUDGER_PYTHON3_VERSION readable_file_name_set.insert("/usr/bin/python" UOJ_JUDGER_PYTHON3_VERSION); readable_file_name_set.insert("/usr/lib/python" UOJ_JUDGER_PYTHON3_VERSION "/"); readable_file_name_set.insert("/usr/bin/lib/python" UOJ_JUDGER_PYTHON3_VERSION "/"); readable_file_name_set.insert("/usr/local/lib/python" UOJ_JUDGER_PYTHON3_VERSION "/"); + # else + readable_file_name_set.insert("/usr/bin/python3.4"); + readable_file_name_set.insert("/usr/lib/python3.4/"); + readable_file_name_set.insert("/usr/bin/lib/python3.4/"); + readable_file_name_set.insert("/usr/local/lib/python3.4/"); # endif readable_file_name_set.insert("/usr/bin/pyvenv.cfg"); readable_file_name_set.insert("/usr/pyvenv.cfg"); @@ -423,6 +422,7 @@ void init_conf(const RunProgramConfig &config) { syscall_max_cnt[__NR_sysinfo ] = -1; syscall_max_cnt[__NR_clone ] = -1; syscall_max_cnt[__NR_set_robust_list] = -1; + syscall_max_cnt[__NR_prctl ] = -1; # endif syscall_should_soft_ban[__NR_socket ] = true; @@ -438,6 +438,7 @@ void init_conf(const RunProgramConfig &config) { readable_file_name_set.insert("/proc/"); # ifdef UOJ_JUDGER_BASESYSTEM_UBUNTU1804 readable_file_name_set.insert("/sys/fs/cgroup/cpu/"); + readable_file_name_set.insert("/sys/fs/cgroup/cpu,cpuacct/"); readable_file_name_set.insert("/sys/fs/cgroup/memory/"); readable_file_name_set.insert("/usr/lib/locale/"); # endif @@ -488,6 +489,7 @@ void init_conf(const RunProgramConfig &config) { readable_file_name_set.insert("/proc/"); # ifdef UOJ_JUDGER_BASESYSTEM_UBUNTU1804 readable_file_name_set.insert("/sys/fs/cgroup/cpu/"); + readable_file_name_set.insert("/sys/fs/cgroup/cpu,cpuacct/"); readable_file_name_set.insert("/sys/fs/cgroup/memory/"); readable_file_name_set.insert("/usr/share/java/"); readable_file_name_set.insert("/usr/lib/locale/"); @@ -558,6 +560,7 @@ void init_conf(const RunProgramConfig &config) { readable_file_name_set.insert(abspath(0, string(self_path) + "/../runtime") + "/"); # ifdef UOJ_JUDGER_BASESYSTEM_UBUNTU1804 readable_file_name_set.insert("/sys/fs/cgroup/cpu/"); + readable_file_name_set.insert("/sys/fs/cgroup/cpu,cpuacct/"); readable_file_name_set.insert("/sys/fs/cgroup/memory/"); readable_file_name_set.insert("/etc/oracle/java/usagetracker.properties"); # endif @@ -577,11 +580,10 @@ void init_conf(const RunProgramConfig &config) { soft_ban_file_name_set.insert("/etc/passwd"); // for javac = = readable_file_name_set.insert("/etc/timezone"); - # ifndef UOJ_JUDGER_FPC_VERSION - readable_file_name_set.insert("/etc/fpc-2.6.2.cfg.d/"); - # endif # ifdef UOJ_JUDGER_FPC_VERSION readable_file_name_set.insert("/etc/fpc-" UOJ_JUDGER_FPC_VERSION ".cfg.d/"); + # else + readable_file_name_set.insert("/etc/fpc-2.6.2.cfg.d/"); # endif readable_file_name_set.insert("/etc/fpc.cfg"); diff --git a/web/app/controllers/faq.php b/web/app/controllers/faq.php index d2060cb..538c4f1 100644 --- a/web/app/controllers/faq.php +++ b/web/app/controllers/faq.php @@ -50,8 +50,8 @@
默认的测评环境是 Ubuntu Linux 18.04 LTS x64。
C的编译器是 gcc 7.4.0,编译命令:gcc code.c -o code -lm -O2 -DONLINE_JUDGE
。
C++的编译器是 g++ 7.4.0,编译命令:g++ code.cpp -o code -lm -O2 -DONLINE_JUDGE
。如果选择C++11会在编译命令后面添加-std=c++11
。
Java8的JDK版本是 openjdk 1.8.0_212,编译命令:javac code.java
。
Java11的JDK版本是 openjdk 11.0.3,编译命令:javac code.java
。
Java8的JDK版本是 openjdk 1.8.0_222,编译命令:javac code.java
。
Java11的JDK版本是 openjdk 11.0.4,编译命令:javac code.java
。
Pascal的编译器是 fpc 3.0.4,编译命令:fpc code.pas -O2
。
Python会先编译为优化过的字节码.pyo文件。支持的Python版本分别为Python 2.7和3.6。