CDPP / AMDA_IHM

Commit 2cfa3a1a0ca91ba5dfabd58a1e22eaf15e57a427

Authored by Benjamin Renard
1 parent 97d270e0
Exists in master and in 108 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Give the possibility to show kernel execution time in console

Showing 6 changed files with 21 additions and 2 deletions   Show diff stats
Inline Side-by-side
.gitignore
  Diff comments   View file @2cfa3a1
... ... @@ -6,6 +6,7 @@ generic_data/RemoteData/
6 6 generic_data/Statistics/
7 7 generic_data/help/
8 8 generic_data/SimuTemplate/TargetsSimu.xml*
  9 +generic_data/guest*
9 10 js/lib/ext
10 11 help/simu
11 12 help/auto
... ...
desktop.php
  Diff comments   View file @2cfa3a1
... ... @@ -97,6 +97,8 @@
97 97 var max_uploaded_file_size = '<?php echo MAX_UPLOADED_FILESIZE; ?>';
98 98 var guestSessionDuration = '<?php echo GuestSessionDuration*60; ?>'; // in secs
99 99 var maxGuestTimeInterval = '<?php echo MaxGuestTimeInterval; ?>'; // in days
  100 +
  101 + var logExecTime = <?php echo (LOG_EXEC_TIME === TRUE ? 'true' : 'false'); ?>;
100 102  
101 103 //create mask class (LoadMask for elements has been deprecated, use Ext.dom.Element.mask & Ext.dom.Element.unmask)
102 104 var AMDAMask = new Ext.Class({
... ...
js/app/controllers/PlotModule.js
  Diff comments   View file @2cfa3a1
... ... @@ -64,6 +64,11 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
64 64  
65 65  
66 66 Ext.each(session.result, function (tabResult, index) {
  67 + if (logExecTime && tabResult.exectime)
  68 + {
  69 + console.log("CMD EXEC TIME FOR "+tabResult.plot+" = "+tabResult.exectime+"ms");
  70 + }
  71 +
67 72 if (tabResult.preview)
68 73 {
69 74 var plotPreviewConfig = {
... ... @@ -204,4 +209,4 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
204 209 if (!this.plotResultWindowsManager.get(winResultId)) return null;
205 210 return this.plotResultWindowsManager.get(winResultId);
206 211 }
207   -});
208 212 \ No newline at end of file
  213 +});
... ...
js/app/models/DownloadNode.js
  Diff comments   View file @2cfa3a1
... ... @@ -201,6 +201,10 @@ Ext.define(&#39;amdaModel.DownloadNode&#39;, {
201 201 }
202 202 return;
203 203 }
  204 +
  205 + if (logExecTime && res.exectime && (res.exectime != 0)) {
  206 + console.log("CMD EXEC TIME FOR "+res.id+" = "+res.exectime+"ms");
  207 + }
204 208  
205 209 var newobj = this.createJobObject(res);
206 210 var newNode = Ext.create(this.get('jobNode'),
... ...
js/app/models/ExecutableNode.js
  Diff comments   View file @2cfa3a1
... ... @@ -68,13 +68,17 @@ Ext.define(&#39;amdaModel.ExecutableNode&#39;, {
68 68  
69 69 if (res.killed)
70 70 return;
71   -
  71 +
72 72 if (isInteractivePlot){
73 73 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
74 74 module.updateInteractiveSession(res, true);
75 75 });
76 76 }
77 77 else {
  78 + if (logExecTime && res.exectime && (res.exectime != 0)) {
  79 + console.log("CMD EXEC TIME FOR "+res.id+" = "+res.exectime+"ms");
  80 + }
  81 +
78 82 var newobj = this.createJobObject(res);
79 83 var newNode = Ext.create(this.get('jobNode'), {
80 84 info : res.info,
... ...
php/my_config.template.php
  Diff comments   View file @2cfa3a1
... ... @@ -34,4 +34,7 @@ define(&#39;AMDAINTERNALDIR&#39;, &#39;{:AMDAINTERNALDIR:}&#39;);
34 34  
35 35 define('REST_API_URL', '{:REST_API_URL:}');
36 36 define('API_DOC_PATH', '{:API_DOC_PATH:}');
  37 +
  38 +// Show log in browser console about execution time for a request
  39 +// define('LOG_EXEC_TIME', FALSE);
37 40 ?>
... ...