GH-351 ItemValueFormatter.DEFAULT_BYTES_PER_SEC added and used instead of javascript implementation

Author: thurka

plugins/tracer/manifest.mf

@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.graalvm.visualvm.modules.tracer/2
 OpenIDE-Module-Install: org/graalvm/visualvm/modules/tracer/impl/TracerViewProvider.class
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/modules/tracer/impl/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.0
+OpenIDE-Module-Specification-Version: 2.1

plugins/tracer/src/org/graalvm/visualvm/modules/tracer/ItemValueFormatter.java

@@ -82,6 +82,12 @@ public String getUnits(int format) {
      * Uses Number.getPercentInstance().toString().
      */
     public static final ItemValueFormatter DEFAULT_PERCENT = new Percent();
+    /**
+     * Predefined formatter for bytes/sec values. Uses B/s (Bytes/sec) for tooltip,
+     * details table and export, uses kB/s for units (min/max values).
+     * Uses Number.getInstance().toString().
+     */
+    public static final ItemValueFormatter DEFAULT_BYTES_PER_SEC = new BytesSec();
 
 
     /**
@@ -184,6 +190,43 @@ public String getUnits(int format) {
 
     }
 
+    /**
+     * Predefined formatter for bytes/sec values. Uses B/s (Bytes/sec) for tooltip,
+     * details table and export, uses kB/s for units (min/max values).
+     * Uses Number.getInstance().toString().
+     */
+    private static final class BytesSec extends ItemValueFormatter {
+
+        private static final NumberFormat FORMAT = NumberFormat.getInstance();
+
+
+        public String formatValue(long value, int format) {
+            switch (format) {
+                case FORMAT_TOOLTIP:
+                case FORMAT_DETAILS:
+                case FORMAT_EXPORT:
+                    return FORMAT.format(value);
+                case FORMAT_UNITS:
+                    String est = value == 0 ? "" : "~";
+                    return est + FORMAT.format(Math.round(value / 1024.0));
+                default:
+                    return null;
+            }
+        }
+
+        public String getUnits(int format) {
+            switch (format) {
+                case FORMAT_TOOLTIP:
+                case FORMAT_DETAILS:
+                case FORMAT_EXPORT:
+                    return "B/s";
+                case FORMAT_UNITS:
+                    return "kB/s";
+                default:
+                    return null;
+            }
+        }
+    }
 
     /**
      * Predefined formatter for percent values with custom factor.

plugins/tracerjvm/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

plugins/tracerjvm/src/org/graalvm/visualvm/modules/tracer/jvm/resources/platform_mx.js

@@ -37,15 +37,6 @@ try {
 var btraceDeployer = btraceDeployerClass ? btraceDeployerClass.instance() : undefined;
 
 
-var Format_KBPS = {
-    formatValue: function (value, format) {
-        return (value / 1024).toFixed(2);
-    },
-    getUnits: function (format) {
-        return "kB/s"
-    }
-}
-
 function getGCRunProvider(on) {
     return function(timestamp) {
         if (this.delta == undefined) {
@@ -310,15 +301,15 @@ VisualVM.Tracer.addPackages([{
                         value: mbeanAttribute("btrace:name=JavaIOStats", "fileReadRate"),
                         presenter: {
                             lineColor: Color.GREEN,
-                            format: Format_KBPS
+                            format: ItemValueFormatter.DEFAULT_BYTES_PER_SEC
                         }
                     },
                     {
                         name: "Writing rate",
                         value: mbeanAttribute("btrace:name=JavaIOStats", "fileWriteRate"),
                         presenter: {
                             lineColor: Color.RED,
-                            format: Format_KBPS
+                            format: ItemValueFormatter.DEFAULT_BYTES_PER_SEC
                         }
                     }
                 ]
@@ -341,15 +332,15 @@ VisualVM.Tracer.addPackages([{
                         value: mbeanAttribute("btrace:name=JavaIOStats", "nioReadRate"),
                         presenter: {
                             lineColor: Color.GREEN,
-                            format: Format_KBPS
+                            format: ItemValueFormatter.DEFAULT_BYTES_PER_SEC
                         }
                     },
                     {
                         name: "Writing rate",
                         value: mbeanAttribute("btrace:name=JavaIOStats", "nioWriteRate"),
                         presenter: {
                             lineColor: Color.RED,
-                            format: Format_KBPS
+                            format: ItemValueFormatter.DEFAULT_BYTES_PER_SEC
                         }
                     }
                 ]