QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 08:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复竞态条件导致的计数器错误

Browse Source
This commit is contained in:
virusdefender 2015-12-08 14:51:50 +08:00
parent 1337b26d50
commit 124a402ade
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
judge_dispatcher/models.py
View File

@ -16,16 +16,20 @@ class JudgeServer(models.Model):
status = models.BooleanField(default=True)
def use_judge_instance(self):
self.left_instance_number -= 1
self.workload = 100 - int(float(self.left_instance_number) / self.max_instance_number * 100)
print self.left_instance_number, self.workload
self.save()
# 因为use 和 release 中间是判题时间，可能这个 model 的数据已经被修改了，所以不能直接使用self.xxx，否则取到的是旧数据
server = JudgeServer.objects.select_for_update().get(id=self.id)
server.left_instance_number -= 1
server.workload = 100 - int(float(server.left_instance_number) / server.max_instance_number * 100)
print "\n ---- use", server.left_instance_number, server.workload
server.save()
def release_judge_instance(self):
self.left_instance_number += 1
self.workload = 100 - int(float(self.left_instance_number) / self.max_instance_number * 100)
print self.left_instance_number, self.workload
self.save()
# 使用原子操作
server = JudgeServer.objects.select_for_update().get(id=self.id)
server.left_instance_number += 1
server.workload = 100 - int(float(server.left_instance_number) / server.max_instance_number * 100)
print "\n ---- release", server.left_instance_number, server.workload
server.save()
class Meta:
db_table = "judge_server"

27
judge_dispatcher/tasks.py
View File

@ -26,31 +26,32 @@ class JudgeDispatcher(object):
self.memory_limit = memory_limit
self.test_case_id = test_case_id
self.user = User.objects.get(id=submission.user_id)
print "init init"
def choose_judge_server(self):
servers = JudgeServer.objects.filter(workload__lt=100, lock=False, status=True).order_by("-workload")
if servers.exists():
server = servers[0]
server.use_judge_instance()
return server
return servers.first()
def judge(self, is_waiting_task=False):
self.submission.judge_start_time = int(time.time() * 1000)
try:
judge_server = self.choose_judge_server()
# 如果没有合适的判题服务器，就放入等待队列中等待判题
if not judge_server:
if not is_waiting_task:
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)
return
judge_server = self.choose_judge_server()
# 如果没有合适的判题服务器，就放入等待队列中等待判题
if not judge_server:
if not is_waiting_task:
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)
return
judge_server.use_judge_instance()
try:
s = TimeoutServerProxy("http://" + judge_server.ip + ":" + str(judge_server.port), timeout=20)
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)
judge_server.release_judge_instance()
# 编译错误
if data["code"] == 1:
self.submission.result = result["compile_error"]
@ -67,6 +68,8 @@ class JudgeDispatcher(object):
self.submission.result = result["system_error"]
self.submission.info = str(e)
finally:
judge_server.release_judge_instance()
self.submission.judge_end_time = int(time.time() * 1000)
self.submission.save()