From fc799927d6a2f7164fc0d445b10b433994348c92 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Fri, 24 Nov 2023 07:56:02 +0800
Subject: [PATCH] judge: remove unused vars

---
 packages/hydrojudge/src/judge/run.ts | 3 ---
 packages/hydrojudge/src/sandbox.ts   | 9 +++++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/hydrojudge/src/judge/run.ts b/packages/hydrojudge/src/judge/run.ts
index 222ea9ee..87b230fd 100644
--- a/packages/hydrojudge/src/judge/run.ts
+++ b/packages/hydrojudge/src/judge/run.ts
@@ -1,12 +1,9 @@
 import { STATUS } from '@hydrooj/utils/lib/status';
-import { Logger } from '../log';
 import { runQueued } from '../sandbox';
 import signals from '../signals';
 import { JudgeTask } from '../task';
 import { parseMemoryMB, parseTimeMS } from '../utils';
 
-const logger = new Logger('judge/run');
-
 export const judge = async (ctx: JudgeTask) => {
     ctx.stat.judge = new Date();
     ctx.next({ status: STATUS.STATUS_COMPILING });
diff --git a/packages/hydrojudge/src/sandbox.ts b/packages/hydrojudge/src/sandbox.ts
index 956661d1..5883e415 100644
--- a/packages/hydrojudge/src/sandbox.ts
+++ b/packages/hydrojudge/src/sandbox.ts
@@ -125,9 +125,12 @@ async function adaptResult(result: SandboxResult, params: Parameter): Promise<Sa
         files: result.files,
         code: result.exitStatus,
     };
-    if (ret.time >= (params.time || 16000)) {
+    if (ret.time > (params.time || 16000)) {
         ret.status = STATUS.STATUS_TIME_LIMIT_EXCEEDED;
     }
+    if (ret.memory > (params.memory || parseMemoryMB(getConfig('memoryMax')))) {
+        ret.status = STATUS.STATUS_MEMORY_LIMIT_EXCEEDED;
+    }
     const outname = params.filename ? `${params.filename}.out` : 'stdout';
     ret.files = result.files || {};
     ret.fileIds = result.fileIds || {};
@@ -215,7 +218,9 @@ export async function run(execute: string, params?: Parameter): Promise<SandboxA
 const queue = new PQueue({ concurrency: getConfig('concurrency') || getConfig('parallelism') });
 
 export function runQueued(execute: string, params?: Parameter, priority = 0) {
-    return queue.add(() => run(execute, params), { priority }) as Promise<SandboxAdaptedResult>;
+    return queue.add(() => {
+        const result = await run(execute, params), { priority }
+    }) as Promise<SandboxAdaptedResult>;
 }
 
 export async function versionCheck(reportWarn: (str: string) => void, reportError = reportWarn) {