SoftwareAddictionShow · workhorsy · Jan 27, 2016 · Jan 27, 2016 · Jan 27, 2016 · Jan 27, 2016
diff --git a/index.html b/index.html
@@ -6,6 +6,7 @@
 		<link type="text/css" href="styles.css" media="screen" rel="Stylesheet" />
 		<script type="text/javascript" src="tests/js_pure/benchmark.js"></script>
 		<script type="text/javascript" src="tests/js_webworker/benchmark.js"></script>
+		<script type="text/javascript" src="tests/js_webworker_use_strict/benchmark.js"></script>
 	</head>
 	<body>
 		<span id="forkongithub">
@@ -28,6 +29,7 @@ <h2>Benchmarks:</h2>
 		<ul>
 			<li>JavaScript - Pure: <span id="time_js_pure"></span></li>
 			<li>JavaScript - WebWorker: <span id="time_js_webworker"></span></li>
+			<li>JavaScript - WebWorker Use Strict: <span id="time_js_webworker_use_strict"></span></li>
 		</ul>
 
 		<h2>TODO:</h2>
@@ -51,12 +53,14 @@ <h2>TODO:</h2>
 	<script>
 	var g_benchmarks = [
 		{'time_js_pure' : benchmarkJSPure},
-		{'time_js_webworker' : benchmarkJSWebWorker}
+		{'time_js_webworker' : benchmarkJSWebWorker},
+		{'time_js_webworker_use_strict' : benchmarkJSWebWorkerUseStrict}
 	];
 
 	function startBenchmarks() {
 		var nextBenchmark = function(i) {
 			if (i >= g_benchmarks.length) {
+				document.querySelector('#start').style.display = '';
 				return;
 			}
 
@@ -76,6 +80,7 @@ <h2>TODO:</h2>
 	}
 
 	document.querySelector('#start').addEventListener('click', function() {
+		document.querySelector('#start').style.display = 'none';
 		startBenchmarks();
 	}, false);
 	</script>

diff --git a/tests/js_pure/benchmark.js b/tests/js_pure/benchmark.js
@@ -1,13 +1,15 @@
 
 
-function fibonacci(n) {
-	if (n < 2) {
-		return n;
-	}
-	return fibonacci(n - 2) + fibonacci(n - 1);
-}
+
 
 function benchmarkJSPure(cb) {
+	var fibonacci = function(n) {
+		if (n < 2) {
+			return n;
+		}
+		return fibonacci(n - 2) + fibonacci(n - 1);
+	};
+
 	var start_time = new Date().getTime();
 	var result = fibonacci(43);
 	var end_time = new Date().getTime();

diff --git a/tests/js_webworker/benchmark.js b/tests/js_webworker/benchmark.js
@@ -1,14 +1,32 @@
 
 
-function fibonacci(n) {
-	if (n < 2) {
-		return n;
-	}
-	return fibonacci(n - 2) + fibonacci(n - 1);
-}
 
 function benchmarkJSWebWorker(cb) {
-	var worker = new Worker('worker.js');
+	var currentScriptPath = function() {
+		// NOTE: document.currentScript does not work in a Web Worker
+		// So we have to parse a stack trace maually
+		try {
+			throw new Error('');
+		} catch(e) {
+			var stack = e.stack;
+			var line = null;
+
+			// Chrome and IE
+			if (stack.indexOf('@') !== -1) {
+				line = stack.split('@')[1].split('\n')[0];
+			// Firefox
+			} else {
+				line = stack.split('(')[1].split(')')[0];
+			}
+			line = line.substring(0, line.lastIndexOf('/')) + '/';
+			return line;
+		}
+	};
+
+	console.info('benchmarkJSWebWorker');
+	var path = currentScriptPath() + 'worker.js';
+	console.info(path);
+	var worker = new Worker(path);
 	worker.onmessage = function(e) {
 		switch (e.data.action) {
 			case 'end':

diff --git a/tests/js_webworker/worker.js b/tests/js_webworker/worker.js
@@ -1,13 +1,15 @@
 
 
-function fibonacci(n) {
-	if (n < 2) {
-		return n;
-	}
-	return fibonacci(n - 2) + fibonacci(n - 1);
-}
+
 
 self.addEventListener('message', function(e) {
+	var fibonacci = function(n) {
+		if (n < 2) {
+			return n;
+		}
+		return fibonacci(n - 2) + fibonacci(n - 1);
+	};
+
 	var message = {
 		action: 'end',
 		start_time: new Date().getTime(),

diff --git a/tests/js_webworker_use_strict/benchmark.js b/tests/js_webworker_use_strict/benchmark.js
@@ -0,0 +1,47 @@
+
+
+
+function benchmarkJSWebWorkerUseStrict(cb) {
+	var currentScriptPath = function() {
+		// NOTE: document.currentScript does not work in a Web Worker
+		// So we have to parse a stack trace maually
+		try {
+			throw new Error('');
+		} catch(e) {
+			var stack = e.stack;
+			var line = null;
+
+			// Chrome and IE
+			if (stack.indexOf('@') !== -1) {
+				line = stack.split('@')[1].split('\n')[0];
+			// Firefox
+			} else {
+				line = stack.split('(')[1].split(')')[0];
+			}
+			line = line.substring(0, line.lastIndexOf('/')) + '/';
+			return line;
+		}
+	};
+
+	console.info('benchmarkJSWebWorkerUseStrict');
+	var path = currentScriptPath() + 'worker.js';
+	console.info(path);
+	var worker = new Worker(path);
+	worker.onmessage = function(e) {
+		switch (e.data.action) {
+			case 'end':
+				var start_time = e.data.start_time;
+				var result = e.data.result;
+				var end_time = e.data.end_time;
+				var diff_time = end_time - start_time;
+				cb(diff_time, result);
+				worker.terminate();
+				break;
+		}
+	};
+
+	var message = {
+		action: 'start'
+	};
+	worker.postMessage(message);
+}
diff --git a/tests/js_webworker_use_strict/worker.js b/tests/js_webworker_use_strict/worker.js
@@ -0,0 +1,20 @@
+"use strict";
+
+
+self.addEventListener('message', function(e) {
+	var fibonacci = function(n) {
+		"use strict";
+		if (n < 2) {
+			return n;
+		}
+		return fibonacci(n - 2) + fibonacci(n - 1);
+	};
+
+	var message = {
+		action: 'end',
+		start_time: new Date().getTime(),
+		result: fibonacci(43),
+		end_time: new Date().getTime()
+	};
+	self.postMessage(message);
+}, false);