Move center to judge

40 files changed, 45 insertions, 60 deletions

diff --git a/.gitignore b/.gitignore
index c4c092c..9931427 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,6 @@
 .tmp_versions
 Module.symvers
 modules.order
-
+autoscan.log
+configure.scan
+configure
diff --git a/toj/center/src/Makefile b/toj/center/src/Makefile
deleted file mode 100644
index a6e5c6a..0000000
--- a/toj/center/src/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-ifneq ($(KERNELRELEASE),)
-	judgk-objs := judgk_mod.o judgk_proc.o judgk_syscall.o judgk_syscall_asm.o judgk_security.o judgk_hyperio.o
-	obj-m := judgk.o
-else
-	KERNEL_SOURCE := /lib/modules/$(shell uname -r)/build
-	PWD := $(shell pwd)
-default:
-	${MAKE} -C ${KERNEL_SOURCE} M=${PWD} modules
-	mv judgk.ko ../judge/
-
-	g++ -g -rdynamic -fvisibility=hidden -O2 center_server.cpp center_manage.cpp center_judge.cpp tool.cpp event_exec.cpp -ldl -lpq -ltar -lbz2 -ljson -lcurl -pthread -o center_server
-	g++ -g -O2 judge_server.cpp judge_manage.cpp tool.cpp -ldl -lbz2 -ltar -pthread -o judge_server
-	mv center_server ../
-	mv judge_server ../judge/
-
-	g++ -shared -fPIC -fvisibility=hidden -O2 jmod_test_manage.cpp -ldl -ljson -pthread -o jmod_test_manage.so
-	g++ -shared -fPIC -fvisibility=hidden -O2 jmod_test_line.cpp -ljson -pthread -o jmod_test_line.so 
-	g++ -shared -fPIC -fvisibility=hidden -O2 jmod_test_check.cpp -o jmod_test_check.so
-	mv jmod_test_manage.so ../jmod/jmod_test/
-	mv jmod_test_line.so ../jmod/jmod_test/
-	mv jmod_test_check.so ../jmod/jmod_test/
-	tar -jcvf ../tmp/jmodpack/jmod_test.tar.bz2 -C ../jmod/jmod_test .
-
-clean:
-	${MAKE} -C ${KERNEL_SOURCE} SUBDIRS=${PWD} clean
-endif
diff --git a/toj/include/judge_def.h b/toj/include/judge_def.h
index f0722d0..bf7c07f 100644
--- a/toj/include/judge_def.h
+++ b/toj/include/judge_def.h
@@ -1,3 +1,6 @@
+#ifndef JUDGE_DEF_H
+#define JUDGE_DEF_H
+
 #define JUDGE_AC 0
 #define JUDGE_WA 1
 #define JUDGE_TLE 2
@@ -19,3 +22,31 @@
 #define JUDGE_RES_DATAMAX 65536
 
 #define DLL_PUBLIC extern "C" __attribute__ ((visibility ("default")))
+
+#define IOCTL_PROC_ADD _IOWR('x',0x0,int)
+#define IOCTL_PROC_GET _IOWR('x',0x1,int)
+#define IOCTL_PROC_DEL _IOR('x',0x3,int)
+
+#define IOCTL_HYPERIO_ADD _IOWR('x',0x10,int)
+#define IOCTL_HYPERIO_READ _IOWR('x',0x11,int)
+#define IOCTL_HYPERIO_WRITE _IOWR('x',0x12,int)
+#define IOCTL_HYPERIO_DEL _IOWR('x',0x13,int)
+
+#define JUDGK_COM_HYPERIO_BUFSIZE 4194304
+
+struct judgk_com_proc_add{
+    char run_path[PATH_MAX + 1];
+    pid_t pid;
+    unsigned long kern_task;
+    unsigned long timelimit;
+    unsigned long hardtimelimit;
+    unsigned long memlimit;
+};
+struct judgk_com_proc_get{
+    unsigned long kern_task;
+    int status;
+    unsigned long runtime;
+    unsigned long memory;
+};
+
+#endif
diff --git a/toj/judge/Makefile b/toj/judge/Makefile
new file mode 100644
index 0000000..3fe0444
--- /dev/null
+++ b/toj/judge/Makefile
@@ -0,0 +1,6 @@
+all:
+	g++ -I../include -g -rdynamic -fvisibility=hidden -O2 center_server.cpp center_manage.cpp center_judge.cpp tool.cpp event_exec.cpp -ldl -lpq -ltar -lbz2 -ljson -lcurl -pthread -o center_server
+	g++ -I../include -g -O2 judge_server.cpp judge_manage.cpp tool.cpp -ldl -lbz2 -ltar -pthread -o judge_server
+	g++ -shared -fPIC -fvisibility=hidden -O2 -I../include jmod_test_manage.cpp -ldl -ljson -pthread -o jmod_test_manage.so
+	g++ -shared -fPIC -fvisibility=hidden -O2 -I../include jmod_test_line.cpp -ljson -pthread -o jmod_test_line.so 
+	g++ -shared -fPIC -fvisibility=hidden -O2 -I../include jmod_test_check.cpp -o jmod_test_check.so
diff --git a/toj/center/src/center.h b/toj/judge/center.h
index 2625ab4..2625ab4 100644
--- a/toj/center/src/center.h
+++ b/toj/judge/center.h
diff --git a/toj/center/src/center_com.h b/toj/judge/center_com.h
index 6973eec..6973eec 100644
--- a/toj/center/src/center_com.h
+++ b/toj/judge/center_com.h
diff --git a/toj/center/src/center_judge.cpp b/toj/judge/center_judge.cpp
index 85a2fd6..85a2fd6 100644
--- a/toj/center/src/center_judge.cpp
+++ b/toj/judge/center_judge.cpp
diff --git a/toj/center/src/center_judge.h b/toj/judge/center_judge.h
index 99a3cf9..99a3cf9 100644
--- a/toj/center/src/center_judge.h
+++ b/toj/judge/center_judge.h
diff --git a/toj/center/src/center_manage.cpp b/toj/judge/center_manage.cpp
index f994bd9..f994bd9 100644
--- a/toj/center/src/center_manage.cpp
+++ b/toj/judge/center_manage.cpp
diff --git a/toj/center/src/center_manage.h b/toj/judge/center_manage.h
index 1f84403..1f84403 100644
--- a/toj/center/src/center_manage.h
+++ b/toj/judge/center_manage.h
diff --git a/toj/center/src/center_server.cpp b/toj/judge/center_server.cpp
index 030e273..030e273 100644
--- a/toj/center/src/center_server.cpp
+++ b/toj/judge/center_server.cpp
diff --git a/toj/center/src/center_server.h b/toj/judge/center_server.h
index 039e84b..039e84b 100644
--- a/toj/center/src/center_server.h
+++ b/toj/judge/center_server.h
diff --git a/toj/center/src/event_exec.cpp b/toj/judge/event_exec.cpp
index af258c0..af258c0 100644
--- a/toj/center/src/event_exec.cpp
+++ b/toj/judge/event_exec.cpp
diff --git a/toj/center/src/event_exec.h b/toj/judge/event_exec.h
index aec1acb..aec1acb 100644
--- a/toj/center/src/event_exec.h
+++ b/toj/judge/event_exec.h
diff --git a/toj/center/src/jmod_test.h b/toj/judge/jmod_test.h
index 844f5c8..844f5c8 100644
--- a/toj/center/src/jmod_test.h
+++ b/toj/judge/jmod_test.h
diff --git a/toj/center/src/jmod_test_check.cpp b/toj/judge/jmod_test_check.cpp
index ae4d060..984473b 100644
--- a/toj/center/src/jmod_test_check.cpp
+++ b/toj/judge/jmod_test_check.cpp
@@ -6,7 +6,7 @@
 #include<fcntl.h>
 #include<errno.h>
 
-#include"judge_def.h"
+#include<judge_def.h>
 #include"judgm_lib.h"
 #include"jmod_test.h"
 #include"jmod_test_check.h"
diff --git a/toj/center/src/jmod_test_check.h b/toj/judge/jmod_test_check.h
index 20a6286..20a6286 100644
--- a/toj/center/src/jmod_test_check.h
+++ b/toj/judge/jmod_test_check.h
diff --git a/toj/center/src/jmod_test_line.cpp b/toj/judge/jmod_test_line.cpp
index be1177c..33a32b9 100644
--- a/toj/center/src/jmod_test_line.cpp
+++ b/toj/judge/jmod_test_line.cpp
@@ -5,7 +5,7 @@
 #include<pthread.h>
 #include<json/json.h>
 
-#include"judge_def.h"
+#include<judge_def.h>
 #include"judgm_lib.h"
 #include"judgm_line.h"
 #include"jmod_test.h"
diff --git a/toj/center/src/jmod_test_line.h b/toj/judge/jmod_test_line.h
index c09a503..c09a503 100644
--- a/toj/center/src/jmod_test_line.h
+++ b/toj/judge/jmod_test_line.h
diff --git a/toj/center/src/jmod_test_manage.cpp b/toj/judge/jmod_test_manage.cpp
index e77adc9..b020574 100644
--- a/toj/center/src/jmod_test_manage.cpp
+++ b/toj/judge/jmod_test_manage.cpp
@@ -5,7 +5,7 @@
 #include<dlfcn.h>
 #include<json/json.h>
 
-#include"judge_def.h"
+#include<judge_def.h>
 #include"judgm_lib.h"
 #include"judgm_manage.h"
 #include"jmod_test.h"
diff --git a/toj/center/src/jmod_test_manage.h b/toj/judge/jmod_test_manage.h
index b0244e3..b0244e3 100644
--- a/toj/center/src/jmod_test_manage.h
+++ b/toj/judge/jmod_test_manage.h
diff --git a/toj/center/src/judge.h b/toj/judge/judge.h
index 5183942..5183942 100644
--- a/toj/center/src/judge.h
+++ b/toj/judge/judge.h
diff --git a/toj/center/src/judge_manage.cpp b/toj/judge/judge_manage.cpp
index 6901565..6901565 100644
--- a/toj/center/src/judge_manage.cpp
+++ b/toj/judge/judge_manage.cpp
diff --git a/toj/center/src/judge_manage.h b/toj/judge/judge_manage.h
index 00abc22..00abc22 100644
--- a/toj/center/src/judge_manage.h
+++ b/toj/judge/judge_manage.h
diff --git a/toj/center/src/judge_server.cpp b/toj/judge/judge_server.cpp
index 7a2bb6a..7a2bb6a 100644
--- a/toj/center/src/judge_server.cpp
+++ b/toj/judge/judge_server.cpp
diff --git a/toj/center/src/judge_server.h b/toj/judge/judge_server.h
index fadde93..fadde93 100644
--- a/toj/center/src/judge_server.h
+++ b/toj/judge/judge_server.h
diff --git a/toj/center/src/judgm_lib.h b/toj/judge/judgm_lib.h
index 2007763..041901d 100644
--- a/toj/center/src/judgm_lib.h
+++ b/toj/judge/judgm_lib.h
@@ -17,7 +17,6 @@
 #include<utility>
 
 #include"judge.h"
-#include"judgk_com.h"
 
 typedef int (*judgm_proc_check_fn)();
 
diff --git a/toj/center/src/judgm_line.h b/toj/judge/judgm_line.h
index 1b36c74..1b36c74 100644
--- a/toj/center/src/judgm_line.h
+++ b/toj/judge/judgm_line.h
diff --git a/toj/center/src/judgm_manage.h b/toj/judge/judgm_manage.h
index 2795ec7..2795ec7 100644
--- a/toj/center/src/judgm_manage.h
+++ b/toj/judge/judgm_manage.h
diff --git a/toj/center/src/netio.h b/toj/judge/netio.h
index db54b23..db54b23 100644
--- a/toj/center/src/netio.h
+++ b/toj/judge/netio.h
diff --git a/toj/center/src/tool.cpp b/toj/judge/tool.cpp
index b4a302d..b4a302d 100644
--- a/toj/center/src/tool.cpp
+++ b/toj/judge/tool.cpp
diff --git a/toj/center/src/tool.h b/toj/judge/tool.h
index f876c29..f876c29 100644
--- a/toj/center/src/tool.h
+++ b/toj/judge/tool.h
diff --git a/toj/center/src/tpool.h b/toj/judge/tpool.h
index c06efc1..c06efc1 100644
--- a/toj/center/src/tpool.h
+++ b/toj/judge/tpool.h
diff --git a/toj/judgk/judgk_com.h b/toj/judgk/judgk_com.h
deleted file mode 100644
index 842c69c..0000000
--- a/toj/judgk/judgk_com.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#define IOCTL_PROC_ADD _IOWR('x',0x0,int)
-#define IOCTL_PROC_GET _IOWR('x',0x1,int)
-#define IOCTL_PROC_DEL _IOR('x',0x3,int)
-
-#define IOCTL_HYPERIO_ADD _IOWR('x',0x10,int)
-#define IOCTL_HYPERIO_READ _IOWR('x',0x11,int)
-#define IOCTL_HYPERIO_WRITE _IOWR('x',0x12,int)
-#define IOCTL_HYPERIO_DEL _IOWR('x',0x13,int)
-
-#define JUDGK_COM_HYPERIO_BUFSIZE 4194304
-
-struct judgk_com_proc_add{
-    char run_path[PATH_MAX + 1];
-    pid_t pid;
-    unsigned long kern_task;
-    unsigned long timelimit;
-    unsigned long hardtimelimit;
-    unsigned long memlimit;
-};
-struct judgk_com_proc_get{
-    unsigned long kern_task;
-    int status;
-    unsigned long runtime;
-    unsigned long memory;
-};
diff --git a/toj/judgk/judgk_hyperio.c b/toj/judgk/judgk_hyperio.c
index 67b0ef6..869a07b 100644
--- a/toj/judgk/judgk_hyperio.c
+++ b/toj/judgk/judgk_hyperio.c
@@ -7,8 +7,8 @@
 #include<asm/atomic.h>
 #include<asm/mman.h>
 
+#include<judge_def.h>
 #include"judgk.h"
-#include"judgk_com.h"
 #include"judgk_hyperio.h"
 
 int judgk_hyperio_init(){
diff --git a/toj/judgk/judgk_mod.c b/toj/judgk/judgk_mod.c
index 3f56d90..4c9b96a 100644
--- a/toj/judgk/judgk_mod.c
+++ b/toj/judgk/judgk_mod.c
@@ -6,8 +6,8 @@
 #include<linux/fs.h>
 #include<linux/sched.h>
 
+#include<judge_def.h>
 #include"judgk.h"
-#include"judgk_com.h"
 #include"judgk_mod.h"
 
 static int __init mod_init(){
diff --git a/toj/judgk/judgk_proc.c b/toj/judgk/judgk_proc.c
index 505892a..48ec108 100644
--- a/toj/judgk/judgk_proc.c
+++ b/toj/judgk/judgk_proc.c
@@ -7,7 +7,6 @@
 
 #include<judge_def.h>
 #include"judgk.h"
-#include"judgk_com.h"
 #include"judgk_proc.h"
 
 int judgk_proc_init(){
diff --git a/toj/judgk/judgk_syscall.c b/toj/judgk/judgk_syscall.c
index 370a3fe..d10a933 100644
--- a/toj/judgk/judgk_syscall.c
+++ b/toj/judgk/judgk_syscall.c
@@ -8,7 +8,6 @@
 
 #include"judge_def.h"
 #include"judgk.h"
-#include"judgk_com.h"
 #include"judgk_syscall.h"
 
 int judgk_syscall_hook(){
diff --git a/toj/center/pro/packpro.sh b/toj/scripts/packpro.sh
index b53a707..b53a707 100755
--- a/toj/center/pro/packpro.sh
+++ b/toj/scripts/packpro.sh
diff --git a/toj/index.html b/toj/web/index.html
index f3894c0..f3894c0 100644
--- a/toj/index.html
+++ b/toj/web/index.html