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

修复部分逻辑错误

Browse Source
This commit is contained in:
virusdefender
2015-12-08 19:04:31 +08:00
parent 124a402ade
commit cb64ece6ee
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
judge_dispatcher/tasks.py
View File

@@ -39,9 +39,9 @@ class JudgeDispatcher(object):
# 如果没有合适的判题服务器，就放入等待队列中等待判题 # 如果没有合适的判题服务器，就放入等待队列中等待判题
if not judge_server: if not judge_server:
if not is_waiting_task: print self.submission.id, "waiting"
JudgeWaitingQueue.objects.create(submission_id=self.submission.id, time_limit=self.time_limit, 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)
return return
judge_server.use_judge_instance() judge_server.use_judge_instance()
@@ -51,6 +51,7 @@ class JudgeDispatcher(object):
data = s.run(judge_server.token, self.submission.id, self.submission.language, 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)
print self.submission.id, "finished"
# 编译错误 # 编译错误
if data["code"] == 1: if data["code"] == 1:
@@ -78,18 +79,18 @@ class JudgeDispatcher(object):
else: else:
self.update_problem_status() self.update_problem_status()
if is_waiting_task:
JudgeWaitingQueue.objects.filter(submission_id=self.submission.id).delete()
waiting_submissions = JudgeWaitingQueue.objects.all() waiting_submissions = JudgeWaitingQueue.objects.all()
if waiting_submissions.exists(): if waiting_submissions.exists():
submission = waiting_submissions.first()
# 防止循环依赖 # 防止循环依赖
from submission.tasks import _judge from submission.tasks import _judge
_judge(Submission.objects.get(id=submission.submission_id), time_limit=submission.time_limit, waiting_submission = waiting_submissions.first()
memory_limit=submission.memory_limit, test_case_id=submission.test_case_id, print self.submission.id, "left queue"
_judge(Submission.objects.get(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,
is_waiting_task=True) is_waiting_task=True)
waiting_submission.delete()
def update_problem_status(self): def update_problem_status(self):
problem = Problem.objects.get(id=self.submission.problem_id) problem = Problem.objects.get(id=self.submission.problem_id)