droid-monitor 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a49115b92c702493e1907b4f4801ba7fff00ed
-  data.tar.gz: 0d7db7cae3e1c45e008cf8ecce4f187090b30796
+  metadata.gz: aef56fedb46e23d522c96993e6483336d1795c90
+  data.tar.gz: feaac7d08ac24f78b7966a892e9f92978803c45b
 SHA512:
-  metadata.gz: cef79c066d26ba6c980f92c2f8ecad6744eaaf5cf37548b14fb6b8e936f3208f5d336233abbe41515e6c9ab5083b68d166f53c5da75e7640432999d231088542
-  data.tar.gz: 8f5b778d0e44e41964ce61d80026e3ebfcc6b76760cadbdcdad9d9ff74de1c2c056f48655e514449001a20d9a5d3dd5313a13d325f492295e54058dfe8973ee8
+  metadata.gz: ff2c665d11fcbe4f1cd2a91ef498a5db136c39822d6655881792b19509c828862c086a741167cba2060ecd43d9f15c0e0129347160c8e595d12b4e85dace9f7b
+  data.tar.gz: 06db6ca23ab91c2a9992eae1b7c33a16b44fe2912c2b206087dc0a3a78e4b14041b279a3c7f5d8943a067ccb575b73a259e558aaa502a76eed0d58b947c3b97d

data/lib/droid/monitor/gfxinfo.rb

@@ -74,14 +74,23 @@ module Droid
             total_memory: 0,
             time: dump_gfxinfo_array.last,
           }
-        else
+        elsif @api_level >= 23
           {
             view: dump_gfxinfo_array[4].to_i,
             display_lists_kb: dump_gfxinfo_array[6].to_f.round(2),
-            frames_rendered: dump_gfxinfo_array[11].to_i || 0,
+            frames_rendered: dump_gfxinfo_array[14].to_i || 0,
+            janky_frame: dump_gfxinfo_array[17].to_i || 0,
             total_memory: (dump_gfxinfo_array[0].to_f / 1024).round(2),
             time: dump_gfxinfo_array.last,
           }
+        else
+          {
+              view: dump_gfxinfo_array[4].to_i,
+              display_lists_kb: dump_gfxinfo_array[6].to_f.round(2),
+              frames_rendered: dump_gfxinfo_array[11].to_i || 0,
+              total_memory: (dump_gfxinfo_array[0].to_f / 1024).round(2),
+              time: dump_gfxinfo_array.last,
+          }
         end
       end
 
@@ -121,23 +130,31 @@ module Droid
       def export_as_google_api_format_frame(from_gfxinfo_usage)
         google_api_data_format = empty_google_api_format_frame
 
-        from_gfxinfo_usage.each do |hash|
-          a_google_api_data_format = {
-            c: [
-              { v: hash[:time] },
-              { v: hash[:frames_rendered] },
-            ]
-          }
-          google_api_data_format[:rows].push(a_google_api_data_format)
+        if @api_level >= 23
+          from_gfxinfo_usage.each do |hash|
+            a_google_api_data_format = {
+                c: [
+                    { v: hash[:time] },
+                    { v: hash[:frames_rendered] },
+                    { v: hash[:janky_frame] },
+                ]
+            }
+            google_api_data_format[:rows].push(a_google_api_data_format)
+          end
+        else
+          from_gfxinfo_usage.each do |hash|
+            a_google_api_data_format = {
+                c: [
+                    { v: hash[:time] },
+                    { v: hash[:frames_rendered] },
+                ]
+            }
+            google_api_data_format[:rows].push(a_google_api_data_format)
+          end
         end
-
         JSON.generate google_api_data_format
       end
 
-      def export_as_google_api_format_frame_and_janky(from_gfxinfo_usage)
-        # TODO: save total frame rendered and janky frames from `Total frames rendered: 3 Janky frames: 2 (66.67%)`
-      end
-
       def create_graph(data_file_path, graph_opts = {}, output_file_path)
         self.save(Droid::Monitor::GoogleApiTemplate.create_graph(data_file_path, graph_opts),
                   output_file_path)
@@ -169,17 +186,27 @@ module Droid
       end
 
       def empty_google_api_format_frame
-        {
-          cols: [
-            { label: 'time', type: 'string' },
-            { label: 'frames_rendered', type: 'number' },
-          ],
-          rows: [
-          ],
-        }
+        if @api_level >= 23
+          {
+            cols: [
+              { label: 'time', type: 'string' },
+              { label: 'frames_rendered', type: 'number' },
+              { label: 'janky_frame', type: 'number' },
+            ],
+            rows: [
+            ],
+          }
+        else
+          {
+              cols: [
+                  { label: 'time', type: 'string' },
+                  { label: 'frames_rendered', type: 'number' },
+              ],
+              rows: [
+              ],
+          }
+        end
       end
-
-
     end # class Gfxinfo
   end # module Monitor
 end # module Droid

data/lib/droid/monitor/version.rb

@@ -1,5 +1,5 @@
 module Droid
   module Monitor
-    VERSION = "0.3.5"
+    VERSION = "0.4.0"
   end
 end

data/test/gfxinfo_test.rb

@@ -335,6 +335,18 @@ class GfxinfoTest < Test::Unit::TestCase
     assert_equal(@gfx.export_as_google_api_format_frame(@gfx.gfxinfo_usage), expected_json)
   end
 
+  def test_convert_to_google_data_api_format_frame_one_api_23
+    dummy_array = %w(1926852 bytes, 1.84 MB 21 views, 31.36 kB of display lists Total frames rendered: 3 Janky frames: 2 (66.67%))
+    @gfx.api_level = 23
+
+    @gfx.store_gfxinfo_usage(dummy_array)
+    expected_json = "{\"cols\":[{\"label\":\"time\",\"type\":\"string\"}," +
+        "{\"label\":\"frames_rendered\",\"type\":\"number\"},{\"label\":\"janky_frame\",\"type\":\"number\"}]," +
+        "\"rows\":[{\"c\":[{\"v\":\"#{@gfx.gfxinfo_usage[0][:time]}\"},{\"v\":3},{\"v\":2}]}]}"
+    assert_equal(@gfx.export_as_google_api_format_frame(@gfx.gfxinfo_usage), expected_json)
+  end
+
+
   def test_convert_to_google_data_api_format_gfx_many
     dummy_array = %w(5781894 bytes, 5.51 MB 465 views, 38.00 kB of display lists,  354 frames rendered 13:43:32.556)
 
@@ -368,4 +380,19 @@ class GfxinfoTest < Test::Unit::TestCase
       "{\"v\":354}]},{\"c\":[{\"v\":\"#{@gfx.gfxinfo_usage[1][:time]}\"},{\"v\":354}]}]}"
     assert_equal(@gfx.export_as_google_api_format_frame(@gfx.gfxinfo_usage), expected_json)
   end
+
+  def test_convert_to_google_data_api_format_frame_many_api_23
+    dummy_array = %w(1926852 bytes, 1.84 MB 21 views, 31.36 kB of display lists Total frames rendered: 3 Janky frames: 2 (66.67%))
+    @gfx.api_level = 23
+
+    @gfx.store_gfxinfo_usage(dummy_array)
+    @gfx.store_gfxinfo_usage(dummy_array)
+    expected_json = "{\"cols\":[{\"label\":\"time\",\"type\":\"string\"}," +
+        "{\"label\":\"frames_rendered\",\"type\":\"number\"},{\"label\":\"janky_frame\",\"type\":\"number\"}]," +
+        "\"rows\":[{\"c\":[{\"v\":\"#{@gfx.gfxinfo_usage[1][:time]}\"}," +
+        "{\"v\":3},{\"v\":2}]},{\"c\":[{\"v\":\"#{@gfx.gfxinfo_usage[1][:time]}\"},{\"v\":3},{\"v\":2}]}]}"
+    assert_equal(@gfx.export_as_google_api_format_frame(@gfx.gfxinfo_usage), expected_json)
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droid-monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Kazuaki MATSUO