PyPI - javacore-analyser - Versions diffs - 2.0rc1__tar.gz → 2.0rc3__tar.gz - Mend

javacore-analyser 2.0rc1tar.gz → 2.0rc3tar.gz

Files changed (113) hide show

{javacore_analyser-2.0rc1 → javacore_analyser-2.0rc3}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: javacore_analyser
-Version: 2.0rc1
+Version: 2.0rc3
 Summary: The tool to review IBM Javacore files
 Project-URL: Homepage, https://github.com/IBM/javacore-analyser
 Project-URL: Issues, https://github.com/IBM/javacore-analyser/issues
@@ -226,12 +226,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
-Requires-Dist: dicttoxml
 Requires-Dist: flask
 Requires-Dist: importlib-resources
 Requires-Dist: lxml
 Requires-Dist: py7zr
 Requires-Dist: pyana
+Requires-Dist: tqdm
 Requires-Dist: waitress
 Description-Content-Type: text/markdown

{javacore_analyser-2.0rc1 → javacore_analyser-2.0rc3}/pyproject.toml RENAMED Viewed

@@ -8,9 +8,9 @@ requires = ["hatchling", "versioningit"]
 build-backend = "hatchling.build"
 [project]
-#dynamic = ["version"]
+dynamic = ["version"]
 name = "javacore_analyser"
-version = "2.0rc1"
+#version = "2.0rc1"
 authors = [
     { name="Krzysztof Kazmierczyk", email="kazm@ibm.com" },
     { name="Piotr Aniola", email="Piotr.Aniola@ibm.com" },
@@ -40,13 +40,13 @@ classifiers = [
     "Natural Language :: English",
 ]
 dependencies = [
-    "dicttoxml",
     "py7zr",
     "lxml",
     "pyana",
     "importlib-resources",
     "flask",
-    "waitress"
+    "waitress",
+    "tqdm"
 ]
 [project.scripts]

{javacore_analyser-2.0rc1 → javacore_analyser-2.0rc3}/requirements.txt RENAMED Viewed

@@ -1,7 +1,7 @@
-dicttoxml
 py7zr
 lxml
 pyana
 importlib-resources
 waitress # Production WSGI server
-flask # WSGI server for development the code
+flask # WSGI server for development the code
+tqdm

{javacore_analyser-2.0rc1 → javacore_analyser-2.0rc3}/src/javacore_analyser/data/jquery/wait2scripts.js RENAMED Viewed

@@ -145,12 +145,34 @@ const loadChartGC = function() {
   });
   // 3. find the HEAP_SIZE
-  const MB_SIZE = Math.pow(1024, 2)
+  const MB_SIZE = Math.pow(1024, 2);
+  let heapAsString = document.getElementById('sys_info_table').rows[2].cells[1].innerHTML;
   let HEAP_SIZE;
-  if(document.getElementById('sys_info_table').rows[2].cells[1].innerHTML.slice(-1).toLowerCase() === 'g')
-    HEAP_SIZE = Number(document.getElementById('sys_info_table').rows[2].cells[1].innerHTML.slice(0, -1)) * MB_SIZE * 1024;
-  else
-    HEAP_SIZE = Number(document.getElementById('sys_info_table').rows[2].cells[1].innerHTML.slice(0, -1)) * MB_SIZE;
+  let heapUnit = heapAsString.slice(-1).toLowerCase();
+  if(!isNaN(Number(heapUnit))) {
+     HEAP_SIZE = Number(heapAsString);
+  }
+  else {
+      switch (heapUnit) {
+        case "g":
+            HEAP_SIZE =
+                Number(heapAsString.slice(0, -1)) * MB_SIZE * 1024;
+        break;
+        case "m":
+            HEAP_SIZE =
+                Number(heapAsString.slice(0, -1)) * MB_SIZE;
+        break;
+        case "k":
+            HEAP_SIZE =
+                Number(heapAsString.slice(0, -1)) * 1024;
+        break;
+        default:
+            console.log("Hmm, what now .. heap unit undefined!");
+        break;
+      }
+  }
   // 4. create input data for GC chart
   //        start with gc collection done after the first javacore creation

javacore_analyser-2.0rc3/src/javacore_analyser/data/xml/javacores/javacore.xsl ADDED Viewed

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+# Copyright IBM Corp. 2024 - 2024
+# SPDX-License-Identifier: Apache-2.0
+-->
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:template match="text()"/> <!-- these are not the nodes you're looking for -->
+    <xsl:template match="/">
+        <html height="100%">
+            <head>
+                <link rel="stylesheet" href="../data/style.css"/>
+                <link rel="stylesheet" href="../data/jquery/jq.css" />
+                <link rel="stylesheet" href="../data/jquery/theme.blue.css" />
+                <link rel="stylesheet" href="../data/jquery/theme.default.min.css" />
+                <script type="text/javascript" src="../data/jquery/jquery.min.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/jquery.tablesorter.min.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/jquery.tablesorter.widgets.min.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/wait2scripts.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/sorting.js"> _ </script>
+                <script type="text/javascript" src="../data/expand.js"> _ </script>
+                <script src="../data/jquery/jquery.mark.min.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/search.js"> _ </script>
+            </head>
+            <body id="doc_body" height="100%">
+                <div class="searchbar">
+                    <input id="search-input" type="search" />
+                    <button data-search="search" id="search-button">Search</button>
+                    <button data-search="next">Next</button>
+                    <button data-search="prev">Prev</button>
+                    <button data-search="clear">✖</button>
+                </div>
+                <div class="content">
+                    <p class="right"><a href="../index.html"> Back to Main page </a></p>
+                    <h2>Wait Report for: <b>{id}</b></h2>
+                    <div id="all_threads">
+                        <table id="javacore_threads_table" class="tablesorter_blue">
+                            <thead>
+                                <tr>
+                                    <th class="sixty">Thread name</th>
+                                    <th>Total CPU usage (s)</th>
+                                    <th>% CPU usage</th>
+                                    <th>Memory allocated since last GC (MB)</th>
+                                    <th>Java stack depth</th>
+                                    <th>Status</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <xsl:for-each select="//Thread/all_snapshot_collection/snapshot_collection/stack[file_name='{id}']">
+                                    <xsl:variable name="i" select="position()" />
+                                    <tr>
+                                        <td class="left">
+                                            <div>
+                                                <xsl:attribute name="id">
+                                                    <xsl:value-of select="concat('stack',$i)"/>
+                                                </xsl:attribute>
+                                                <a target="_blank">
+                                                    <xsl:attribute name="href">
+                                                        <xsl:value-of select="concat('../threads/thread_', thread_hash, '.html')"/>
+                                                    </xsl:attribute>
+                                                    <xsl:value-of select="thread_name"/>
+                                                </a>
+                                                <xsl:choose>
+                                                    <xsl:when test="stack_depth &gt; 0">
+                                                    <div>
+                                                        <div class="toggle_expand">
+                                                            <a href="javaScript:;" class="show">[+] Expand</a> <!-- "show" class is used in expand.js -->
+                                                        </div>
+                                                        <p class="stacktrace">
+                                                            <xsl:for-each select="*[starts-with(name(), 'line')]">
+                                                                <span>
+                                                                    <xsl:attribute name="class">
+                                                                        <xsl:value-of select="@kind"/>
+                                                                    </xsl:attribute>
+                                                                    <xsl:value-of select="current()"/>
+                                                                </span>
+                                                                <br/>
+                                                            </xsl:for-each>
+                                                        </p>
+                                                    </div>
+                                                    </xsl:when>
+                                                    <xsl:otherwise>
+                                                        No stack
+                                                    </xsl:otherwise>
+                                                </xsl:choose>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <xsl:choose>
+                                                <xsl:when test="cpu_usage &gt;= 0">
+                                                    <xsl:value-of select='format-number(cpu_usage, "0.00")'/>
+                                                </xsl:when>
+                                                <xsl:otherwise>
+                                                    <div class="warning">[!]
+                                                        <span class="warningtooltip">Error computing CPU usage, javacores may be corrupted</span>
+                                                    </div>
+                                                </xsl:otherwise>
+                                            </xsl:choose>
+                                        </td>
+                                        <td>
+                                            <xsl:choose>
+                                                <xsl:when test="cpu_percentage &gt;= 0">
+                                                    <xsl:value-of select='format-number(cpu_percentage, "0.0")'/>
+                                                </xsl:when>
+                                                <xsl:otherwise>
+                                                    <div class="warning">[!]
+                                                        <span class="warningtooltip">Error computing CPU percentage, javacores may be corrupted</span>
+                                                    </div>
+                                                </xsl:otherwise>
+                                            </xsl:choose>
+                                        </td>
+                                        <td><xsl:value-of select='format-number(allocated_memory div 1024 div 1024, "0.00")'/></td>
+                                        <td><xsl:value-of select='java_stack_depth'/></td>
+                                        <xsl:choose>
+                                        <xsl:when test="state='CW'">
+                                            <td class="waiting">Waiting on condition</td>
+                                        </xsl:when>
+                                        <xsl:when test="state='R'">
+                                            <td class="runnable">Runnable</td>
+                                        </xsl:when>
+                                        <xsl:when test="state='P'">
+                                            <td class="parked">
+                                                <xsl:choose>
+                                                    <xsl:when test="blocked_by=''">
+                                                        Parked
+                                                    </xsl:when>
+                                                    <xsl:otherwise>
+                                                        <a target="_blank">
+                                                            <xsl:attribute name="href">
+                                                                <xsl:value-of select="concat('../threads/thread_', blocked_by/@thread_hash, '.html')"/>
+                                                            </xsl:attribute>
+                                                            <xsl:attribute name="title">
+                                                                <xsl:value-of select="blocked_by/@name" />
+                                                            </xsl:attribute>
+                                                            Parked on <xsl:value-of select="blocked_by/@thread_id"/>
+                                                        </a>
+                                                    </xsl:otherwise>
+                                                </xsl:choose>
+                                            </td>
+                                        </xsl:when>
+                                        <xsl:when test="state='B'">
+                                            <td class="blocked">
+                                                <a target="_blank">
+                                                    <xsl:attribute name="href">
+                                                        <xsl:value-of select="concat('../threads/thread_', blocked_by/@thread_hash, '.html')"/>
+                                                    </xsl:attribute>
+                                                    <xsl:attribute name="title">
+                                                                <xsl:value-of select="blocked_by/@name" />
+                                                    </xsl:attribute>
+                                                    Blocked by <xsl:value-of select="blocked_by/@thread_id"/>
+                                                </a>
+                                            </td>
+                                        </xsl:when>
+                                        <xsl:otherwise>
+                                            <td><xsl:value-of select="state"/></td>
+                                        </xsl:otherwise>
+                                    </xsl:choose>
+                                </tr>
+                            </xsl:for-each>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </body>
+            <script type="text/javascript" src="../data/expand.js"> _ <!-- underscore character is required to prevent converting to <script /> which does not work --> </script>
+        </html>
+        <xsl:call-template name="expand_it"/>
+    </xsl:template>
+    <xsl:template name="expand_it">
+        <script language="JavaScript"></script>
+    </xsl:template>
+</xsl:stylesheet>

{javacore_analyser-2.0rc1 → javacore_analyser-2.0rc3}/src/javacore_analyser/data/xml/report.xsl RENAMED Viewed

@@ -748,7 +748,7 @@
                     <p></p>
                     <div class="margined">
-                        <a href="https://w3.ibm.com/w3publisher/wait2-tool" target="_blank">Documentation</a>
+                        <a href="https://github.com/IBM/javacore-analyser/wiki" target="_blank">Documentation</a>
                     </div>
                     <div class="margined">
                         In case of any issues with the tool use Slack group:

javacore_analyser-2.0rc3/src/javacore_analyser/data/xml/threads/thread.xsl ADDED Viewed

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+# Copyright IBM Corp. 2024 - 2024
+# SPDX-License-Identifier: Apache-2.0
+-->
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:template match="text()"/> <!-- these are not the threads you're looking for -->
+    <xsl:template match="/index/doc/Thread/all_snapshot_collection/snapshot_collection[thread_hash='{id}']">
+        <html height="100%">
+            <head>
+                <link rel="stylesheet" href="../data/style.css"/>
+                <link rel="stylesheet" href="../data/jquery/jq.css" />
+                <link rel="stylesheet" href="../data/jquery/theme.blue.css" />
+                <link rel="stylesheet" href="../data/jquery/theme.default.min.css" />
+                <script type="text/javascript" src="../data/jquery/jquery.min.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/jquery.tablesorter.min.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/jquery.tablesorter.widgets.min.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/chart.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/chartjs-adapter-date-fns.bundle.min.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/wait2scripts.js"> _ </script>
+                <script src="../data/jquery/jquery.mark.min.js"> _ </script>
+                <script type="text/javascript" src="../data/jquery/search.js"> _ </script>
+            </head>
+            <body id="doc_body" height="100%">
+                <div class="searchbar">
+                    <input id="search-input" type="search" />
+                    <button data-search="search" id="search-button">Search</button>
+                    <button data-search="next">Next</button>
+                    <button data-search="prev">Prev</button>
+                    <button data-search="clear">✖</button>
+                </div>
+                <div class="content">
+                    <p class="right"><a href="../index.html"> Back to Main page </a></p>
+                    <h2>Wait Report for thread: <b><xsl:value-of select="thread_name"/></b></h2>
+                    <xsl:choose>
+                        <xsl:when test="//javacore_count = 1">
+                            System resource utilization data cannot be calculated with only a single javacore.
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <div class="chart-container" height="25%">
+                                <canvas id="myChart" height="100%"></canvas>
+                            </div>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                    <div id="all_threads">
+                        <table id="all_threads_table_thread_xsl">
+                            <thead>
+                                <tr>
+                                    <th>Timestamp</th>
+                                    <th>Elapsed time (s)</th>
+                                    <th>CPU usage (s)</th>
+                                    <th>% CPU usage</th>
+                                    <th class='sixty'>Stack trace</th>
+                                    <th>State</th>
+                                    <th>Blocking</th>
+                                </tr>
+                            </thead>
+                            <!-- Snapshot starts here -->
+                            <xsl:for-each select="*[starts-with(name(), 'stack')]">
+                                <tr>
+                                    <td>
+                                        <a>
+                                            <xsl:attribute name="href">
+                                                ../javacores/<xsl:value-of select="file_name"/>.html
+                                            </xsl:attribute>
+                                            <xsl:value-of select='timestamp'/>
+                                        </a>
+                                    </td>
+                                    <xsl:choose>
+                                        <xsl:when test="position()=1">
+                                            <td>N/A</td>
+                                        </xsl:when>
+                                        <xsl:otherwise>
+                                            <td>
+                                                <xsl:value-of select='format-number(elapsed_time, "0.##")'/>
+                                            </td>
+                                        </xsl:otherwise>
+                                    </xsl:choose>
+                                    <xsl:choose>
+                                        <xsl:when test="position()=1">
+                                            <td>N/A</td>
+                                        </xsl:when>
+                                        <xsl:otherwise>
+                                            <td><xsl:value-of select='format-number(cpu_usage, "0.##")'/></td>
+                                        </xsl:otherwise>
+                                    </xsl:choose>
+                                    <xsl:choose>
+                                            <xsl:when test="position()=1">
+                                                <td>N/A</td>
+                                            </xsl:when>
+                                            <xsl:otherwise>
+                                                <td><xsl:value-of select='format-number(cpu_percentage, "0.#")'/></td>
+                                            </xsl:otherwise>
+                                        </xsl:choose>
+                                    <td class="left">
+                                        <div>
+                                            <xsl:choose>
+                                                <xsl:when test="stack_depth &gt; 0">
+                                                    <div class="toggle_expand">
+                                                        <a href="javaScript:;" class="show">[+] Expand</a>
+                                                    </div>
+                                                    <p class="stacktrace">
+                                                        <xsl:for-each select="*[starts-with(name(), 'line')]">
+                                                            <span>
+                                                                <xsl:attribute name="class"><xsl:value-of select="@kind"/></xsl:attribute>
+                                                                <xsl:value-of select="current()"/>
+                                                            </span>
+                                                            <br/>
+                                                        </xsl:for-each>
+                                                    </p>
+                                                </xsl:when>
+                                                <xsl:otherwise>
+                                                    No Stack
+                                                </xsl:otherwise>
+                                            </xsl:choose>
+                                        </div>
+                                    </td>
+                                    <xsl:choose>
+                                        <xsl:when test="state='CW'">
+                                            <td class="waiting">
+                                                <xsl:choose>
+                                                    <xsl:when test="blocked_by=''">
+                                                        Waiting on condition
+                                                    </xsl:when>
+                                                    <xsl:otherwise>
+                                                        <a target="_blank">
+                                                            <xsl:attribute name="href">
+                                                                <xsl:value-of select="concat('thread_', blocked_by/@thread_hash, '.html')"/>
+                                                            </xsl:attribute>
+                                                            <xsl:attribute name="title">
+                                                                <xsl:value-of select="blocked_by/@name" />
+                                                            </xsl:attribute>
+                                                            Waiting for <xsl:value-of select="blocked_by/@thread_id"/>
+                                                        </a>
+                                                    </xsl:otherwise>
+                                                </xsl:choose>
+                                            </td>
+                                        </xsl:when>
+                                        <xsl:when test="state='R'">
+                                            <td class="runnable">Runnable</td>
+                                        </xsl:when>
+                                        <xsl:when test="state='P'">
+                                            <td class="parked">
+                                                <xsl:choose>
+                                                    <xsl:when test="blocked_by=''">
+                                                        Parked
+                                                    </xsl:when>
+                                                    <xsl:otherwise>
+                                                        <a target="_blank">
+                                                            <xsl:attribute name="href">
+                                                                <xsl:value-of select="concat('thread_', blocked_by/@thread_hash, '.html')"/>
+                                                            </xsl:attribute>
+                                                            <xsl:attribute name="title">
+                                                                <xsl:value-of select="blocked_by/@name" />
+                                                            </xsl:attribute>
+                                                            Parked on <xsl:value-of select="blocked_by/@thread_id"/>
+                                                        </a>
+                                                    </xsl:otherwise>
+                                                </xsl:choose>
+                                            </td>
+                                        </xsl:when>
+                                        <xsl:when test="state='B'">
+                                            <td class="blocked">
+                                                <a target="_blank">
+                                                    <xsl:attribute name="href">
+                                                        <xsl:value-of select="concat('thread_', blocked_by/@thread_hash, '.html')"/>
+                                                    </xsl:attribute>
+                                                    <xsl:attribute name="title">
+                                                                <xsl:value-of select="blocked_by/@name" />
+                                                    </xsl:attribute>
+                                                    Blocked by <xsl:value-of select="blocked_by/@thread_id"/>
+                                                </a>
+                                            </td>
+                                        </xsl:when>
+                                        <xsl:otherwise>
+                                            <td><xsl:value-of select="state"/></td>
+                                        </xsl:otherwise>
+                                    </xsl:choose>
+                                    <td>
+                                        <xsl:choose>
+                                                <xsl:when test="blocking/thread">
+                                                    blocking:
+                                                    <xsl:for-each select="blocking/thread">
+                                                        <a target="_blank">
+                                                            <xsl:attribute name="href">
+                                                                <xsl:value-of select="concat('thread_', @thread_hash, '.html')"/>
+                                                            </xsl:attribute>
+                                                            <xsl:attribute name="title">
+                                                                <xsl:value-of select="@name" />
+                                                            </xsl:attribute>
+                                                            <xsl:value-of select="@thread_id" />
+                                                        </a>;
+                                                    </xsl:for-each>
+                                                </xsl:when>
+                                             </xsl:choose>
+                                    </td>
+                                </tr>
+                            </xsl:for-each>
+                        </table>
+                    </div>
+                </div>
+            </body>
+            <script>loadChart();</script>
+            <script type="text/javascript" src="../data/expand.js"> _ <!-- underscore character is required to prevent converting to <script /> which does not work --> </script>
+        </html>
+        <xsl:call-template name="expand_it"/>
+    </xsl:template>
+    <xsl:template name="expand_it">
+        <script language="JavaScript"></script>
+    </xsl:template>
+</xsl:stylesheet>

{javacore_analyser-2.0rc1 → javacore_analyser-2.0rc3}/src/javacore_analyser/javacore_set.py RENAMED Viewed

@@ -15,8 +15,10 @@ from pathlib import Path
 from xml.dom.minidom import parseString
 import importlib_resources
+from importlib_resources.abc import Traversable
 from lxml import etree
 from lxml.etree import XMLSyntaxError
+from tqdm import tqdm
 from javacore_analyser import tips
 from javacore_analyser.code_snapshot_collection import CodeSnapshotCollection
@@ -140,28 +142,28 @@ class JavacoreSet:
             shutil.rmtree(data_output_dir, ignore_errors=True)
         logging.info("Data dir: " + data_output_dir)
-        style_css_resource = importlib_resources.files("javacore_analyser") / "data" / "style.css"
+        style_css_resource: Traversable = importlib_resources.files("javacore_analyser") / "data" / "style.css"
         data_dir = os.path.dirname(style_css_resource)
         os.mkdir(data_output_dir)
         shutil.copytree(data_dir, data_output_dir, dirs_exist_ok=True)
     def __generate_htmls_for_threads(self, output_dir, temp_dir_name):
-        _create_xml_xsl_for_collection(temp_dir_name + "/threads",
-                                       output_dir + "/data/xml/threads", "thread",
+        _create_xml_xsl_for_collection(os.path.join(temp_dir_name, "threads"),
+                                       os.path.join(output_dir, "data", "xml", "threads"), "thread",
                                        self.threads,
                                        "thread")
         self.generate_htmls_from_xmls_xsls(self.report_xml_file,
-                                           temp_dir_name + "/threads",
-                                           output_dir + "/threads", )
+                                           os.path.join(temp_dir_name, "threads"),
+                                           os.path.join(output_dir, "threads"))
     def __generate_htmls_for_javacores(self, output_dir, temp_dir_name):
-        _create_xml_xsl_for_collection(temp_dir_name + "/javacores",
-                                       output_dir + "/data/xml/javacores/", "javacore",
+        _create_xml_xsl_for_collection(os.path.join(temp_dir_name, "javacores"),
+                                       os.path.join(output_dir, "data", "xml", "javacores"), "javacore",
                                        self.javacores,
                                        "")
         self.generate_htmls_from_xmls_xsls(self.report_xml_file,
-                                           temp_dir_name + "/javacores",
-                                           output_dir + "/javacores", )
+                                           os.path.join(temp_dir_name, "javacores"),
+                                           os.path.join(output_dir, "javacores"))
     def populate_snapshot_collections(self):
         for javacore in self.javacores:
@@ -519,10 +521,13 @@ class JavacoreSet:
             os.mkdir(output_dir)
         shutil.copy2(report_xml_file, data_input_dir)
+        list_files = os.listdir(data_input_dir)
+        progress_bar = tqdm(desc="Generating html files", unit=' files')
         # Generating list of tuples. This is required attribute for p.map function executed few lines below.
         generate_html_from_xml_xsl_files_params = []
-        for file in os.listdir(data_input_dir):
-            generate_html_from_xml_xsl_files_params.append((file, data_input_dir, output_dir))
+        for file in list_files:
+            generate_html_from_xml_xsl_files_params.append((file, data_input_dir, output_dir, progress_bar))
         # https://docs.python.org/3.8/library/multiprocessing.html
         threads_no = JavacoreSet.get_number_of_parallel_threads()
@@ -530,6 +535,7 @@ class JavacoreSet:
         with Pool(threads_no) as p:
             p.map(JavacoreSet.generate_html_from_xml_xsl_files, generate_html_from_xml_xsl_files_params)
+        progress_bar.close()
         logging.info(f"Generated html files in {output_dir}")
     # Run with the same number of threads as you have processes but leave one thread for something else.
@@ -540,7 +546,7 @@ class JavacoreSet:
     @staticmethod
     def generate_html_from_xml_xsl_files(args):
-        collection_file, collection_input_dir, output_dir = args
+        collection_file, collection_input_dir, output_dir, progress_bar = args
         if not collection_file.endswith(".xsl"): return
@@ -567,6 +573,25 @@ class JavacoreSet:
         logging.debug("Generating file " + html_file)
         output_doc.write(html_file, pretty_print=True)
+        progress_bar.update(1)
+    def create_xml_xsl_for_collection(self, tmp_dir, xml_xsls_prefix_path, collection, output_file_prefix):
+        logging.info("Creating xmls and xsls in " + tmp_dir)
+        os.mkdir(tmp_dir)
+        extensions = [".xsl", ".xml"]
+        for extension in extensions:
+            file_content = Path(xml_xsls_prefix_path + extension).read_text()
+            for element in tqdm(collection, desc="Creating xml/xsl files", unit=" files"):
+                element_id = element.get_id()
+                filename = output_file_prefix + "_" + str(element_id) + extension
+                if filename.startswith("_"):
+                    filename = filename[1:]
+                file = os.path.join(tmp_dir, filename)
+                logging.debug("Writing file " + file)
+                f = open(file, "w")
+                f.write(file_content.format(id=element_id))
+                f.close()
     @staticmethod
     def parse_mem_arg(line):
         line = line.split()[-1]  # avoid matching the '2' in tag name 2CIUSERARG

{javacore_analyser-2.0rc1 → javacore_analyser-2.0rc3}/src/javacore_analyser/templates/index.html RENAMED Viewed

@@ -17,12 +17,17 @@
     <h2>Generate report:</h2>
     <form action="/upload" method="post" enctype="multipart/form-data">
-      <br>Report Name: <input type="text" id="report_name" name="report_name" required></br>
-      <br>Archive file or multiple javacore files: <input type="file" name="files" multiple required> </br>
+      <ol>
+      <li>Choose archive (zip, 7z, tgz, bz2) file or multiple javacore files:
+        <input type="file" name="files" multiple required>
+      </li>
+      <li>Give the name for your report: <input type="text" id="report_name" name="report_name" required></li>
+      <li>Click button to process: <input type="submit" value="Run"></li>
+      </ol>
       <strong>
-        NOTE: The report generation is expensive operation and might take even few minutes. Please be patient
+        NOTE: Report generation is an expensive operation. It may take a few minutes. Please be patient.
       </strong>
-      <br><input type="submit" value="Upload"></br>
     </form>
     <br></br>

javacore-analyser 2.0rc1__tar.gz → 2.0rc3__tar.gz

javacore-analyser 2.0rc1tar.gz → 2.0rc3tar.gz