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-07 16:54:49 +08:00
parent e85c5b6b4a
commit df0d69ae31
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
submission/views.py
View File

@@ -7,7 +7,7 @@ from django.shortcuts import render
from django.core.paginator import Paginator
from rest_framework.views import APIView
from judge_dispatcher.tasks import create_judge_task
from judge_dispatcher.tasks import JudgeDispatcher
from account.decorators import login_required, super_admin_required
from account.models import SUPER_ADMIN, User
from problem.models import Problem
@@ -23,9 +23,8 @@ from .serializers import (CreateSubmissionSerializer, SubmissionSerializer,
logger = logging.getLogger("app_info")
def _judge(submission_id, code, language_code, time_limit, memory_limit, test_case_id):
create_judge_task.delay(submission_id, code, language_code, time_limit, memory_limit, test_case_id)
get_cache_redis().incr("judge_queue_length")
def _judge(submission, time_limit, memory_limit, test_case_id):
JudgeDispatcher(submission, time_limit, memory_limit, test_case_id).judge()
class SubmissionAPIView(APIView):
@@ -49,7 +48,7 @@ class SubmissionAPIView(APIView):
problem_id=problem.id)
try:
_judge(submission.id, submission.code, submission.language, problem.time_limit, problem.memory_limit, problem.test_case_id)
_judge(submission, problem.time_limit, problem.memory_limit, problem.test_case_id)
except Exception as e:
logger.error(e)
return error_response(u"提交判题任务失败")
@@ -94,7 +93,7 @@ class ContestSubmissionAPIView(APIView):
code=data["code"],
problem_id=problem.id)
try:
_judge(submission.id, submission.code, submission.language, problem.time_limit, problem.memory_limit, problem.test_case_id)
_judge(submission, problem.time_limit, problem.memory_limit, problem.test_case_id)
except Exception as e:
logger.error(e)
return error_response(u"提交判题任务失败")
@@ -279,7 +278,7 @@ class SubmissionRejudgeAdminAPIView(APIView):
except Problem.DoesNotExist:
return error_response(u"题目不存在")
try:
_judge(submission.id, submission.code, submission.language, problem.time_limit, problem.memory_limit, problem.test_case_id)
_judge(submission, problem.time_limit, problem.memory_limit, problem.test_case_id)
except Exception as e:
logger.error(e)
return error_response(u"提交判题任务失败")