droid-monitor 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3ddc014e7023b3c63ba3f812323fd1b5b35f40e
-  data.tar.gz: 752e1bba533b26f5213abf108f91707d7035b54b
+  metadata.gz: 5611592ffc80febfd87890a8d54f77368eea89bb
+  data.tar.gz: ea52f55d1b8ead6c96f160952216a13f0cc12410
 SHA512:
-  metadata.gz: 9433e6300db2789cac89e4d97469b95f2cbbacd3dbff856dbc8656498a6085ba045eb09e3642c25079fb5a055468789577bb88c843b34fa02c4f39aa6e487fa6
-  data.tar.gz: 184222d4fa5caa0d6d07bdd20ea10d4e97109d6ad364e7f6c7a7f9fdc9a7b5e107095befcf2da6657f02dfee5086eb49c409518243cef3ba92619b1fc7a47897
+  metadata.gz: 6daaeb84ee4c4d29a6d549ad9b07a3bd92d0eac0480d741df496666f6e99c4b644f7e2d662da11559820c5c003fe937b3fb08d23273afa3d7d71bc530f431821
+  data.tar.gz: 022a281a8914f39f7d471c45b3b5323defe78e7d84afab1f555dfcef338616abbe1dfcf28f70c1ae626425bd51602d6e30fcc138e9235039d98d4dedd922d612

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.4
+  - 2.2.0
+  - 2.3.0
+
+sudo: false
+cache: bundler
+
+before_install: gem update --remote bundler
+
+install:
+  - bundle install --retry=3
+
+script:
+  - ruby test/run_test.rb

data/lib/droid/monitor/gfxinfo.rb

@@ -21,15 +21,15 @@ module Droid
       end
 
       def dump_gfxinfo_usage(dump_data)
-        scanned_dump1 = dump_data.scan(/^.*views,.*kB of display lists,.*frames rendered.*$/).map(&:strip).first
-        scanned_dump2 = dump_data.scan(/^.*bytes,.*MB.*$/).map(&:strip).first
+        view_dump = dump_data.scan(/^.*views,.*kB of display lists.*$/).map(&:strip).first
+        view_memory_dump2 = dump_data.scan(/^.*bytes,.*MB.*$/).map(&:strip).first
 
-        return [] if scanned_dump1.nil? || scanned_dump2.nil?
+        return [] if view_dump.nil? || view_memory_dump2.nil?
 
-        dump1 = scanned_dump1.split(/\s/).reject(&:empty?)
-        dump2 = scanned_dump2.split(/\s/).reject(&:empty?)
+        v_dump = view_dump.split(/\s/).reject(&:empty?)
+        v_mem_dump = view_memory_dump2.split(/\s/).reject(&:empty?)
 
-        dump1 + dump2
+        v_mem_dump + v_dump
       rescue StandardError => e
         puts e
         []
@@ -64,10 +64,10 @@ module Droid
           }
         else
           {
-            view: dump_gfxinfo_array[0].to_i,
-            display_lists_kb: dump_gfxinfo_array[2].to_f.round(2),
-            frames_rendered: dump_gfxinfo_array[7].to_i,
-            total_memory: (dump_gfxinfo_array[10].to_f / 1024).round(2),
+            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

data/lib/droid/monitor/version.rb

@@ -1,5 +1,5 @@
 module Droid
   module Monitor
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

data/test/gfxinfo_test.rb

@@ -91,6 +91,69 @@ Total Views:        41
 Total DisplayList:  1.36 kB
 EOS
 
+SAMPLE_GFXINFO_6 = <<-EOS
+Applications Graphics Acceleration Info:
+Uptime: 9658130 Realtime: 9658130
+
+** Graphics info for pid 9702 [com.android.chrome] **
+
+Stats since: 9656484850794ns
+Total frames rendered: 3
+Janky frames: 2 (66.67%)
+90th percentile: 101ms
+95th percentile: 101ms
+99th percentile: 101ms
+Number Missed Vsync: 2
+Number High input latency: 0
+Number Slow UI thread: 2
+Number Slow bitmap uploads: 0
+Number Slow issue draw commands: 1
+
+Caches:
+Current memory usage / total memory usage (bytes):
+  TextureCache           878276 / 75497472
+  LayerCache                  0 / 50331648 (numLayers = 0)
+  Layers total          0 (numLayers = 0)
+  RenderBufferCache           0 /  8388608
+  GradientCache               0 /  1048576
+  PathCache                   0 / 33554432
+  TessellationCache           0 /  1048576
+  TextDropShadowCache         0 /  6291456
+  PatchCache                  0 /   131072
+  FontRenderer 0 A8     1048576 /  1048576
+  FontRenderer 0 RGBA         0 /        0
+  FontRenderer 0 total  1048576 /  1048576
+Other:
+  FboCache                    0 /        0
+Total memory usage:
+  1926852 bytes, 1.84 MB
+
+Profile data in ms:
+
+        com.android.chrome/org.chromium.chrome.browser.firstrun.FirstRunActivityStaging/android.view.ViewRootImpl@6b40547 (visibility=0)
+Stats since: 9656484850794ns
+Total frames rendered: 3
+Janky frames: 2 (66.67%)
+90th percentile: 101ms
+95th percentile: 101ms
+99th percentile: 101ms
+Number Missed Vsync: 2
+Number High input latency: 0
+Number Slow UI thread: 2
+Number Slow bitmap uploads: 0
+Number Slow issue draw commands: 1
+
+View hierarchy:
+
+  com.android.chrome/org.chromium.chrome.browser.firstrun.FirstRunActivityStaging/android.view.ViewRootImpl@6b40547
+  21 views, 31.36 kB of display lists
+
+
+Total ViewRootImpl: 1
+Total Views:        21
+Total DisplayList:  31.36 kB
+EOS
+
 class GfxinfoTest < Test::Unit::TestCase
 
   def setup
@@ -112,10 +175,16 @@ class GfxinfoTest < Test::Unit::TestCase
   end
 
   def test_dump_gfxinfo_usage
-    expected = %w(41 views, 1.36 kB of display lists, 191 frames rendered 654464 bytes, 0.62 MB)
+    expected = %w(654464 bytes, 0.62 MB 41 views, 1.36 kB of display lists, 191 frames rendered)
+
     assert_equal(expected, @gfx.dump_gfxinfo_usage(SAMPLE_GFXINFO))
   end
 
+  def test_dump_gfxinfo_usage_for_API23
+    expected = %w(1926852 bytes, 1.84 MB 21 views, 31.36 kB of display lists)
+    assert_equal(expected, @gfx.dump_gfxinfo_usage(SAMPLE_GFXINFO_6))
+  end
+
   def test_push_current_time
     assert_equal(@gfx.merge_current_time({}).length, 1)
   end
@@ -130,7 +199,7 @@ class GfxinfoTest < Test::Unit::TestCase
   end
 
   def test_transfer_from_hash_correct_to_json
-    dummy_array = %w(465 views, 38.00 kB of display lists,  354 frames rendered 5781894 bytes, 5.51 MB 13:43:32.556)
+    dummy_array = %w(5781894 bytes, 5.51 MB 465 views, 38.00 kB of display lists, 354 frames rendered 13:43:32.556)
 
     @gfx.store_gfxinfo_usage(dummy_array)
     expected_json = "[{\"view\":465,\"display_lists_kb\":38.0,\"frames_rendered\":354," +
@@ -139,7 +208,7 @@ class GfxinfoTest < Test::Unit::TestCase
   end
 
   def test_convert_to_google_data_api_format_gfx_one
-    dummy_array = %w(465 views, 38.00 kB of display lists,  354 frames rendered 5781894 bytes, 5.51 MB 13:43:32.556)
+    dummy_array = %w(5781894 bytes, 5.51 MB 465 views, 38.00 kB of display lists,  354 frames rendered 13:43:32.556)
 
     @gfx.store_gfxinfo_usage(dummy_array)
     expected_json = "{\"cols\":[{\"label\":\"time\",\"type\":\"string\"},{\"label\":\"view\",\"type\":\"number\"}," +
@@ -149,7 +218,7 @@ class GfxinfoTest < Test::Unit::TestCase
   end
 
   def test_convert_to_google_data_api_format_mem_one
-    dummy_array = %w(465 views, 38.00 kB of display lists,  354 frames rendered 5781894 bytes, 5.51 MB 13:43:32.556)
+    dummy_array = %w(5781894 bytes, 5.51 MB 465 views, 38.00 kB of display lists,  354 frames rendered 13:43:32.556)
 
     @gfx.store_gfxinfo_usage(dummy_array)
     expected_json = "{\"cols\":[{\"label\":\"time\",\"type\":\"string\"}," +
@@ -159,7 +228,7 @@ class GfxinfoTest < Test::Unit::TestCase
   end
 
   def test_convert_to_google_data_api_format_frame_one
-    dummy_array = %w(465 views, 38.00 kB of display lists,  354 frames rendered 5781894 bytes, 5.51 MB 13:43:32.556)
+    dummy_array = %w(5781894 bytes, 5.51 MB 465 views, 38.00 kB of display lists,  354 frames rendered 13:43:32.556)
 
     @gfx.store_gfxinfo_usage(dummy_array)
     expected_json = "{\"cols\":[{\"label\":\"time\",\"type\":\"string\"}," +
@@ -169,7 +238,7 @@ class GfxinfoTest < Test::Unit::TestCase
   end
 
   def test_convert_to_google_data_api_format_gfx_many
-    dummy_array = %w(465 views, 38.00 kB of display lists,  354 frames rendered 5781894 bytes, 5.51 MB 13:43:32.556)
+    dummy_array = %w(5781894 bytes, 5.51 MB 465 views, 38.00 kB of display lists,  354 frames rendered 13:43:32.556)
 
     @gfx.store_gfxinfo_usage(dummy_array)
     @gfx.store_gfxinfo_usage(dummy_array)
@@ -181,7 +250,7 @@ class GfxinfoTest < Test::Unit::TestCase
   end
 
   def test_convert_to_google_data_api_format_mem_many
-    dummy_array = %w(465 views, 38.00 kB of display lists,  354 frames rendered 5781894 bytes, 5.51 MB 13:43:32.556)
+    dummy_array = %w(5781894 bytes, 5.51 MB 465 views, 38.00 kB of display lists,  354 frames rendered 13:43:32.556)
 
     @gfx.store_gfxinfo_usage(dummy_array)
     @gfx.store_gfxinfo_usage(dummy_array)
@@ -192,7 +261,7 @@ class GfxinfoTest < Test::Unit::TestCase
   end
 
   def test_convert_to_google_data_api_format_frame_many
-    dummy_array = %w(465 views, 38.00 kB of display lists,  354 frames rendered 5781894 bytes, 5.51 MB 13:43:32.556)
+    dummy_array = %w(5781894 bytes, 5.51 MB 465 views, 38.00 kB of display lists,  354 frames rendered 13:43:32.556)
 
     @gfx.store_gfxinfo_usage(dummy_array)
     @gfx.store_gfxinfo_usage(dummy_array)
@@ -201,6 +270,4 @@ 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
-
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droid-monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Kazuaki MATSUO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faml
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Monitoring Android cpu or memory usage and create their simple graph with