Give the possibility to show kernel execution time in console

Benjamin Renard
1 parent 97d270e0
Showing 6 changed files with 21 additions and 2 deletions Show diff stats
.gitignore
desktop.php
js/app/controllers/PlotModule.js
js/app/models/DownloadNode.js
js/app/models/ExecutableNode.js
php/my_config.template.php
@@ -6,6 +6,7 @@ generic_data/RemoteData/
 generic_data/Statistics/
 generic_data/help/
 generic_data/SimuTemplate/TargetsSimu.xml*
+generic_data/guest*
 js/lib/ext
 help/simu
 help/auto
@@ -97,6 +97,8 @@
         var max_uploaded_file_size = '<?php echo MAX_UPLOADED_FILESIZE; ?>';
         var guestSessionDuration = '<?php echo GuestSessionDuration*60; ?>'; // in secs
         var maxGuestTimeInterval = '<?php echo MaxGuestTimeInterval; ?>';    // in days
+
+        var logExecTime = <?php echo (LOG_EXEC_TIME === TRUE ? 'true' : 'false'); ?>;
         //create mask class (LoadMask for elements has been deprecated, use Ext.dom.Element.mask & Ext.dom.Element.unmask)
         var AMDAMask = new Ext.Class({
@@ -64,6 +64,11 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     	Ext.each(session.result, function (tabResult, index) {
+		if (logExecTime && tabResult.exectime)
+		{
+			console.log("CMD EXEC TIME FOR "+tabResult.plot+" = "+tabResult.exectime+"ms");
+		}
+
     		if (tabResult.preview)
         	{
     			var plotPreviewConfig = {
@@ -204,4 +209,4 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
 	    if (!this.plotResultWindowsManager.get(winResultId)) return null;
 	    return this.plotResultWindowsManager.get(winResultId);	    
 	}
-});
 \ No newline at end of file
+});
@@ -201,6 +201,10 @@ Ext.define(&#39;amdaModel.DownloadNode&#39;, {
 				}
 				return;
 			}
+
+			if (logExecTime && res.exectime && (res.exectime != 0)) {
+				console.log("CMD EXEC TIME FOR "+res.id+" = "+res.exectime+"ms");
+			}
 			var newobj = this.createJobObject(res);
 			var newNode = Ext.create(this.get('jobNode'), 
@@ -68,13 +68,17 @@ Ext.define(&#39;amdaModel.ExecutableNode&#39;, {
 				if (res.killed)
 						return;
-     	    
+
 				if (isInteractivePlot){
 					myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
 						module.updateInteractiveSession(res, true);
 					});
 				}
 				else {
+					if (logExecTime && res.exectime && (res.exectime != 0)) {
+						console.log("CMD EXEC TIME FOR "+res.id+" = "+res.exectime+"ms");
+					}
+
 					var newobj = this.createJobObject(res);	    
 					var newNode = Ext.create(this.get('jobNode'), {
 							info : res.info,
@@ -34,4 +34,7 @@ define(&#39;AMDAINTERNALDIR&#39;, &#39;{:AMDAINTERNALDIR:}&#39;);
 define('REST_API_URL', '{:REST_API_URL:}');
 define('API_DOC_PATH', '{:API_DOC_PATH:}');
+
+// Show log in browser console about execution time for a request
+// define('LOG_EXEC_TIME', FALSE);
 ?>