QingdaoU/Judger
1
0
Fork 0
mirror of https://github.com/QingdaoU/Judger.git synced 2025-01-01 09:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

修补重名问题；增加部分常量

Browse Source
This commit is contained in:
LiYang 2016-08-22 12:55:47 +08:00
parent c28ef97aa5
commit 4b55b84f5f
4 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bindings/Python/_judger.c
View File

@ -92,5 +92,6 @@ static PyMethodDef judger_methods[] = {
PyMODINIT_FUNC init_judger(void) {
Py_InitModule3("_judger", judger_methods, NULL);
PyObject *module = Py_InitModule3("_judger", judger_methods, NULL);
PyModule_AddIntConstant(module, "UNLIMITED", UNLIMITED);
}

46
src/child.c
View File

@ -37,47 +37,47 @@ void close_file(FILE *fp, ...) {
int child_process(void *args) {
FILE *log_fp = ((child_args *) args)->log_fp;
runner_config *config = ((child_args *) args)->config;
struct config *_config = ((child_args *) args)->_config;
// set memory limit
if (config->max_memory != UNLIMITED) {
if (_config->max_memory != UNLIMITED) {
struct rlimit max_memory;
max_memory.rlim_cur = max_memory.rlim_max = (rlim_t) (config->max_memory) * 2;
max_memory.rlim_cur = max_memory.rlim_max = (rlim_t) (_config->max_memory) * 2;
if (setrlimit(RLIMIT_AS, &max_memory) != 0) {
CHILD_ERROR_EXIT(SETRLIMIT_FAILED);
}
}
// set cpu time limit (in seconds)
if (config->max_cpu_time != UNLIMITED) {
if (_config->max_cpu_time != UNLIMITED) {
struct rlimit max_cpu_time;
max_cpu_time.rlim_cur = max_cpu_time.rlim_max = (rlim_t) ((config->max_cpu_time + 1000) / 1000);
max_cpu_time.rlim_cur = max_cpu_time.rlim_max = (rlim_t) ((_config->max_cpu_time + 1000) / 1000);
if (setrlimit(RLIMIT_CPU, &max_cpu_time) != 0) {
CHILD_ERROR_EXIT(SETRLIMIT_FAILED);
}
}
// set max process number limit
if (config->max_process_number != UNLIMITED) {
if (_config->max_process_number != UNLIMITED) {
struct rlimit max_process_number;
max_process_number.rlim_cur = max_process_number.rlim_max = (rlim_t) config->max_process_number;
max_process_number.rlim_cur = max_process_number.rlim_max = (rlim_t) _config->max_process_number;
if (setrlimit(RLIMIT_NPROC, &max_process_number) != 0) {
CHILD_ERROR_EXIT(SETRLIMIT_FAILED);
}
}
// set max output size limit
if (config->max_output_size != UNLIMITED) {
if (_config->max_output_size != UNLIMITED) {
struct rlimit max_output_size;
max_output_size.rlim_cur = max_output_size.rlim_max = (rlim_t ) config->max_output_size;
max_output_size.rlim_cur = max_output_size.rlim_max = (rlim_t ) _config->max_output_size;
if (setrlimit(RLIMIT_FSIZE, &max_output_size) != 0) {
CHILD_ERROR_EXIT(SETRLIMIT_FAILED);
}
}
FILE *input_file = NULL, *output_file = NULL, *error_file = NULL;
if (config->input_path != NULL) {
input_file = fopen(config->input_path, "r");
if (_config->input_path != NULL) {
input_file = fopen(_config->input_path, "r");
if (input_file == NULL) {
CHILD_ERROR_EXIT(DUP2_FAILED);
}
@ -91,8 +91,8 @@ int child_process(void *args) {
}
}
if (config->output_path != NULL) {
output_file = fopen(config->output_path, "w");
if (_config->output_path != NULL) {
output_file = fopen(_config->output_path, "w");
if (output_file == NULL) {
close_file(input_file);
CHILD_ERROR_EXIT(DUP2_FAILED);
@ -104,13 +104,13 @@ int child_process(void *args) {
}
}
if (config->error_path != NULL) {
if (_config->error_path != NULL) {
// if outfile and error_file is the same path, we use the same file pointer
if (strcmp(config->output_path, config->error_path) == 0) {
if (strcmp(_config->output_path, _config->error_path) == 0) {
error_file = output_file;
}
else {
error_file = fopen(config->error_path, "w");
error_file = fopen(_config->error_path, "w");
if (error_file == NULL) {
// todo log
close_file(input_file, output_file);
@ -126,19 +126,19 @@ int child_process(void *args) {
}
// set gid
gid_t group_list[] = {config->gid};
if (config->gid != -1 && (setgid(config->gid) == -1 || setgroups(sizeof(group_list) / sizeof(gid_t), group_list) == -1)) {
gid_t group_list[] = {_config->gid};
if (_config->gid != -1 && (setgid(_config->gid) == -1 || setgroups(sizeof(group_list) / sizeof(gid_t), group_list) == -1)) {
CHILD_ERROR_EXIT(SETUID_FAILED);
}
// set uid
if (config->uid != -1 && setuid(config->uid) == -1) {
if (_config->uid != -1 && setuid(_config->uid) == -1) {
CHILD_ERROR_EXIT(SETUID_FAILED);
}
// load seccomp so
if (config->seccomp_rule_so_path != NULL) {
void *handler = dlopen(config->seccomp_rule_so_path, RTLD_LAZY);
if (_config->seccomp_rule_so_path != NULL) {
void *handler = dlopen(_config->seccomp_rule_so_path, RTLD_LAZY);
int (*load_seccomp)(void *, runner_config *);
if (!handler) {
@ -146,12 +146,12 @@ int child_process(void *args) {
CHILD_ERROR_EXIT(LOAD_SECCOMP_FAILED);
}
load_seccomp = dlsym(handler, "load_seccomp");
if (load_seccomp(handler, config) != 0) {
if (load_seccomp(handler, _config) != 0) {
CHILD_ERROR_EXIT(LOAD_SECCOMP_FAILED);
}
}
execve(config->exe_path, config->args, config->env);
execve(_config->exe_path, _config->args, _config->env);
CHILD_ERROR_EXIT(EXECVE_FAILED);
return 0;
}

2
src/runner.c
View File

@ -64,7 +64,7 @@ void run(struct config *_config, struct result *_result) {
// clone
child_args args;
args.config = _config;
args._config = _config;
args.log_fp = log_fp;
pid_t child_pid = clone(child_process, stack + STACK_SIZE, SIGCHLD, (void *) (&args));

14
src/runner.h
View File

@ -5,7 +5,6 @@
#include <stdio.h>
#define UNLIMITED -1
#define DO_NOT_CHANGE -1
#define LOG_ERROR(error_code) LOG_FATAL(log_fp, "Error: "#error_code);
@ -18,6 +17,7 @@
return; \
}
enum {
SUCCESS = 0,
INVALID_CONFIG = -1,
@ -33,15 +33,6 @@ enum {
};
enum {
CPU_TIME_LIMITED = 1,
REAL_TIME_LIMIT_EXCEEDED = 2,
MEMORY_LIMIT_EXCEEDED = 3,
RUNTIME_ERROR = 4,
SYSTEM_ERROR = 5
};
typedef struct config {
int max_cpu_time;
int max_real_time;
@ -73,8 +64,9 @@ typedef struct result {
typedef struct child_args {
FILE *log_fp;
runner_config *config;
struct config *_config;
} child_args;
void run(struct config *, struct result *);
#endif //JUDGER_RUNNER_H