From e5a9d6cb0ab25cb9442a45033892291281bff02b Mon Sep 17 00:00:00 2001 From: undefined Date: Sun, 19 Sep 2021 19:29:24 +0800 Subject: [PATCH] judge: add process limit to setting --- packages/hydrojudge/package.json | 2 +- packages/hydrojudge/setting.yaml | 5 +++++ packages/hydrojudge/src/config.ts | 1 + packages/hydrojudge/src/sandbox.ts | 2 +- packages/hydrooj/src/model/setting.ts | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json index 07cb66264..78359b6ce 100644 --- a/packages/hydrojudge/package.json +++ b/packages/hydrojudge/package.json @@ -1,7 +1,7 @@ { "name": "@hydrooj/hydrojudge", "bin": "bin/hydrojudge.js", - "version": "2.11.1", + "version": "2.11.2", "main": "package.json", "author": "undefined ", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/hydrojudge/setting.yaml b/packages/hydrojudge/setting.yaml index 8decf7d60..4615bd9c9 100644 --- a/packages/hydrojudge/setting.yaml +++ b/packages/hydrojudge/setting.yaml @@ -18,6 +18,11 @@ stdio_size: name: stdio_size desc: Stdout/Stderr size default: 32m +processLimit: + type: number + name: processLimit + desc: Process Limit + default: 32 testcases_max: type: number name: testcases_max diff --git a/packages/hydrojudge/src/config.ts b/packages/hydrojudge/src/config.ts index 6fea0f479..589a6c052 100644 --- a/packages/hydrojudge/src/config.ts +++ b/packages/hydrojudge/src/config.ts @@ -19,6 +19,7 @@ let config = { sandbox_host: 'http://localhost:5050', testcases_max: 100, total_time_limit: 60, + processLimit: 32, parallelism: 2, rerun: 0, rate: 1, diff --git a/packages/hydrojudge/src/sandbox.ts b/packages/hydrojudge/src/sandbox.ts index dfa4510cb..7055ae508 100644 --- a/packages/hydrojudge/src/sandbox.ts +++ b/packages/hydrojudge/src/sandbox.ts @@ -27,7 +27,7 @@ function proc({ execute = '', time = 16000, memory = parseMemoryMB(getConfig('memoryMax')), - process_limit = 32, + process_limit = getConfig('processLimit'), stdin = '', copyIn = {}, copyOut = [], copyOutCached = [], } = {}) { if (!supportOptional) { diff --git a/packages/hydrooj/src/model/setting.ts b/packages/hydrooj/src/model/setting.ts index 419f40cb0..827e9bfa7 100644 --- a/packages/hydrooj/src/model/setting.ts +++ b/packages/hydrooj/src/model/setting.ts @@ -177,6 +177,7 @@ SystemSetting( Setting('setting_server', 'server.name', 'Hydro', 'text', 'server.name', 'Server Name'), Setting('setting_server', 'server.displayName', 'Hydro', 'text', 'server.name', 'Server Name (Global Display)', FLAG_PRO), Setting('setting_server', 'server.url', '/', 'text', 'server.url', 'Server BaseURL'), + Setting('setting_server', 'server.upload', '256m', 'text', 'server.upload', 'Max upload file size'), Setting('setting_server', 'server.cdn', '/', 'text', 'server.cdn', 'CDN Prefix'), Setting('setting_server', 'server.port', 8888, 'number', 'server.port', 'Server Port'), Setting('setting_server', 'server.xff', null, 'text', 'server.xff', 'IP Header'),