Add memory/time limits

64json · 64json · commit 086751ec72d7 · 2018-11-19T02:24:35.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.0.5]
+### Added
+- Add memory/time limits
+
 ## [2.0.4]
 ### Fixed
 - Load limits from /common/config
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@algorithm-visualizer/tracer-generator",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Visualization Libraries for Algorithm Visualizer",
   "scripts": {
     "build": "node ./node_modules/webpack/bin/webpack --bail --progress --config webpack.config.js && chmod +x ./bin/*"
@@ -25,6 +25,7 @@
     "fs-extra": "^7.0.0",
     "gh-release": "^3.2.1",
     "uglifyjs-webpack-plugin": "^1.2.7",
+    "uuid": "^3.3.2",
     "webpack": "^4.15.1",
     "webpack-cli": "^3.0.8",
     "webpack-node-externals": "^1.7.2"
diff --git a/src/common/config.js b/src/common/config.js
@@ -1,7 +1,11 @@
+const memoryLimit = 256; // in megabytes
+const timeLimit = 5000; // in milliseconds
 const maxTraces = 1e6;
 const maxTracers = 1e2;
 
 export {
+  memoryLimit,
+  timeLimit,
   maxTraces,
   maxTracers,
 };
diff --git a/src/common/util.js b/src/common/util.js
@@ -1,16 +1,19 @@
 import Promise from 'bluebird';
 import child_process from 'child_process';
 
-const execute = (command, cwd, { stdout = process.stdout, stderr = process.stderr } = {}) => new Promise((resolve, reject) => {
+const execute = (command, cwd) => new Promise((resolve, reject) => {
   if (!cwd) return reject(new Error('CWD Not Specified'));
-  const child = child_process.exec(command, { cwd }, (error, stdout, stderr) => {
-    if (error) return reject(error.code ? new Error(stderr) : error);
-    resolve(stdout);
+  const child = child_process.exec(command, { cwd }, error => {
+    if (error) return reject(error);
+    resolve();
   });
-  if (stdout) child.stdout.pipe(stdout);
-  if (stderr) child.stderr.pipe(stderr);
+  child.stdout.pipe(process.stdout);
+  child.stderr.pipe(process.stderr);
 });
 
+const exit = error => process.exit(1);
+
 export {
   execute,
+  exit,
 };
diff --git a/src/executables/build.js b/src/executables/build.js
@@ -1,9 +1,10 @@
 import * as languages from '/languages';
 import Promise from 'bluebird';
+import { exit } from '/common/util';
 
 const { LANG } = process.env;
 if (LANG) {
-  languages[LANG].build().catch(() => process.exit(1));
+  languages[LANG].build().catch(exit);
 } else {
-  Promise.each(Object.values(languages), language => language.build()).catch(() => process.exit(1));
-}
+  Promise.each(Object.values(languages), language => language.build()).catch(exit);
+}
diff --git a/src/executables/compile.js b/src/executables/compile.js
@@ -1,4 +1,5 @@
 import * as languages from '/languages';
+import { exit } from '/common/util';
 
 const { LANG, TEMP_PATH } = process.env;
-languages[LANG].compile(TEMP_PATH).catch(() => process.exit(1));
+languages[LANG].compile(TEMP_PATH).catch(exit);
diff --git a/src/executables/release.js b/src/executables/release.js
@@ -1,7 +1,7 @@
 import ghRelease from 'gh-release';
 import Promise from 'bluebird';
 import { version } from '/package.json';
-import { execute } from '/common/util';
+import { execute, exit } from '/common/util';
 
 const { GITHUB_TOKEN } = process.env;
 const release = Promise.promisify(ghRelease);
@@ -23,4 +23,4 @@ release({ owner: 'algorithm-visualizer', repo: 'tracers', auth: { token: GITHUB_
     'cd ..',
     'rm -rf tracers.wiki',
   ].join(' && '), __dirname))
-  .catch(() => process.exit(1));
+  .catch(exit);
diff --git a/src/executables/run.js b/src/executables/run.js
@@ -1,4 +1,5 @@
 import * as languages from '/languages';
+import { exit } from '/common/util';
 
 const { LANG, TEMP_PATH } = process.env;
-languages[LANG].run(TEMP_PATH).catch(() => process.exit(1));
+languages[LANG].run(TEMP_PATH).catch(exit);
diff --git a/src/languages/Exeuter.js b/src/languages/Exeuter.js
@@ -1,6 +1,7 @@
 import { execute } from '/common/util';
 import Commander from '/languages/Commander';
-import { maxTracers, maxTraces } from '/common/config';
+import { maxTracers, maxTraces, memoryLimit, timeLimit } from '/common/config';
+import uuid from 'uuid';
 
 class Executer extends Commander {
   constructor({ name, compileCommand, runCommand }) {
@@ -12,17 +13,30 @@ class Executer extends Commander {
   }
 
   execute(tempPath, command) {
-    // TODO: memory limit + time limit + space limit?
+    const containerName = uuid.v4();
+    let timer = setTimeout(() => {
+      timer = null;
+      execute(`docker kill ${containerName}`, this.cwd);
+    }, timeLimit);
     return execute([
       `docker run --rm`,
+      `--name=${containerName}`,
       '-w=/usr/judge',
       `-v=$PWD/tracers:/usr/bin/tracers:ro`,
       `-v=${tempPath}:/usr/judge:rw`,
+      `-m=${memoryLimit}m --memory-swap=${memoryLimit}m`, // TODO: needs to be tested on linux
       `-e MAX_TRACES=${maxTraces} -e MAX_TRACERS=${maxTracers}`,
       this.executerImageTag,
       '/bin/bash -c',
       `"${command}"`,
-    ].join(' '), this.cwd);
+    ].join(' '), this.cwd).catch(error => {
+      if (timer) {
+        clearTimeout(timer);
+      } else {
+        console.error('Time Limit Exceeded');
+      }
+      throw error;
+    });
   }
 
   compile(tempPath) {
