github
/
fair-web
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Fix lock

pull/6/head
Menci 7 years ago
parent
f870981d3c
commit
4a7d1ea141
6 changed files with 162 additions and 188 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      models/contest.js
  2. 148
      models/contest_player.js
  3. 56
      models/judge_state.js
  4. 40
      models/user.js
  5. 53
      modules/api.js
  6. 32
      utility.js

21
models/contest.js
Unescape View File

@ -120,21 +120,20 @@ class Contest extends Model {
let problems = await this.getProblems(); let problems = await this.getProblems();
if (!problems.includes(judge_state.problem_id)) throw new ErrorMessage('当前比赛中无此题目。'); if (!problems.includes(judge_state.problem_id)) throw new ErrorMessage('当前比赛中无此题目。');
await syzoj.utils.lock('Contest::newSubmission', 'create_player', judge_state.user_id); let player;
await syzoj.utils.lock(['Contest::newSubmission', 'create_player', judge_state.user_id], async () => {
let player = await ContestPlayer.findInContest({ player = await ContestPlayer.findInContest({
contest_id: this.id,
user_id: judge_state.user_id
});
if (!player) {
player = await ContestPlayer.create({
contest_id: this.id, contest_id: this.id,
user_id: judge_state.user_id user_id: judge_state.user_id
}); });
}
syzoj.utils.unlock('Contest::newSubmission', 'create_player', judge_state.user_id); if (!player) {
player = await ContestPlayer.create({
contest_id: this.id,
user_id: judge_state.user_id
});
}
});
await player.updateScore(judge_state); await player.updateScore(judge_state);
await player.save(); await player.save();

148
models/contest_player.js
Unescape View File

@ -69,100 +69,98 @@ class ContestPlayer extends Model {
} }
async updateScore(judge_state) { async updateScore(judge_state) {
await syzoj.utils.lock('ContestPlayer::updateScore', this.id); await syzoj.utils.lock(['ContestPlayer::updateScore', this.id], async () => {
await this.loadRelationships();
if (this.contest.type === 'ioi') {
if (!judge_state.pending) {
if (!this.score_details[judge_state.problem_id]) {
this.score_details[judge_state.problem_id] = {
score: judge_state.score,
judge_id: judge_state.id,
submissions: {}
};
}
await this.loadRelationships(); this.score_details[judge_state.problem_id].submissions[judge_state.id] = {
if (this.contest.type === 'ioi') {
if (!judge_state.pending) {
if (!this.score_details[judge_state.problem_id]) {
this.score_details[judge_state.problem_id] = {
score: judge_state.score,
judge_id: judge_state.id, judge_id: judge_state.id,
submissions: {} score: judge_state.score,
time: judge_state.submit_time
}; };
}
this.score_details[judge_state.problem_id].submissions[judge_state.id] = {
judge_id: judge_state.id,
score: judge_state.score,
time: judge_state.submit_time
};
let arr = Object.values(this.score_details[judge_state.problem_id].submissions); let arr = Object.values(this.score_details[judge_state.problem_id].submissions);
arr.sort((a, b) => a.time - b.time); arr.sort((a, b) => a.time - b.time);
let maxScoreSubmission = null; let maxScoreSubmission = null;
for (let x of arr) { for (let x of arr) {
if (!maxScoreSubmission || x.score >= maxScoreSubmission.score && maxScoreSubmission.score < 100) { if (!maxScoreSubmission || x.score >= maxScoreSubmission.score && maxScoreSubmission.score < 100) {
maxScoreSubmission = x; maxScoreSubmission = x;
}
} }
}
this.score_details[judge_state.problem_id].judge_id = maxScoreSubmission.judge_id; this.score_details[judge_state.problem_id].judge_id = maxScoreSubmission.judge_id;
this.score_details[judge_state.problem_id].score = maxScoreSubmission.score; this.score_details[judge_state.problem_id].score = maxScoreSubmission.score;
this.score_details[judge_state.problem_id].time = maxScoreSubmission.time; this.score_details[judge_state.problem_id].time = maxScoreSubmission.time;
this.score = 0;
for (let x in this.score_details) {
this.score += this.score_details[x].score;
}
}
} else if (this.contest.type === 'noi') {
this.score_details[judge_state.problem_id] = {
score: judge_state.score,
judge_id: judge_state.id
};
this.score = 0; this.score = 0;
for (let x in this.score_details) { for (let x in this.score_details) {
this.score += this.score_details[x].score; this.score += this.score_details[x].score;
} }
} } else if (this.contest.type === 'acm') {
} else if (this.contest.type === 'noi') { if (!judge_state.pending) {
this.score_details[judge_state.problem_id] = { if (!this.score_details[judge_state.problem_id]) {
score: judge_state.score, this.score_details[judge_state.problem_id] = {
judge_id: judge_state.id accepted: false,
}; unacceptedCount: 0,
this.score = 0; acceptedTime: 0,
for (let x in this.score_details) { judge_id: 0,
this.score += this.score_details[x].score; submissions: {}
} };
} else if (this.contest.type === 'acm') { }
if (!judge_state.pending) {
if (!this.score_details[judge_state.problem_id]) {
this.score_details[judge_state.problem_id] = {
accepted: false,
unacceptedCount: 0,
acceptedTime: 0,
judge_id: 0,
submissions: {}
};
}
this.score_details[judge_state.problem_id].submissions[judge_state.id] = { this.score_details[judge_state.problem_id].submissions[judge_state.id] = {
judge_id: judge_state.id, judge_id: judge_state.id,
accepted: judge_state.status === 'Accepted', accepted: judge_state.status === 'Accepted',
compiled: judge_state.status !== 'Compile Error', compiled: judge_state.status !== 'Compile Error',
time: judge_state.submit_time time: judge_state.submit_time
}; };
let arr = Object.values(this.score_details[judge_state.problem_id].submissions); let arr = Object.values(this.score_details[judge_state.problem_id].submissions);
arr.sort((a, b) => a.time - b.time); arr.sort((a, b) => a.time - b.time);
this.score_details[judge_state.problem_id].unacceptedCount = 0; this.score_details[judge_state.problem_id].unacceptedCount = 0;
this.score_details[judge_state.problem_id].judge_id = 0; this.score_details[judge_state.problem_id].judge_id = 0;
for (let x of arr) { for (let x of arr) {
if (x.accepted) { if (x.accepted) {
this.score_details[judge_state.problem_id].accepted = true; this.score_details[judge_state.problem_id].accepted = true;
this.score_details[judge_state.problem_id].acceptedTime = x.time; this.score_details[judge_state.problem_id].acceptedTime = x.time;
this.score_details[judge_state.problem_id].judge_id = x.judge_id; this.score_details[judge_state.problem_id].judge_id = x.judge_id;
break; break;
} else if (x.compiled) { } else if (x.compiled) {
this.score_details[judge_state.problem_id].unacceptedCount++; this.score_details[judge_state.problem_id].unacceptedCount++;
}
} }
}
if (!this.score_details[judge_state.problem_id].accepted) { if (!this.score_details[judge_state.problem_id].accepted) {
this.score_details[judge_state.problem_id].judge_id = arr[arr.length - 1].judge_id; this.score_details[judge_state.problem_id].judge_id = arr[arr.length - 1].judge_id;
} }
this.score = 0; this.score = 0;
for (let x in this.score_details) { for (let x in this.score_details) {
if (this.score_details[x].accepted) this.score++; if (this.score_details[x].accepted) this.score++;
}
} }
} }
} });
syzoj.utils.unlock('ContestPlayer::updateScore', this.id);
} }
getModel() { return model; } getModel() { return model; }

56
models/judge_state.js
Unescape View File

@ -191,43 +191,41 @@ class JudgeState extends Model {
} }
async rejudge() { async rejudge() {
await syzoj.utils.lock('JudgeState::rejudge', this.id); await syzoj.utils.lock(['JudgeState::rejudge', this.id], async () => {
await this.loadRelationships();
await this.loadRelationships(); let oldStatus = this.status;
let oldStatus = this.status;
this.status = 'Waiting'; this.status = 'Waiting';
this.score = 0; this.score = 0;
this.total_time = 0; this.total_time = 0;
this.max_memory = 0; this.max_memory = 0;
this.pending = true; this.pending = true;
this.result = { status: "Waiting", total_time: 0, max_memory: 0, score: 0, case_num: 0, compiler_output: "", pending: true }; this.result = { status: "Waiting", total_time: 0, max_memory: 0, score: 0, case_num: 0, compiler_output: "", pending: true };
await this.save(); await this.save();
let WaitingJudge = syzoj.model('waiting_judge');
let waiting_judge = await WaitingJudge.create({
judge_id: this.id
});
await waiting_judge.save(); let WaitingJudge = syzoj.model('waiting_judge');
let waiting_judge = await WaitingJudge.create({
judge_id: this.id
});
if (oldStatus === 'Accepted') { await waiting_judge.save();
await this.user.refreshSubmitInfo();
await this.user.save();
}
if (this.type === 0 || this.type === 2) {
if (oldStatus === 'Accepted') { if (oldStatus === 'Accepted') {
this.problem.ac_num--; await this.user.refreshSubmitInfo();
await this.problem.save(); await this.user.save();
} }
} else if (this.type === 1) {
let contest = await Contest.fromID(this.type_info);
await contest.newSubmission(this);
}
syzoj.utils.unlock('JudgeState::rejudge', this.id); if (this.type === 0 || this.type === 2) {
if (oldStatus === 'Accepted') {
this.problem.ac_num--;
await this.problem.save();
}
} else if (this.type === 1) {
let contest = await Contest.fromID(this.type_info);
await contest.newSubmission(this);
}
});
} }
getModel() { return model; } getModel() { return model; }

40
models/user.js
Unescape View File

@ -88,34 +88,32 @@ class User extends Model {
} }
async refreshSubmitInfo() { async refreshSubmitInfo() {
await syzoj.utils.lock('User::refreshSubmitInfo', this.id); await syzoj.utils.lock(['User::refreshSubmitInfo', this.id], async () => {
let JudgeState = syzoj.model('judge_state');
let all = await JudgeState.model.findAll({
attributes: ['problem_id'],
where: {
user_id: this.id,
status: 'Accepted',
type: {
$ne: 1 // Not a contest submission
}
}
});
let JudgeState = syzoj.model('judge_state'); let s = new Set();
let all = await JudgeState.model.findAll({ all.forEach(x => s.add(parseInt(x.get('problem_id'))));
attributes: ['problem_id'], this.ac_num = s.size;
where: {
let cnt = await JudgeState.count({
user_id: this.id, user_id: this.id,
status: 'Accepted',
type: { type: {
$ne: 1 // Not a contest submission $ne: 1 // Not a contest submission
} }
} });
});
let s = new Set();
all.forEach(x => s.add(parseInt(x.get('problem_id'))));
this.ac_num = s.size;
let cnt = await JudgeState.count({ this.submit_num = cnt;
user_id: this.id,
type: {
$ne: 1 // Not a contest submission
}
}); });
this.submit_num = cnt;
syzoj.utils.unlock('User::refreshSubmitInfo', this.id);
} }
async getACProblems() { async getACProblems() {

53
modules/api.js
Unescape View File

@ -95,35 +95,36 @@ app.get('/api/waiting_judge', async (req, res) => {
try { try {
if (req.query.session_id !== syzoj.config.judge_token) return res.status(404).send({ err: 'Permission denied' }); if (req.query.session_id !== syzoj.config.judge_token) return res.status(404).send({ err: 'Permission denied' });
await syzoj.utils.lock('/api/waiting_judge'); let judge_state;
await syzoj.utils.lock('/api/waiting_judge', async () => {
let waiting_judge = await WaitingJudge.findOne();
if (!waiting_judge) {
return;
}
judge_state = await waiting_judge.getJudgeState();
await judge_state.loadRelationships();
await judge_state.problem.loadRelationships();
await waiting_judge.destroy();
});
let waiting_judge = await WaitingJudge.findOne(); if (judge_state) {
if (!waiting_judge) { res.send({
syzoj.utils.unlock('/api/waiting_judge'); have_task: 1,
return res.send({ have_task: 0 }); judge_id: judge_state.id,
code: judge_state.code,
language: judge_state.language,
testdata: judge_state.problem.testdata ? judge_state.problem.testdata.md5 : '',
time_limit: judge_state.problem.time_limit,
memory_limit: judge_state.problem.memory_limit,
file_io: judge_state.problem.file_io,
file_io_input_name: judge_state.problem.file_io_input_name,
file_io_output_name: judge_state.problem.file_io_output_name
});
} else {
res.send({ have_task: 0 });
} }
let judge_state = await waiting_judge.getJudgeState();
await judge_state.loadRelationships();
await judge_state.problem.loadRelationships();
await waiting_judge.destroy();
syzoj.utils.unlock('/api/waiting_judge');
res.send({
have_task: 1,
judge_id: judge_state.id,
code: judge_state.code,
language: judge_state.language,
testdata: judge_state.problem.testdata ? judge_state.problem.testdata.md5 : '',
time_limit: judge_state.problem.time_limit,
memory_limit: judge_state.problem.memory_limit,
file_io: judge_state.problem.file_io,
file_io_input_name: judge_state.problem.file_io_input_name,
file_io_output_name: judge_state.problem.file_io_output_name
});
} catch (e) { } catch (e) {
syzoj.log(e);
res.status(500).send(e); res.status(500).send(e);
} }
}); });

32
utility.js
Unescape View File

@ -74,30 +74,6 @@ function highlightPygmentize(code, lang, cb) {
renderer.config.highlight = highlightPygmentize; renderer.config.highlight = highlightPygmentize;
let locks = {};
let lock = function () {
let s = JSON.stringify(Array.from(arguments));
return new Promise((resolve, reject) => {
if (!locks[s]) {
locks[s] = {
lock: new AsyncLock(),
done: null
};
}
locks[s].lock.acquire('', done => {
locks[s].done = done;
resolve();
});
});
};
let unlock = function () {
let s = JSON.stringify(Array.from(arguments));
locks[s].done();
locks[s].done = null;
}
module.exports = { module.exports = {
resolvePath(s) { resolvePath(s) {
let a = Array.from(arguments); let a = Array.from(arguments);
@ -346,6 +322,10 @@ module.exports = {
isValidUsername(s) { isValidUsername(s) {
return /^[a-zA-Z0-9\-\_]+$/.test(s); return /^[a-zA-Z0-9\-\_]+$/.test(s);
}, },
lock: lock, locks: [],
unlock: unlock lock(key, cb) {
let s = JSON.stringify(key);
if (!this.locks[s]) this.locks[s] = new AsyncLock();
return this.locks[s].acquire(s, cb);
}
}; };

Write Preview
Loading…
Cancel
Save