Skip to content

Commit 42f7c64

Browse files
thurkathurka
committed
GH-343 Extract Heap library to a separate module
1 parent c878fe5 commit 42f7c64

File tree

92 files changed

+192
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+192
-12
lines changed

‎visualvm/heapviewer.console/nbproject/project.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525
</run-dependency>
2626
</dependency>
2727
<dependency>
28-
<code-name-base>org.graalvm.visualvm.lib.jfluid</code-name-base>
28+
<code-name-base>org.graalvm.visualvm.lib.jfluid.heap</code-name-base>
2929
<build-prerequisite/>
3030
<compile-dependency/>
3131
<run-dependency>
32-
<release-version>2</release-version>
33-
<specification-version>2.7</specification-version>
32+
<specification-version>1.0</specification-version>
3433
</run-dependency>
3534
</dependency>
3635
<dependency>

‎visualvm/heapviewer.console/src/org/graalvm/visualvm/heapviewer/console/r/RConsoleView.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
import javax.swing.plaf.basic.BasicSplitPaneDivider;
7979
import javax.swing.plaf.basic.BasicSplitPaneUI;
8080
import org.graalvm.polyglot.Context;
81-
import org.graalvm.visualvm.lib.jfluid.ProfilerLogger;
8281
import org.graalvm.visualvm.lib.jfluid.heap.Heap;
8382
import org.graalvm.visualvm.lib.jfluid.heap.Instance;
8483
import org.graalvm.visualvm.lib.jfluid.heap.JavaClass;
@@ -192,7 +191,7 @@ class RConsoleView extends HeapViewerFeature {
192191
// if (REngine.isSupported()) try {
193192
// engine = new REngine(heap);
194193
// } catch (Exception e) {
195-
// ProfilerLogger.log(e);
194+
// LOGGER.log(Level.INFO, "Error initializing REngine", e); // NOI18N
196195
// }
197196

198197
// if (engine != null) {
@@ -219,7 +218,7 @@ protected String computeData(HeapContext context, String viewID) {
219218
if (REngine.isSupported()) try {
220219
engine = new REngine(heap);
221220
} catch (Exception e) {
222-
ProfilerLogger.log(e);
221+
LOGGER.log(Level.INFO, "Error initializing REngine", e); // NOI18N
223222
}
224223

225224
updateUIState();

‎visualvm/heapviewer.truffle/nbproject/project.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
<specification-version>2.8</specification-version>
3434
</run-dependency>
3535
</dependency>
36+
<dependency>
37+
<code-name-base>org.graalvm.visualvm.lib.jfluid.heap</code-name-base>
38+
<build-prerequisite/>
39+
<compile-dependency/>
40+
<run-dependency>
41+
<specification-version>1.0</specification-version>
42+
</run-dependency>
43+
</dependency>
3644
<dependency>
3745
<code-name-base>org.graalvm.visualvm.lib.profiler.api</code-name-base>
3846
<build-prerequisite/>

‎visualvm/heapviewer/nbproject/project.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@
2424
<specification-version>2.8</specification-version>
2525
</run-dependency>
2626
</dependency>
27+
<dependency>
28+
<code-name-base>org.graalvm.visualvm.lib.jfluid.heap</code-name-base>
29+
<build-prerequisite/>
30+
<compile-dependency/>
31+
<run-dependency>
32+
<specification-version>1.0</specification-version>
33+
</run-dependency>
34+
</dependency>
2735
<dependency>
2836
<code-name-base>org.graalvm.visualvm.lib.profiler.api</code-name-base>
2937
<build-prerequisite/>

‎visualvm/libs.profiler/lib.profiler.heap/build.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
4+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5+
6+
This code is free software; you can redistribute it and/or modify it
7+
under the terms of the GNU General Public License version 2 only, as
8+
published by the Free Software Foundation. Oracle designates this
9+
particular file as subject to the "Classpath" exception as provided
10+
by Oracle in the LICENSE file that accompanied this code.
11+
12+
This code is distributed in the hope that it will be useful, but WITHOUT
13+
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14+
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15+
version 2 for more details (a copy is included in the LICENSE file that
16+
accompanied this code).
17+
18+
You should have received a copy of the GNU General Public License version
19+
2 along with this work; if not, write to the Free Software Foundation,
20+
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21+
22+
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23+
or visit www.oracle.com if you need additional information or have any
24+
questions.
25+
-->
26+
<project basedir="." default="netbeans" name="lib.profiler.heap">
27+
<description>Builds, tests, and runs the project org.graalvm.visualvm.lib.jfluid.heap</description>
28+
<import file="nbproject/build-impl.xml"/>
29+
</project>

‎visualvm/libs.profiler/lib.profiler.heap/manifest.mf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Manifest-Version: 1.0
2+
OpenIDE-Module: org.graalvm.visualvm.lib.jfluid.heap
3+
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/jfluid/heap/Bundle.properties
4+
OpenIDE-Module-Specification-Version: 1.0
5+

‎visualvm/libs.profiler/lib.profiler.heap/nbproject/build-impl.xml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
*** GENERATED FROM project.xml - DO NOT EDIT ***
4+
*** EDIT ../build.xml INSTEAD ***
5+
-->
6+
<project name="org.graalvm.visualvm.lib.jfluid.heap-impl" basedir="..">
7+
<fail message="Please build using Ant 1.7.1 or higher.">
8+
<condition>
9+
<not>
10+
<antversion atleast="1.7.1"/>
11+
</not>
12+
</condition>
13+
</fail>
14+
<property file="nbproject/private/suite-private.properties"/>
15+
<property file="nbproject/suite.properties"/>
16+
<fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
17+
<property file="${suite.dir}/nbproject/private/platform-private.properties"/>
18+
<property file="${suite.dir}/nbproject/platform.properties"/>
19+
<macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
20+
<attribute name="name"/>
21+
<attribute name="value"/>
22+
<sequential>
23+
<property name="@{name}" value="${@{value}}"/>
24+
</sequential>
25+
</macrodef>
26+
<macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
27+
<attribute name="property"/>
28+
<attribute name="value"/>
29+
<sequential>
30+
<property name="@{property}" value="@{value}"/>
31+
</sequential>
32+
</macrodef>
33+
<property file="${user.properties.file}"/>
34+
<nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
35+
<nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
36+
<nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
37+
<fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
38+
<condition>
39+
<not>
40+
<contains string="${cluster.path.evaluated}" substring="platform"/>
41+
</not>
42+
</condition>
43+
</fail>
44+
<import file="${harness.dir}/build.xml"/>
45+
</project>

‎visualvm/libs.profiler/lib.profiler.heap/nbproject/genfiles.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2+
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
3+
nbproject/build-impl.xml.data.CRC32=d0716bc0
4+
nbproject/build-impl.xml.script.CRC32=9dc5437f
5+
nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

‎visualvm/libs.profiler/lib.profiler.heap/nbproject/project.properties

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
2+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3+
#
4+
# This code is free software; you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License version 2 only, as
6+
# published by the Free Software Foundation. Oracle designates this
7+
# particular file as subject to the "Classpath" exception as provided
8+
# by Oracle in the LICENSE file that accompanied this code.
9+
#
10+
# This code is distributed in the hope that it will be useful, but WITHOUT
11+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12+
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13+
# version 2 for more details (a copy is included in the LICENSE file that
14+
# accompanied this code).
15+
#
16+
# You should have received a copy of the GNU General Public License version
17+
# 2 along with this work; if not, write to the Free Software Foundation,
18+
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19+
#
20+
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
21+
# or visit www.oracle.com if you need additional information or have any
22+
# questions.
23+
24+
is.autoload=true

‎visualvm/libs.profiler/lib.profiler.heap/nbproject/project.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
4+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5+
6+
This code is free software; you can redistribute it and/or modify it
7+
under the terms of the GNU General Public License version 2 only, as
8+
published by the Free Software Foundation. Oracle designates this
9+
particular file as subject to the "Classpath" exception as provided
10+
by Oracle in the LICENSE file that accompanied this code.
11+
12+
This code is distributed in the hope that it will be useful, but WITHOUT
13+
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14+
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15+
version 2 for more details (a copy is included in the LICENSE file that
16+
accompanied this code).
17+
18+
You should have received a copy of the GNU General Public License version
19+
2 along with this work; if not, write to the Free Software Foundation,
20+
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21+
22+
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23+
or visit www.oracle.com if you need additional information or have any
24+
questions.
25+
-->
26+
<project xmlns="http://www.netbeans.org/ns/project/1">
27+
<type>org.netbeans.modules.apisupport.project</type>
28+
<configuration>
29+
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
30+
<code-name-base>org.graalvm.visualvm.lib.jfluid.heap</code-name-base>
31+
<suite-component/>
32+
<module-dependencies/>
33+
<friend-packages>
34+
<friend>org.graalvm.visualvm.heapviewer</friend>
35+
<friend>org.graalvm.visualvm.heapviewer.console</friend>
36+
<friend>org.graalvm.visualvm.heapviewer.truffle</friend>
37+
<friend>org.graalvm.visualvm.lib.profiler.heapwalker</friend>
38+
<friend>org.graalvm.visualvm.lib.profiler.oql</friend>
39+
<package>org.graalvm.visualvm.lib.jfluid.heap</package>
40+
</friend-packages>
41+
</data>
42+
</configuration>
43+
</project>

0 commit comments

Comments
 (0)