Merge remote-tracking branch 'origin/candidate-5.2.2' into candidate-5.4.0

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

Conflicts:
	thorlcr/activities/hashdistrib/thhashdistribslave.cpp

docs/ECLWatch/ECLWa_mods/ECLWatchSrc.xml

@@ -416,7 +416,7 @@
 
         <!-- added WU Details stuff here -->
 
-        <sect3>
+        <sect3 role="brk">
           <title>Publish Action Button</title>
 
           <para>Click on the Publish action button to publish a query. <figure>
@@ -483,7 +483,7 @@
           </itemizedlist>
         </sect3>
 
-        <sect3 id="ZAP">
+        <sect3 id="ZAP" role="brk">
           <title>Z.A.P. Utility</title>
 
           <para>The Zipped Analysis Package (Z.A.P.) button is a utility for
@@ -530,7 +530,7 @@
           personally identifiable information (PII).</para>
         </sect3>
 
-        <sect3>
+        <sect3 role="brk">
           <title>Outputs tab</title>
 
           <para>Click on the Outputs tab to see all results.<figure>
@@ -578,7 +578,7 @@
           </itemizedlist>
         </sect3>
 
-        <sect3>
+        <sect3 role="brk">
           <title>Visualizations</title>
 
           <para>You can see visual representations of select workunits.
@@ -604,7 +604,7 @@
           menu, to change the parameters.</para>
         </sect3>
 
-        <sect3>
+        <sect3 role="brk">
           <title>Inputs tab</title>
 
           <para>Click on the <emphasis role="bold">Inputs</emphasis> tab to
@@ -627,7 +627,7 @@
           how many times a file was used in the workunit.</para>
         </sect3>
 
-        <sect3>
+        <sect3 role="brk">
           <title>Timers tab</title>
 
           <para>Click on the <emphasis role="bold">Timers</emphasis> tab to
@@ -653,7 +653,7 @@
 
           <para>Click on the <emphasis role="bold">Graphs</emphasis> tab to
           see the graphs produced by the workunit. <figure>
-              <title>GRAPHS***</title>
+              <title>GRAPHS</title>
 
               <mediaobject>
                 <imageobject>
@@ -667,7 +667,7 @@
           the graph.</para>
         </sect3>
 
-        <sect3>
+        <sect3 role="brk">
           <title>Timers tab</title>
 
           <para>Click on the <emphasis role="bold">Timers</emphasis> tab to
@@ -689,6 +689,27 @@
 
           <para><emphasis role="bold">Usage:</emphasis> how many times a file
           was used in the work unit.</para>
+
+          <sect4>
+            <title>Stats</title>
+
+            <para>On the workunit Timers tab is another tab for Stats. The
+            Stats tab is a visual representation of all the workunit timings.
+            </para>
+
+            <figure>
+              <title>Stats</title>
+
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="../../images/ECLWa201.jpg" />
+                </imageobject>
+              </mediaobject>
+            </figure>
+
+            <para>Select the timer values from the drop list on the Stats tab
+            to view the various charts and graphs. </para>
+          </sect4>
         </sect3>
 
         <sect3>

esp/src/eclwatch/templates/LZBrowseWidget.html

@@ -85,7 +85,7 @@
                                             <option value="9">UTF-32BE</option>
                                         </select>
                                         <input id="${id}SprayDelimitedMaxRecordLength" title="${i18n.MaxRecordLength}:" style="width: 95%;" name="sourceMaxRecordSize" value="8192" required="true" colspan="2" data-dojo-props="trim: true, placeHolder:'8192'" data-dojo-type="dijit.form.ValidationTextBox" />
-                                        <input id="${id}SprayDelimitedSeparators" title="${i18n.Separators}:" style="width: 95%;" name="sourceCsvSeparate" value="," data-dojo-props="trim: true, placeHolder:'\,'" colspan="2" data-dojo-type="dijit.form.ValidationTextBox" />
+                                        <input id="${id}SprayDelimitedSeparators" title="${i18n.Separators}:" style="width: 95%;" name="sourceCsvSeparate" value="\," data-dojo-props="trim: true, placeHolder:'\,'" colspan="2" data-dojo-type="dijit.form.ValidationTextBox" />
                                         <input title="${i18n.OmitSeparator}:" name="NoSourceCsvSeparator" colspan="2" data-dojo-type="dijit.form.CheckBox" />
                                         <input id="${id}SprayDelimitedEscape" title="${i18n.Escape}:" style="width: 95%;" name="sourceCsvEscape" data-dojo-props="trim: true" colspan="2" data-dojo-type="dijit.form.TextBox" />
                                         <input id="${id}SprayDelimitedTerminators" title="${i18n.LineTerminators}:" name="sourceCsvTerminate" style="width: 95%;" value="\n,\r\n" required="true" colspan="2" data-dojo-props="trim: true, placeHolder:'\\n,\\r\\n'" data-dojo-type="dijit.form.ValidationTextBox" />

thorlcr/activities/hashdistrib/thhashdistribslave.cpp

@@ -778,7 +778,7 @@ protected:
                         loop
                         {
                             if (timer.elapsedCycles() >= queryOneSecCycles()*10)
-                                owner.ActPrintLog("HD sender, waiting for space, inactive writers = %d, totalSz = %d", queryInactiveWriters(), queryTotalSz());
+                                owner.ActPrintLog("HD sender, waiting for space, inactive writers = %d, totalSz = %d, numFinished = %d", queryInactiveWriters(), queryTotalSz(), atomic_read(&numFinished));
                             timer.reset();
 
                             if (senderFullSem.wait(10000))