droid-monitor 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5611592ffc80febfd87890a8d54f77368eea89bb
-  data.tar.gz: ea52f55d1b8ead6c96f160952216a13f0cc12410
+  metadata.gz: 45a49115b92c702493e1907b4f4801ba7fff00ed
+  data.tar.gz: 0d7db7cae3e1c45e008cf8ecce4f187090b30796
 SHA512:
-  metadata.gz: 6daaeb84ee4c4d29a6d549ad9b07a3bd92d0eac0480d741df496666f6e99c4b644f7e2d662da11559820c5c003fe937b3fb08d23273afa3d7d71bc530f431821
-  data.tar.gz: 022a281a8914f39f7d471c45b3b5323defe78e7d84afab1f555dfcef338616abbe1dfcf28f70c1ae626425bd51602d6e30fcc138e9235039d98d4dedd922d612
+  metadata.gz: cef79c066d26ba6c980f92c2f8ecad6744eaaf5cf37548b14fb6b8e936f3208f5d336233abbe41515e6c9ab5083b68d166f53c5da75e7640432999d231088542
+  data.tar.gz: 8f5b778d0e44e41964ce61d80026e3ebfcc6b76760cadbdcdad9d9ff74de1c2c056f48655e514449001a20d9a5d3dd5313a13d325f492295e54058dfe8973ee8

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1.4
   - 2.2.0
   - 2.3.0

data/README.md

@@ -154,7 +154,7 @@ require "droid/monitor/gxfinfo"
 # export data into filename as google api format
 data_file_gfx = "sample_gfx.txt"
 data_file_mem = "sample_mem.txt"
-data_file_frame = "sample_frame.txt"
+data_file_frame = "sample_frame.txt" # Can't get frame rendered if api level of target devices are 21 or 22.(Android 5.x)
 @gfx.save_gfxinfo_usage_as_google_api(data_file_gfx, data_file_mem, data_file_frame)
 
 # export data into filename which is used the above command.
@@ -183,6 +183,8 @@ graph_opts = { title: "Example", header1: "this graph is just sample"}
 
 - frame
 
+**Can't get frame rendered if api level of target devices are 21 or 22.(Android 5.x)**
+
 ![](https://raw.githubusercontent.com/KazuCocoa/droid-monitor/master/doc/images/Screen%20Shot%202015-09-12%20at%2009.41.16.png)
 
 
@@ -191,6 +193,12 @@ graph_opts = { title: "Example", header1: "this graph is just sample"}
 1. Some browser, like Google Chrome, can't see local file via page. So, you should see report html file via FireFox as example.
 
 
+## Battery
+
+For battery
+
+- https://github.com/google/battery-historian
+
 ## License
 MIT license.
 Please see [here](https://github.com/KazuCocoa/droid-monitor/blob/master/LICENSE.txt).

data/droid-monitor.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.0.0"
+  spec.required_ruby_version = ">= 2.1.0"
 
   spec.add_dependency "faml"
   spec.add_dependency "haml" # for using faml to tilt

data/lib/droid/monitor.rb

@@ -13,6 +13,7 @@ module Droid
         @package = opts[:package]
         @device_serial = opts[:device_serial] || ""
         @api_level = device_sdk_version
+        @debug = opts[:debug]
       end
 
       # @return [Integer] message from adb command
@@ -34,12 +35,14 @@ module Droid
       def dump_tcp_rec
         pid = get_pid
         return 0 if pid == -1
+        puts "pid is #{pid}" if @debug
         run_adb("#{adb_shell} cat proc/uid_stat/#{pid}/tcp_rcv").to_i
       end
 
       def dump_tcp_snd
         pid = get_pid
         return 0 if pid == -1
+        puts "pid is #{pid}" if @debug
         run_adb("#{adb_shell} cat proc/uid_stat/#{pid}/tcp_snd").to_i
       end
 

data/lib/droid/monitor/gfxinfo.rb

@@ -29,7 +29,19 @@ module Droid
         v_dump = view_dump.split(/\s/).reject(&:empty?)
         v_mem_dump = view_memory_dump2.split(/\s/).reject(&:empty?)
 
-        v_mem_dump + v_dump
+        gfxs = v_mem_dump + v_dump
+
+        if @api_level >= 23
+          view_total_frames_rendered = dump_data.scan(/^.*Total frames rendered:.*$/).map(&:strip).first
+          view_janky_frames = dump_data.scan(/^.*Janky frames:.*$/).map(&:strip).first
+
+          v_frames_rendered_dump = view_total_frames_rendered.split(/\s/).reject(&:empty?)
+          v_janky_frames = view_janky_frames.split(/\s/).reject(&:empty?)
+
+          gfxs = v_mem_dump + v_dump + v_frames_rendered_dump + v_janky_frames
+        end
+
+        gfxs
       rescue StandardError => e
         puts e
         []
@@ -122,6 +134,10 @@ module Droid
         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)

data/lib/droid/monitor/version.rb

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

data/test/gfxinfo_test.rb

@@ -91,6 +91,97 @@ Total Views:        41
 Total DisplayList:  1.36 kB
 EOS
 
+SAMPLE_GFXINFO_5 = <<-EOS
+Applications Graphics Acceleration Info:
+Uptime: 6019250 Realtime: 13901895
+
+** Graphics info for pid 26834 [com.android.chrome] **
+
+Recent DisplayList operations
+                        ConcatMatrix
+                        Save
+                        DrawBitmap
+                        RestoreToCount
+                    DrawRenderNode
+                      DrawRenderNode
+                        Save
+                        ClipRect
+                        Translate
+                        DrawRenderNode
+                          DrawText
+                          DrawText
+                        RestoreToCount
+                    DrawRenderNode
+                      Save
+                      ConcatMatrix
+                      Save
+                      DrawBitmap
+                      RestoreToCount
+                    DrawRenderNode
+                      Save
+                      ConcatMatrix
+                      Save
+                      DrawBitmap
+                      RestoreToCount
+                    RestoreToCount
+                  DrawRenderNode
+                    DrawRenderNode
+                      DrawRenderNode
+                      Save
+                      ConcatMatrix
+                      Save
+                      DrawBitmap
+                      RestoreToCount
+                  RestoreToCount
+              DrawRenderNode
+    RestoreToCount
+RestoreToCount
+DrawRect
+DrawBitmap
+DrawBitmap
+DrawBitmap
+DrawBitmap
+DrawPatch
+DrawBitmap
+DrawBitmap
+DrawBitmap
+DrawBitmap
+DrawText
+DrawText
+
+Caches:
+Current memory usage / total memory usage (bytes):
+  TextureCache           669300 / 50331648
+  LayerCache                  0 / 33554432 (numLayers = 0)
+  Layers total          0 (numLayers = 0)
+  RenderBufferCache           0 /  4194304
+  GradientCache               0 /  1048576
+  PathCache                   0 / 25165824
+  TessellationCache           0 /  1048576
+  TextDropShadowCache         0 /  5242880
+  PatchCache                960 /   131072
+  FontRenderer 0 A8      524288 /   524288
+  FontRenderer 0 RGBA         0 /        0
+  FontRenderer 0 total   524288 /   524288
+Other:
+  FboCache                    0 /        0
+Total memory usage:
+  1194548 bytes, 1.14 MB
+
+Profile data in ms:
+
+        com.android.chrome/org.chromium.chrome.browser.ChromeTabbedActivity/android.view.ViewRootImpl@27de7df5 (visibility=0)
+View hierarchy:
+
+  com.android.chrome/org.chromium.chrome.browser.ChromeTabbedActivity/android.view.ViewRootImpl@27de7df5
+  55 views, 51,03 kB of display lists
+
+
+Total ViewRootImpl: 1
+Total Views:        55
+Total DisplayList:  51,03 kB
+EOS
+
 SAMPLE_GFXINFO_6 = <<-EOS
 Applications Graphics Acceleration Info:
 Uptime: 9658130 Realtime: 9658130
@@ -180,8 +271,15 @@ class GfxinfoTest < Test::Unit::TestCase
     assert_equal(expected, @gfx.dump_gfxinfo_usage(SAMPLE_GFXINFO))
   end
 
+  def test_dump_gfxinfo_usage_for_API21
+    expected = %w(1194548 bytes, 1.14 MB 55 views, 51,03 kB of display lists)
+
+    assert_equal(expected, @gfx.dump_gfxinfo_usage(SAMPLE_GFXINFO_5))
+  end
+
   def test_dump_gfxinfo_usage_for_API23
-    expected = %w(1926852 bytes, 1.84 MB 21 views, 31.36 kB of display lists)
+    expected = %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
     assert_equal(expected, @gfx.dump_gfxinfo_usage(SAMPLE_GFXINFO_6))
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droid-monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Kazuaki MATSUO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faml
@@ -138,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="