xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成对SPJ的支持

Browse Source 
xml rpc不能使用None
This commit is contained in:
virusdefender
2016-04-06 20:33:19 +08:00
parent 3d396cc8e4
commit b3116cc430
11 changed files with 134 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
judge_dispatcher/models.py
View File

@@ -41,6 +41,10 @@ class JudgeWaitingQueue(models.Model):
memory_limit = models.IntegerField()
test_case_id = models.CharField(max_length=40)
create_time = models.DateTimeField(auto_now_add=True)
spj = models.BooleanField(default=False)
spj_language = models.IntegerField(blank=True, null=True)
spj_code = models.TextField(blank=True, null=True)
spj_version = models.CharField(max_length=32, blank=True, null=True)
class Meta:
db_table = "judge_waiting_queue"

42
judge_dispatcher/tasks.py
View File

@@ -20,12 +20,23 @@ logger = logging.getLogger("app_info")
class JudgeDispatcher(object):
def __init__(self, submission, time_limit, memory_limit, test_case_id):
self.submission = submission
def _none_to_false(self, value):
# xml rpc不能使用None
if value is None:
return False
else:
return value
def __init__(self, submission_id, time_limit, memory_limit, test_case_id, spj, spj_language, spj_code, spj_version):
self.submission = Submission.objects.get(id=submission_id)
self.time_limit = time_limit
self.memory_limit = memory_limit
self.test_case_id = test_case_id
self.user = User.objects.get(id=submission.user_id)
self.user = User.objects.get(id=self.submission.user_id)
self.spj = spj
self.spj_language = spj_language
self.spj_code = spj_code
self.spj_version = spj_version
def choose_judge_server(self):
servers = JudgeServer.objects.filter(workload__lt=100, lock=False, status=True).order_by("-workload")
@@ -41,16 +52,21 @@ class JudgeDispatcher(object):
# 如果没有合适的判题服务器，就放入等待队列中等待判题
if not judge_server:
JudgeWaitingQueue.objects.create(submission_id=self.submission.id, time_limit=self.time_limit,
memory_limit=self.memory_limit, test_case_id=self.test_case_id)
memory_limit=self.memory_limit, test_case_id=self.test_case_id,
spj=self.spj, spj_language=self.spj_language, spj_code=self.spj_code,
spj_version=self.spj_version)
return
judge_server.use_judge_instance()
try:
s = TimeoutServerProxy("http://" + judge_server.ip + ":" + str(judge_server.port), timeout=20)
s = TimeoutServerProxy("http://" + judge_server.ip + ":" + str(judge_server.port),
timeout=30)
data = s.run(judge_server.token, self.submission.id, self.submission.language,
self.submission.code, self.time_limit, self.memory_limit, self.test_case_id)
self.submission.code, self.time_limit, self.memory_limit, self.test_case_id,
self.spj, self._none_to_false(self.spj_language),
self._none_to_false(self.spj_code), self._none_to_false(self.spj_version))
# 编译错误
if data["code"] == 1:
self.submission.result = result["compile_error"]
@@ -71,7 +87,7 @@ class JudgeDispatcher(object):
judge_server.release_judge_instance()
self.submission.judge_end_time = int(time.time() * 1000)
self.submission.save()
self.submission.save(update_fields=["judge_start_time", "result", "info", "accepted_answer_time", "judge_end_time"])
if self.submission.contest_id:
self.update_contest_problem_status()
@@ -85,13 +101,15 @@ class JudgeDispatcher(object):
from submission.tasks import _judge
waiting_submission = waiting_submissions.first()
submission = Submission.objects.get(id=waiting_submission.submission_id)
waiting_submission.delete()
_judge.delay(submission=submission, time_limit=waiting_submission.time_limit,
_judge.delay(submission_id=waiting_submission.submission_id,
time_limit=waiting_submission.time_limit,
memory_limit=waiting_submission.memory_limit,
test_case_id=waiting_submission.test_case_id)
test_case_id=waiting_submission.test_case_id,
spj=waiting_submission.spj,
spj_language=waiting_submission.spj_language,
spj_code=waiting_submission.spj_code,
spj_version=waiting_submission.spj_version)
def update_problem_status(self):
problem = Problem.objects.get(id=self.submission.problem_id)