javacore-analyser 2.2.0.dev98__tar.gz → 2.2.0.dev113__tar.gz

{javacore_analyser-2.2.0.dev98 → javacore_analyser-2.2.0.dev113}/CONTRIBUTING.md

@@ -104,6 +104,11 @@ or
 
 `docker build -t javacore-analyser .`
 
+If you want to build a particular version, you need to add `--build-arg version=` argument, for example:
+`podman build --build-arg version='==2.1' -t javacore-analyser .` 
+or 
+`podman build --build-arg version='<2.1' -t javacore-analyser .`  
+
 To start the container:  
 `podman run -it --rm --name javacore-analyser --mount type=bind,src="local-dir-on-fs",target=/reports -p 5001:5000 javacore-analyser`  
 

{javacore_analyser-2.2.0.dev98 → javacore_analyser-2.2.0.dev113}/Dockerfile

@@ -1,5 +1,5 @@
 #
-# Copyright IBM Corp. 2024 - 2024
+# Copyright IBM Corp. 2024 - 2025
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -13,5 +13,8 @@ EXPOSE 5000/tcp
 RUN mkdir /reports
 VOLUME ["/reports"]
 
-RUN ["pip", "install", "--no-cache-dir", "javacore-analyser"]
+# As default we do not set the version to have the latest one for build.
+ARG version=
+#RUN ["pip", "install", "--no-cache-dir", "--root-user-action", "ignore", "javacore-analyser${version}"]
+RUN pip install --no-cache-dir --root-user-action ignore javacore-analyser${version}
 CMD ["javacore_analyser_web", "--port=5000", "--reports-dir=/reports"]

{javacore_analyser-2.2.0.dev98 → javacore_analyser-2.2.0.dev113}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: javacore_analyser
-Version: 2.2.0.dev98
+Version: 2.2.0.dev113
 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

{javacore_analyser-2.2.0.dev98 → javacore_analyser-2.2.0.dev113}/src/javacore_analyser/data/xml/report.xsl

@@ -533,6 +533,7 @@
                         that may be reused for unrelated tasks. Two tasks with different thread names are therefore treated
                         as separate threads for the purpose of this report, even if they are executed in the scope of the same
                         Thread java object.
+                        The address of the java Thread object is included for each thread. This corresponds to the address reported in Java heapdumps.
                         The table can be sorted by clicking on any column header.
                         The following information is displayed for each thread:
                         <ul>
@@ -586,7 +587,9 @@
                                         <a>
                                             <xsl:attribute name="id"><xsl:value-of select="concat('toggle_thread_name',$i)"/></xsl:attribute>
                                             <xsl:attribute name="href"><xsl:value-of select="concat('javascript:expand_stack(stack',$i,',toggle_thread_name',$i,')')"/></xsl:attribute>
-                                            <xsl:attribute name="class">expandit</xsl:attribute><xsl:value-of select="thread_name"/></a>
+                                            <xsl:attribute name="class">expandit</xsl:attribute>
+                                            <xsl:value-of select="thread_name"/>
+                                        </a>
                                         <a class="right" target="_blank">
                                             <xsl:attribute name="href">
                                                 <xsl:value-of select="concat('threads/thread_', thread_hash, '.html')"/>
@@ -596,6 +599,7 @@
                                         <br/>
                                         <div  style="display:none;" >
                                             <xsl:attribute name="id"><xsl:value-of select="concat('stack',$i)"/></xsl:attribute>
+                                            java/lang/Thread:<xsl:value-of select="thread_address"/>
                                             <xsl:for-each select="*[starts-with(name(), 'stack')]">
                                                 <div>
                                                     <xsl:choose>

{javacore_analyser-2.2.0.dev98 → javacore_analyser-2.2.0.dev113}/src/javacore_analyser/data/xml/threads/thread.xsl

@@ -33,7 +33,11 @@
                 </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>
+                    <h2>
+                        Wait Report for thread: <b><xsl:value-of select="thread_name"/></b>
+                        <br/>
+                        java/lang/Thread:<xsl:value-of select="thread_address"/>
+                    </h2>
                     <xsl:choose>
                         <xsl:when test="//javacore_count = 1">
                             System resource utilization data cannot be calculated with only a single javacore.

{javacore_analyser-2.2.0.dev98 → javacore_analyser-2.2.0.dev113}/src/javacore_analyser/java_thread.py

@@ -8,6 +8,14 @@ from javacore_analyser.abstract_snapshot_collection import AbstractSnapshotColle
 
 class Thread(AbstractSnapshotCollection):
 
+    def __init__(self):
+        super().__init__()
+        self.thread_address = ""
+
+    def create(self, thread_snapshot):
+        super().create(thread_snapshot)
+        self.thread_address = thread_snapshot.thread_address
+
     def get_hash(self):
         id_str = self.name + str(self.id)
         hashcode = abs(hash(id_str))
@@ -26,6 +34,11 @@ class Thread(AbstractSnapshotCollection):
         name_node.appendChild(doc.createTextNode(self.name + " (" + str(self.id) + ")"))
         thread_node.appendChild(name_node)
 
+        # thread address
+        thread_address_node = doc.createElement("thread_address")
+        thread_address_node.appendChild(doc.createTextNode(self.thread_address))
+        thread_node.appendChild(thread_address_node)
+
         # hash
         hash_node = doc.createElement("thread_hash")
         hash_node.appendChild(doc.createTextNode(self.get_hash()))

{javacore_analyser-2.2.0.dev98 → javacore_analyser-2.2.0.dev113}/src/javacore_analyser/thread_snapshot.py

@@ -21,6 +21,7 @@ class ThreadSnapshot:
         self.allocated_mem = 0
         self.name = None
         self.thread_id = None
+        self.thread_address = None
         self.thread = None
         self.javacore = None
         self.blocker = None
@@ -38,6 +39,7 @@ class ThreadSnapshot:
         snapshot.file = file
         snapshot.javacore = javacore
         snapshot.name = snapshot.get_thread_name(line)
+        snapshot.thread_address = snapshot.get_thread_address(line)
         snapshot.parse_state(line)
         snapshot.parse_snapshot_data()
         return snapshot
@@ -76,6 +78,18 @@ class ThreadSnapshot:
         name = name.translate(str.maketrans({"\01": "[SOH]"}))
         return name
 
+    def get_thread_address(self, line):
+        """ assuming line format:
+        3XMTHREADINFO      "Default Executor-thread-27781" J9VMThread:0x0000000009443300,
+        omrthread_t:0x000000A8B62C3758, java/lang/Thread:0x00000008432D4140, state:B, prio=5 """
+        match = re.search("(java/lang/Thread:)(0x[0-9a-fA-F]+)", line)
+        address = ""
+        if match:   # native threads don't have an address
+            address = match.group(2)
+        if self.javacore:
+            address = self.javacore.encode(address)
+        return address
+
     def get_thread_hash(self):
         if self.thread:
             return self.thread.get_hash()
@@ -198,18 +212,6 @@ class ThreadSnapshot:
         file_name = ""
         if self.file:
             file_name = self.javacore.filename.split(os.sep)[-1].strip()
-        # thread name
-        thread_name_node = doc.createElement("thread_name")
-        thread_name_node.appendChild(doc.createTextNode(self.name))
-        thread_snapshot_node.appendChild(thread_name_node)
-        # thread id
-        thread_name_node = doc.createElement("thread_id")
-        thread_name_node.appendChild(doc.createTextNode(str(self.get_thread_id())))
-        thread_snapshot_node.appendChild(thread_name_node)
-        # thread hash
-        thread_hash_node = doc.createElement("thread_hash")
-        thread_hash_node.appendChild(doc.createTextNode(str(self.get_thread_hash())))
-        thread_snapshot_node.appendChild(thread_hash_node)
         # CPU usage
         cpu_usage_node = doc.createElement("cpu_usage")
         cpu_usage_node.appendChild(doc.createTextNode(str(self.get_cpu_usage_inc())))