bugfix #575, use SampledMemoryResultsSnapshot

Author: thurka

visualvm/profiling/src/com/sun/tools/visualvm/profiling/snapshot/ProfilerSnapshotNPS.java

@@ -86,7 +86,8 @@ protected Image resolveIcon() {
             if (snapshotType == LoadedSnapshot.SNAPSHOT_TYPE_CPU) {
                 return ImageUtilities.mergeImages(CPU_ICON, NODE_BADGE, 0, 0);
             } else if (snapshotType == LoadedSnapshot.SNAPSHOT_TYPE_MEMORY_LIVENESS
-                    || snapshotType == LoadedSnapshot.SNAPSHOT_TYPE_MEMORY_ALLOCATIONS) {
+                    || snapshotType == LoadedSnapshot.SNAPSHOT_TYPE_MEMORY_ALLOCATIONS
+                    || snapshotType == LoadedSnapshot.SNAPSHOT_TYPE_MEMORY_SAMPLED) {
                 return ImageUtilities.mergeImages(MEMORY_ICON, NODE_BADGE, 0, 0);
             } else {
                 return null;

visualvm/profiling/src/com/sun/tools/visualvm/profiling/snapshot/diff/SnapshotDiffContainer.java

@@ -32,6 +32,8 @@
 import org.netbeans.lib.profiler.results.memory.AllocMemoryResultsSnapshot;
 import org.netbeans.lib.profiler.results.memory.LivenessMemoryResultsDiff;
 import org.netbeans.lib.profiler.results.memory.LivenessMemoryResultsSnapshot;
+import org.netbeans.lib.profiler.results.memory.SampledMemoryResultsDiff;
+import org.netbeans.lib.profiler.results.memory.SampledMemoryResultsSnapshot;
 import org.netbeans.modules.profiler.LoadedSnapshot;
 
 /**
@@ -79,6 +81,10 @@ else if (s1.getSnapshot() instanceof LivenessMemoryResultsSnapshot &&
                  s2.getSnapshot() instanceof LivenessMemoryResultsSnapshot)
             return new LivenessMemoryResultsDiff((LivenessMemoryResultsSnapshot) s1.getSnapshot(),
                                                  (LivenessMemoryResultsSnapshot) s2.getSnapshot());
+        else if (s1.getSnapshot() instanceof SampledMemoryResultsSnapshot &&
+                 s2.getSnapshot() instanceof SampledMemoryResultsSnapshot)
+            return new SampledMemoryResultsDiff((SampledMemoryResultsSnapshot) s1.getSnapshot(),
+                                                 (SampledMemoryResultsSnapshot) s2.getSnapshot());
         return null;
     }
 

visualvm/sampler/src/com/sun/tools/visualvm/sampler/SamplerImpl.java

@@ -86,7 +86,7 @@
 import javax.swing.SwingUtilities;
 import org.netbeans.lib.profiler.common.ProfilingSettingsPresets;
 import org.netbeans.lib.profiler.results.cpu.CPUResultsSnapshot;
-import org.netbeans.lib.profiler.results.memory.AllocMemoryResultsSnapshot;
+import org.netbeans.lib.profiler.results.memory.SampledMemoryResultsSnapshot;
 import org.netbeans.modules.profiler.LoadedSnapshot;
 import org.netbeans.modules.profiler.ResultsManager;
 import org.openide.DialogDisplayer;
@@ -686,7 +686,7 @@ public void run() {
                                 DataOutputStream dos = null;
                                 try {
                                     long time = System.currentTimeMillis();
-                                    AllocMemoryResultsSnapshot snapshot = dumper.createSnapshot(time);
+                                    SampledMemoryResultsSnapshot snapshot = dumper.createSnapshot(time);
                                     if (snapshot == null) {
                                         DialogDisplayer.getDefault().notifyLater(new NotifyDescriptor.Message(
                                                 NbBundle.getMessage(SamplerImpl.class, "MSG_No_save_data_memory"), // NOI18N

visualvm/sampler/src/com/sun/tools/visualvm/sampler/memory/MemorySamplerSupport.java

@@ -44,7 +44,7 @@
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 import org.netbeans.lib.profiler.common.ProfilingSettings;
-import org.netbeans.lib.profiler.results.memory.AllocMemoryResultsSnapshot;
+import org.netbeans.lib.profiler.results.memory.SampledMemoryResultsSnapshot;
 import org.openide.util.NbBundle;
 
 /**
@@ -308,14 +308,14 @@ public static abstract class SnapshotDumper {
 
         public abstract void takeSnapshot(boolean openView);
 
-        public AllocMemoryResultsSnapshot createSnapshot(long time) {
+        public SampledMemoryResultsSnapshot createSnapshot(long time) {
             HeapHistogram histogram = lastHistogram;
 
             if (histogram != null) {
                 ByteArrayOutputStream output = new ByteArrayOutputStream(1024);
                 DataOutputStream dos = new DataOutputStream(output);
                 try {
-                    AllocMemoryResultsSnapshot result = new AllocMemoryResultsSnapshot();
+                    SampledMemoryResultsSnapshot result = new SampledMemoryResultsSnapshot();
                     Set<HeapHistogram.ClassInfo> classes = histogram.getHeapHistogram();
 
                     dos.writeInt(1);    // version