Merge branch 'master' into graal

Author: thurka

visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/JRockitJvmJvmstatModelProvider.java

@@ -25,7 +25,6 @@
 
 package org.graalvm.visualvm.jvmstat;
 
-import org.graalvm.visualvm.core.model.AbstractModelProvider;
 import org.graalvm.visualvm.application.Application;
 import org.graalvm.visualvm.tools.jvmstat.JvmstatModel;
 import org.graalvm.visualvm.tools.jvmstat.JvmstatModelFactory;

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/HTMLTextArea.java

@@ -560,6 +560,8 @@ private static synchronized Map getEntities() {
 
     // --- Lazy setting text ---------------------------------------------------
     private String pendingText;
+    private int pendingDot = -1;
+    
     private String currentText;
     private boolean forceSetText;
 
@@ -587,8 +589,8 @@ public void keyPressed(KeyEvent e) {
             public void hierarchyChanged(HierarchyEvent e) {
                 if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) != 0) {
                     if (isShowing() && pendingText != null) setText(pendingText);
+                    }
                 }
-            }
         });
     }
 
@@ -626,6 +628,11 @@ public void setShowPopup(boolean showPopup) {
     public boolean getShowPopup() {
         return showPopup;
     }
+    
+    public void setCaretPosition(int position) {
+        if (pendingText == null) super.setCaretPosition(position);
+        else pendingDot = position;
+    }
 
     public void setText(String value) {
         if (value == null) return;
@@ -653,6 +660,11 @@ public void setText(String value) {
             setDocument(getEditorKit().createDefaultDocument()); // Workaround for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5042872
             super.setText(newText);
 
+            if (pendingDot != -1) {
+                try { setCaretPosition(pendingDot); }
+                catch (IllegalArgumentException ex) {} // expected
+                pendingDot = -1;
+            }
         }
 
         forceSetText = false;

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/jdbc/SQLFilterPanel.java

@@ -338,6 +338,16 @@ void set(Configuration o) {
             statements.clear();
             statements.addAll(o.statements);
         }
+
+        @Override
+        public int hashCode() {
+            int hash = 7;
+            hash = 37 * hash + filter.hashCode();
+            hash = 37 * hash + commands.hashCode();
+            hash = 37 * hash + tables.hashCode();
+            hash = 37 * hash + statements.hashCode();
+            return hash;
+        }
 
         public boolean equals(Object o) {
             Configuration c = (Configuration)o;

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/HprofHeap.java

@@ -670,26 +670,28 @@ void computeReferences() {
             if (tag == INSTANCE_DUMP) {
                 long classId = dumpBuffer.getID(start+1+idSize+4);
                 ClassDump classDump = (ClassDump) classIdToClassMap.get(new Long(classId));
-                long instanceId = dumpBuffer.getID(start+1);
-                long inOff = start+1+idSize+4+idSize+4;
-                List fields = classDump.getAllInstanceFields();
-                Iterator fit = fields.iterator();
-                
-                while(fit.hasNext()) {
-                    HprofField field = (HprofField) fit.next();
-                    if (field.getValueType() == HprofHeap.OBJECT) {
-                        long outId = dumpBuffer.getID(inOff);
-                        
-                        if (outId != 0) {
-                            LongMap.Entry entry = idToOffsetMap.get(outId);
-                            if (entry != null) {
-                                entry.addReference(instanceId);
-                            } else {
-                                //    System.err.println("instance entry:" + Long.toHexString(outId));
+                if (classDump != null) {
+                    long instanceId = dumpBuffer.getID(start+1);
+                    long inOff = start+1+idSize+4+idSize+4;
+                    List fields = classDump.getAllInstanceFields();
+                    Iterator fit = fields.iterator();
+
+                    while(fit.hasNext()) {
+                        HprofField field = (HprofField) fit.next();
+                        if (field.getValueType() == HprofHeap.OBJECT) {
+                            long outId = dumpBuffer.getID(inOff);
+
+                            if (outId != 0) {
+                                LongMap.Entry entry = idToOffsetMap.get(outId);
+                                if (entry != null) {
+                                    entry.addReference(instanceId);
+                                } else {
+                                    //    System.err.println("instance entry:" + Long.toHexString(outId));
+                                }
                             }
                         }
+                        inOff += field.getValueSize();
                     }
-                    inOff += field.getValueSize();
                 }
             } else if (tag == OBJECT_ARRAY_DUMP) {
                 long instanceId = dumpBuffer.getID(start+1);

visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/providers/TargetPlatformEnum.java

@@ -91,6 +91,11 @@ public boolean equals(Object obj) {
         return ((TargetPlatformEnum) obj).jvmIndex == this.jvmIndex;
     }
 
+    @Override
+    public int hashCode() {
+        return jvmIndex;
+    }
+
     public static Iterator iterator() {
         List jvmList = new ArrayList(8);
         jvmList.add(JDK5);

visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/ItemValueFormatter.java

@@ -181,7 +181,7 @@ public String formatValue(long value, int format) {
                     return FORMAT.format(value);
                 case FORMAT_UNITS:
                     String est = value == 0 ? "" : "~";
-                    return est + FORMAT.format(Math.round(value / 1024 / 1024));
+                    return est + FORMAT.format(Math.round((double)value / 1024 / 1024));
                 default:
                     return null;
             }

visualvm/sa/src/org/graalvm/visualvm/sa/SaModelProvider.java

@@ -57,7 +57,10 @@ public SaModel createModelFor(DataSource ds) {
             if (Host.LOCALHOST.equals(app.getHost())) {
                 JvmJvmstatModel jvmstat = JvmJvmstatModelFactory.getJvmstatModelFor(app);
 
-                if (jvmstat != null && Utilities.isWindows()) {
+                if (jvmstat == null) {
+                    return null;
+                }
+                if (Utilities.isWindows()) {
                     // on Windows, SA can only attach to the process of the same
                     // architecture ( 32bit / 64bit )
                     Boolean this64bitArch = is64BitArchitecture();