From 20e6084ec817bb425935577bf68df9a57e46c9ef Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 12 Sep 2024 08:30:29 +0800 Subject: [PATCH 1/5] Display thread dumps within VisualVM viewer --- coherence-visualvm-plugin/pom.xml | 4 ++ .../visualvm/panel/CoherenceMemberPanel.java | 48 +++++++++++++----- .../visualvm/threaddump/ThreadDumpImpl.java | 50 +++++++++++++++++++ pom.xml | 5 ++ 4 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/threaddump/ThreadDumpImpl.java diff --git a/coherence-visualvm-plugin/pom.xml b/coherence-visualvm-plugin/pom.xml index 4fa81eb..65d46c3 100644 --- a/coherence-visualvm-plugin/pom.xml +++ b/coherence-visualvm-plugin/pom.xml @@ -66,6 +66,10 @@ org.graalvm.visualvm.api org-graalvm-visualvm-application-views + + org.graalvm.visualvm.api + org-graalvm-visualvm-threaddump + org.graalvm.visualvm.api org-graalvm-visualvm-charts diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java index f664b9a..34ccdbe 100755 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2024 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,6 +46,10 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -53,6 +57,7 @@ import java.util.Map.Entry; import java.util.logging.Logger; +import com.oracle.coherence.plugin.visualvm.threaddump.ThreadDumpImpl; import javax.swing.*; import javax.swing.border.CompoundBorder; import javax.swing.border.EmptyBorder; @@ -60,6 +65,8 @@ import javax.swing.event.ChangeListener; import org.graalvm.visualvm.charts.SimpleXYChartSupport; +import org.graalvm.visualvm.core.datasource.DataSource; +import org.graalvm.visualvm.core.ui.DataSourceWindowManager; import org.openide.awt.StatusDisplayer; import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; @@ -515,7 +522,7 @@ public void actionPerformed(ActionEvent e) DialogHelper.showInfoDialog(getLocalText("LBL_thread_dump_confirmation")); - StringBuilder sb = new StringBuilder(sMessage).append("\n").append(generateHeader(nNode)); + StringBuilder sb = new StringBuilder(sMessage); Timer timer = new Timer(nDelay * 1000, null); @@ -542,7 +549,7 @@ public void actionPerformed(ActionEvent e) timer.stop(); status[0] = StatusDisplayer.getDefault().setStatusText(getLocalText("LBL_thread_dump_completed"),5); status[0].clear(5000); - showThreadDumpResult(nNode, sb.toString()); + showThreadDumpInVisualVM(nNode, sb.toString()); } } @@ -555,7 +562,7 @@ public void actionPerformed(ActionEvent e) } else { - showThreadDumpResult(nNodeId, generateHeader(nNodeId) + " " + m_requestSender.getNodeState(nNodeId)); + showThreadDumpInVisualVM(nNodeId, m_requestSender.getNodeState(nNodeId)); } } catch (Exception ee) @@ -568,17 +575,34 @@ public void actionPerformed(ActionEvent e) // ------ helpers ----------------------------------------------- /** - * Display the thread dump result. - * - * @param nNode node id - * @param sThreadDump the result + * Show the therad dump result in VisualVM thread dump viewer. + * @param nNode node id + * @param sThreadDump thread dump content */ - private void showThreadDumpResult(int nNode, String sThreadDump) + private void showThreadDumpInVisualVM(int nNode, String sThreadDump) { - showMessageDialog(getLocalizedText("LBL_state_for_node") + " " + nNode, - sThreadDump, JOptionPane.INFORMATION_MESSAGE, 500, 400, true); + // create a temp file + try + { + File fileTemp = Files.createTempFile("node-" + nNode + "-" , null).toFile(); + try (PrintWriter pw = new PrintWriter(fileTemp, "UTF-8")) + { + pw.write(sThreadDump); + } + + final ThreadDumpImpl threadDump = new ThreadDumpImpl(fileTemp, null); + + DataSource.EVENT_QUEUE.post(new Runnable() + { + public void run() { DataSourceWindowManager.sharedInstance().openDataSource(threadDump); } + }); + } + catch (IOException e) + { + e.printStackTrace(); + } } - } + } /** * Generate a thread dump and save the output in the {@link StringBuilder}. diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/threaddump/ThreadDumpImpl.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/threaddump/ThreadDumpImpl.java new file mode 100644 index 0000000..40e99e2 --- /dev/null +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/threaddump/ThreadDumpImpl.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.oracle.coherence.plugin.visualvm.threaddump; + +import org.graalvm.visualvm.core.datasource.DataSource; +import org.graalvm.visualvm.threaddump.ThreadDump; +import java.io.File; + +/** + * Copied from VisualVM Source. + * + * @author Jiri Sedlacek + */ +public final class ThreadDumpImpl extends ThreadDump + { + + public ThreadDumpImpl(File file, DataSource master) + { + super(file, master); + } + + void forceViewClosable(boolean closable) + { + getStorage().setCustomProperty( "prop_view_closable", Boolean.toString(closable)); + } + + } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 39077ac..25e1e67 100644 --- a/pom.xml +++ b/pom.xml @@ -122,6 +122,11 @@ org-graalvm-visualvm-charts ${visualvm.version} + + org.graalvm.visualvm.api + org-graalvm-visualvm-threaddump + ${visualvm.version} + org.graalvm.visualvm.api org-graalvm-visualvm-core From f7b71c80b284735883cbffa514c53fba654b1c75 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 12 Sep 2024 08:31:56 +0800 Subject: [PATCH 2/5] minor update --- .../coherence/plugin/visualvm/threaddump/ThreadDumpImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/threaddump/ThreadDumpImpl.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/threaddump/ThreadDumpImpl.java index 40e99e2..f7b3224 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/threaddump/ThreadDumpImpl.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/threaddump/ThreadDumpImpl.java @@ -46,5 +46,4 @@ void forceViewClosable(boolean closable) { getStorage().setCustomProperty( "prop_view_closable", Boolean.toString(closable)); } - } \ No newline at end of file From 5fe1d87449b4454daa23a35ac7616d68a98eab70 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 12 Sep 2024 08:43:30 +0800 Subject: [PATCH 3/5] Minor updates --- .../visualvm/panel/CoherenceMemberPanel.java | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java index 34ccdbe..5222c17 100755 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java @@ -50,12 +50,16 @@ import java.io.IOException; import java.io.PrintWriter; import java.nio.file.Files; +import java.nio.file.attribute.FileAttribute; +import java.nio.file.attribute.PosixFilePermission; +import java.nio.file.attribute.PosixFilePermissions; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.logging.Logger; import com.oracle.coherence.plugin.visualvm.threaddump.ThreadDumpImpl; import javax.swing.*; @@ -584,7 +588,23 @@ private void showThreadDumpInVisualVM(int nNode, String sThreadDump) // create a temp file try { - File fileTemp = Files.createTempFile("node-" + nNode + "-" , null).toFile(); + File fileTemp = null; + String sPrefix = "node-" + nNode + "-"; + + if (System.getProperty("os.name").toLowerCase().contains("win")) + { + fileTemp = Files.createTempFile(sPrefix, "suffix").toFile(); + fileTemp.setReadable(true, true); + fileTemp.setWritable(true, true); + fileTemp.setExecutable(true, true); + } + else + { + FileAttribute> attr = + PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")); + fileTemp = Files.createTempFile(sPrefix , null, attr).toFile(); + } + try (PrintWriter pw = new PrintWriter(fileTemp, "UTF-8")) { pw.write(sThreadDump); @@ -599,7 +619,7 @@ private void showThreadDumpInVisualVM(int nNode, String sThreadDump) } catch (IOException e) { - e.printStackTrace(); + LOGGER.warning(e.getMessage()); } } } From a42acca6928b9b4ff7de5d085860c77e5d4e841a Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 12 Sep 2024 08:57:24 +0800 Subject: [PATCH 4/5] Updates --- .../visualvm/panel/CoherenceMemberPanel.java | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java index 5222c17..d0560f2 100755 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java @@ -588,22 +588,16 @@ private void showThreadDumpInVisualVM(int nNode, String sThreadDump) // create a temp file try { - File fileTemp = null; - String sPrefix = "node-" + nNode + "-"; + String sPrefix = "node-" + nNode + "-"; + File fileTempDir = new File(System.getProperty("java.io.tmpdir")); + File fileTemp = File.createTempFile(sPrefix, null, fileTempDir); + fileTemp.setReadable(false); + fileTemp.setWritable(false); + fileTemp.setExecutable(false); + fileTemp.setReadable(true, true); + fileTemp.setWritable(true, true); + fileTemp.setExecutable(true, true); - if (System.getProperty("os.name").toLowerCase().contains("win")) - { - fileTemp = Files.createTempFile(sPrefix, "suffix").toFile(); - fileTemp.setReadable(true, true); - fileTemp.setWritable(true, true); - fileTemp.setExecutable(true, true); - } - else - { - FileAttribute> attr = - PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")); - fileTemp = Files.createTempFile(sPrefix , null, attr).toFile(); - } try (PrintWriter pw = new PrintWriter(fileTemp, "UTF-8")) { From 2fbf5d84662ca9efc8d2956d19b63707af8dc441 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 12 Sep 2024 09:05:08 +0800 Subject: [PATCH 5/5] Updates --- .../visualvm/panel/CoherenceMemberPanel.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java index d0560f2..dfebf47 100755 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java @@ -49,17 +49,13 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; -import java.nio.file.Files; -import java.nio.file.attribute.FileAttribute; -import java.nio.file.attribute.PosixFilePermission; -import java.nio.file.attribute.PosixFilePermissions; + import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import java.util.logging.Logger; import com.oracle.coherence.plugin.visualvm.threaddump.ThreadDumpImpl; import javax.swing.*; @@ -278,7 +274,6 @@ public void updateGUI() { GraphHelper.addValuesToClusterMemoryGraph(f_memoryGraph, cTotalMemory, cTotalMemoryUsed); } - } @Override @@ -591,13 +586,17 @@ private void showThreadDumpInVisualVM(int nNode, String sThreadDump) String sPrefix = "node-" + nNode + "-"; File fileTempDir = new File(System.getProperty("java.io.tmpdir")); File fileTemp = File.createTempFile(sPrefix, null, fileTempDir); - fileTemp.setReadable(false); - fileTemp.setWritable(false); - fileTemp.setExecutable(false); - fileTemp.setReadable(true, true); - fileTemp.setWritable(true, true); - fileTemp.setExecutable(true, true); - + boolean fResult1 = fileTemp.setReadable(false); + boolean fResult2 = fileTemp.setWritable(false); + boolean fResult3 = fileTemp.setExecutable(false); + boolean fResult4 = fileTemp.setReadable(true, true); + boolean fResult5 = fileTemp.setWritable(true, true); + boolean fResult6 = fileTemp.setExecutable(true, true); + + if (!fResult1 || !fResult2 || !fResult3 || !fResult4 || !fResult5 || !fResult6) + { + throw new RuntimeException("unable to set file permissions for " + fileTemp.getAbsolutePath()); + } try (PrintWriter pw = new PrintWriter(fileTemp, "UTF-8")) {