droid-monitor 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aef56fedb46e23d522c96993e6483336d1795c90
-  data.tar.gz: feaac7d08ac24f78b7966a892e9f92978803c45b
+  metadata.gz: 02eee5274833c846a081808dbe9cb53fc99b27d8
+  data.tar.gz: faa85f1b13ce37f96e8f7071b67594ce8e121237
 SHA512:
-  metadata.gz: ff2c665d11fcbe4f1cd2a91ef498a5db136c39822d6655881792b19509c828862c086a741167cba2060ecd43d9f15c0e0129347160c8e595d12b4e85dace9f7b
-  data.tar.gz: 06db6ca23ab91c2a9992eae1b7c33a16b44fe2912c2b206087dc0a3a78e4b14041b279a3c7f5d8943a067ccb575b73a259e558aaa502a76eed0d58b947c3b97d
+  metadata.gz: 1094b2ebefe73f913f4ac8f6602a3d1417902c5287a779b138eecff051da8b5e41dca02be6e4c2953e6ba36f0f4df2eedc8d789093454a9682773aead5d41315
+  data.tar.gz: 3809202998a053b9ad5d31ba6fffa7235c0455631d104b3c59fc72b3e2d9a43df282995779b6a82d7b8c94c0212d2fd80b583550e51f6b79c3f532d203023831

data/README.md

@@ -38,6 +38,7 @@ Followings are only storing data.
 They don't include cron like clockwork.
 
 ### CPU
+#### with cpuinfo
 
 ```ruby
 require "droid/monitor/cpu"
@@ -61,6 +62,30 @@ graph_opts = { title: "Example", header1: "this graph is just sample"}
 @cpu.clear_cpu_usage
 ```
 
+#### with top command
+
+```ruby
+require "droid/monitor/cpu"
+
+# initialize
+@cpu = Droid::Monitor::Cpu.new( { package: "com.android.chrome" } )
+
+# save data into @cpu.cpu_usage
+@cpu.store_dumped_cpu_usage_with_top
+
+# export data into filename as google api format
+filename = "sample_data.txt"
+@cpu.save_cpu_usage_as_google_api_with_top(filename)
+
+# export data into filename which is used the above command.
+output_file_path = "sample.html"
+graph_opts = { title: "Example", header1: "this graph is just sample"}
+@cpu.create_graph(filename, graph_opts, output_file_path)
+
+#clear @cpu.cpu_usage
+@cpu.clear_cpu_usage
+```
+
 #### Graph
 
 ![](https://github.com/KazuCocoa/droid-monitor/blob/master/doc/images/Screen%20Shot%202015-05-23%20at%2019.46.08.png)
@@ -72,7 +97,7 @@ require "droid/monitor/memory"
 
 # initialize
 # You can specify target devices with providing device serial which is provided via adb devices.
-@memory = Droid::Monitor::Cpu.new( { package: "com.android.chrome", device_serial: "device_serials"} )
+@memory = Droid::Monitor::Memory.new( { package: "com.android.chrome", device_serial: "device_serials"} )
 
 # save data into @memory.memory_usage
 @memory.store_dumped_memory_details_usage
@@ -96,6 +121,8 @@ graph_opts = { title: "Example", header1: "this graph is just sample"}
 
 ### Net
 
+**Android 5.x can't get netstats**.
+
 ```ruby
 require "droid/monitor/net"
 

data/lib/droid/monitor.rb

@@ -22,11 +22,22 @@ module Droid
         run_adb("#{adb_shell} getprop ro.build.version.sdk").to_i
       end
 
+      # @return [String] message from adb command
+      def dump_package_info
+        run_adb("#{adb_shell} dumpsys package #{@package}")
+      end
+
       # @return [String] message from adb command
       def dump_cpuinfo
         run_adb("#{adb_shell} dumpsys cpuinfo")
       end
 
+      # @return [String] message from adb command
+      # "17742  1  15% S    55 2279532K 128100K  fg u0_a124  your.cpackage\r\n"
+      def dump_cpuinfo_with_top
+        run_adb("#{adb_shell} top -d 0.5 -n 1 | grep #{@package}")
+      end
+
       # @return [String] message from adb command
       def dump_meminfo
         run_adb("#{adb_shell} dumpsys meminfo #{@package}")

data/lib/droid/monitor/cpu.rb

@@ -32,19 +32,45 @@ module Droid
         []
       end
 
+      def dump_cpu_usage_with_top(dump_data)
+        return [] if dump_data.nil?
+
+        dump = dump_data.split(/\s/).reject(&:empty?)
+        fail 'no package' if /^Load:$/ =~ dump[0]
+
+        puts dump
+
+        dump
+      rescue StandardError => e
+        puts e
+        []
+      end
+
       # called directory
       def store_dumped_cpu_usage
         self.store_cpu_usage(self.dump_cpu_usage(self.dump_cpuinfo))
       end
 
+      def store_dumped_cpu_usage_with_top
+        self.store_cpu_usage_with_top(self.dump_cpu_usage_with_top(self.dump_cpuinfo_with_top))
+      end
+
       def save_cpu_usage_as_google_api(file_path)
         self.save(export_as_google_api_format(@cpu_usage), file_path)
       end
 
+      def save_cpu_usage_as_google_api_with_top(file_path)
+        self.save(export_as_google_api_format_with_top(@cpu_usage), file_path)
+      end
+
       def store_cpu_usage(dumped_cpu)
         @cpu_usage.push self.merge_current_time(transfer_total_cpu_to_hash(dumped_cpu))
       end
 
+      def store_cpu_usage_with_top(dumped_cpu)
+        @cpu_usage.push self.merge_current_time(transfer_total_cpu_with_top_to_hash(dumped_cpu))
+      end
+
       def transfer_total_cpu_to_hash(dump_cpu_array)
         if dump_cpu_array.length <= 1
           {
@@ -65,6 +91,22 @@ module Droid
         end
       end
 
+      def transfer_total_cpu_with_top_to_hash(dump_cpu_array)
+        if dump_cpu_array.length <= 1
+          {
+              total_cpu: '0%',
+              process: 'no package process',
+              time: dump_cpu_array.last,
+          }
+        else
+          {
+              total_cpu: dump_cpu_array[2],
+              process: dump_cpu_array[0],
+              time: dump_cpu_array.last,
+          }
+        end
+      end
+
       def export_as_google_api_format(from_cpu_usage)
         google_api_data_format = empty_google_api_format
 
@@ -84,6 +126,23 @@ module Droid
         JSON.generate google_api_data_format
       end
 
+      def export_as_google_api_format_with_top(from_cpu_usage)
+        google_api_data_format = empty_google_api_format_with_top
+
+        from_cpu_usage.each do |hash|
+
+          a_google_api_data_format = {
+              c: [
+                  { v: hash[:time] },
+                  { v: hash[:total_cpu].delete('%').to_f },
+              ]
+          }
+          google_api_data_format[:rows].push(a_google_api_data_format)
+        end
+
+        JSON.generate google_api_data_format
+      end
+
       # @params [String] data_file_path A path to data.
       # @params [Hash] graph_opts A hash regarding graph settings.
       # @params [String] output_file_path A path you would like to export data.
@@ -107,6 +166,16 @@ module Droid
         }
       end
 
+      def empty_google_api_format_with_top
+        {
+            cols: [
+                { label: 'time', type: 'string' },
+                { label: 'total_cpu', type: 'number' },
+            ],
+            rows: [
+            ],
+        }
+      end
     end # class Cpu
   end # module Monitor
 end # module Droid

data/lib/droid/monitor/version.rb

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

data/test/cpu_test.rb

@@ -34,6 +34,10 @@ CPU usage from 7077ms to 1571ms ago:
 96% TOTAL: 49% user + 20% kernel + 26% iowait + 0.5% softirq
 EOS
 
+TOP_CPU = <<-EOS
+17742  0   4.7% S    82 2929372K 212464K  fg u0_a124  com.android.chrome
+EOS
+
 class CpuTest < Test::Unit::TestCase
 
   def setup
@@ -63,6 +67,16 @@ class CpuTest < Test::Unit::TestCase
     assert_equal(expected, @cpu.dump_cpu_usage(SAMPLE_CPU_DATA_44))
   end
 
+  def test_dump_cpu_usage_with_top_empty
+    expected = []
+    assert_equal(expected, @cpu.dump_cpu_usage(''))
+  end
+
+  def test_dump_cpu_usage_with_top
+    expected = %w(17742 0 4.7% S 82 2929372K 212464K fg u0_a124 com.android.chrome)
+    assert_equal(expected, @cpu.dump_cpu_usage(TOP_CPU))
+  end
+
   def test_transfer_from_hash_empty_to_json
     dummy_array = %w(13:43:32.556)
 
@@ -82,6 +96,22 @@ class CpuTest < Test::Unit::TestCase
     assert_equal(expected_json, JSON.generate(@cpu.cpu_usage))
   end
 
+  def test_transfer_from_hash_empty_to_json_with_top
+    dummy_array = %w(13:43:32.556)
+
+    @cpu.store_cpu_usage_with_top(dummy_array)
+    expected_json = "[{\"total_cpu\":\"0%\",\"process\":\"no package process\",\"time\":\"#{@cpu.cpu_usage[0][:time]}\"}]"
+    assert_equal(expected_json, JSON.generate(@cpu.cpu_usage))
+  end
+
+  def test_transfer_from_hash_correct_to_json_with_top
+    dummy_array = %w(17742 0 4.7% S 82 2929372K 212464K fg u0_a124 com.sample.package 13:43:32.55)
+
+    @cpu.store_cpu_usage_with_top(dummy_array)
+    expected_json = "[{\"total_cpu\":\"4.7%\",\"process\":\"17742\",\"time\":\"#{@cpu.cpu_usage[0][:time]}\"}]"
+    assert_equal(expected_json, JSON.generate(@cpu.cpu_usage))
+  end
+
   def test_convert_to_google_data_api_format_one
     dummy_array = %w(4.7% 2273/com.sample.package:sample: 3.3% user + 1.3% kernel 13:43:32.556)
 
@@ -106,4 +136,26 @@ class CpuTest < Test::Unit::TestCase
     assert_equal(@cpu.export_as_google_api_format(@cpu.cpu_usage), expected_json)
   end
 
+  def test_convert_to_google_data_api_format_with_top_one
+    dummy_array = %w(17742 0 4.7% S 82 2929372K 212464K fg u0_a124 com.sample.package 13:43:32.55)
+
+    @cpu.store_cpu_usage_with_top(dummy_array)
+    expected_json = "{\"cols\":[{\"label\":\"time\",\"type\":\"string\"}," +
+        "{\"label\":\"total_cpu\",\"type\":\"number\"}],\"rows\":[{\"c\":[{\"v\":\"#{@cpu.cpu_usage[0][:time]}\"}," +
+        "{\"v\":4.7}]}]}"
+    assert_equal(@cpu.export_as_google_api_format_with_top(@cpu.cpu_usage), expected_json)
+  end
+
+  def test_convert_to_google_data_api_format_with_top_many
+    dummy_array = %w(17742 0 4.7% S 82 2929372K 212464K fg u0_a124 com.sample.package 13:43:32.55)
+
+    @cpu.store_cpu_usage_with_top(dummy_array)
+    @cpu.store_cpu_usage_with_top(dummy_array)
+    expected_json = "{\"cols\":[{\"label\":\"time\",\"type\":\"string\"}," +
+        "{\"label\":\"total_cpu\",\"type\":\"number\"}],\"rows\":[{\"c\":[{\"v\":\"#{@cpu.cpu_usage[0][:time]}\"}," +
+        "{\"v\":4.7}]},{\"c\":[{\"v\":\"#{@cpu.cpu_usage[1][:time]}\"}," +
+        "{\"v\":4.7}]}]}"
+    assert_equal(@cpu.export_as_google_api_format_with_top(@cpu.cpu_usage), expected_json)
+  end
+
 end

data/test/memory_test.rb

@@ -82,6 +82,68 @@ Uptime: 76485937 Realtime: 238763696
     zip:/data/app/com.sample.package.apk:/assets/sample.ttf: 132K
 EOS
 
+SAMPLE_DATA_60 = <<-EOS
+Applications Memory Usage (kB):
+Uptime: 166891747 Realtime: 445776902
+
+** MEMINFO in pid 22861 [com.sample.package] **
+                   Pss  Private  Private  Swapped     Heap     Heap     Heap
+                 Total    Dirty    Clean    Dirty     Size    Alloc     Free
+                ------   ------   ------   ------   ------   ------   ------
+  Native Heap    24501    24240        0    13968    60416    56957     3458
+  Dalvik Heap    16434    16400        0      484    34525    31331     3194
+ Dalvik Other    14130    14108        0     5072
+        Stack     1316     1316        0        0
+       Ashmem      207      112        0        0
+    Other dev        9        0        8        0
+     .so mmap    18500      444    12540     2504
+    .apk mmap     1964        0     1520        0
+    .ttf mmap      643        0      580        0
+    .dex mmap    18523        8    18156        4
+    .oat mmap     2657        0      500        0
+    .art mmap     1881     1560       16       92
+   Other mmap     1725       12     1020        4
+   EGL mtrack     7962     7962        0        0
+    GL mtrack    32867    32867        0        0
+      Unknown     2672     2672        0      108
+        TOTAL   145991   101701    34340    22236    94941    88288     6652
+
+ App Summary
+                       Pss(KB)
+                        ------
+           Java Heap:    17976
+         Native Heap:    24240
+                Code:    33748
+               Stack:     1316
+            Graphics:    40829
+       Private Other:    17932
+              System:     9950
+
+               TOTAL:   145991      TOTAL SWAP (KB):    22236
+
+ Objects
+               Views:      553         ViewRootImpl:        1
+         AppContexts:        2           Activities:        1
+              Assets:        5        AssetManagers:        2
+       Local Binders:       37        Proxy Binders:       29
+       Parcel memory:       11         Parcel count:       46
+    Death Recipients:        2      OpenSSL Sockets:       10
+
+ SQL
+         MEMORY_USED:      468
+  PAGECACHE_OVERFLOW:      113          MALLOC_SIZE:       62
+
+ DATABASES
+      pgsz     dbsz   Lookaside(b)          cache  Dbname
+         4       20             25        36/17/3  /data/data/com.sample.package/databases/sample1.db
+         4       28             62        17/26/8  /data/data/com.sample.package/databases/sample2.db
+         4      104             19         6/21/3  /data/data/com.sample.package/databases/sample3.db
+         4      104             22         2/18/3  /data/data/com.sample.package/databases/sample4.db
+
+ Asset Allocations
+    zip:/data/app/com.sample.package/base.apk:/assets/sample.ttf: 76K
+EOS
+
 class MemoryTest < Test::Unit::TestCase
 
   def setup
@@ -172,6 +234,22 @@ class MemoryTest < Test::Unit::TestCase
     assert_equal(result, expected)
   end
 
+  def test_memory_details_api_level23
+    @memory.api_level = 23
+
+    expected = {
+        pss_total: 145991,
+        private_dirty: 101701,
+        private_clean: 34340,
+        swapped_dirty: 22236,
+        heap_size: 94941,
+        heap_alloc: 88288,
+        heap_free: 6652,
+    }
+    result = @memory.transfer_total_memory_details_to_hash(@memory.dump_memory_details_usage(SAMPLE_DATA_60))
+    assert_equal(result, expected)
+  end
+
   def test_transfer_from_hash_empty_to_json_memory_api_level18
     @memory.api_level = 18
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droid-monitor
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kazuaki MATSUO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2017-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faml
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Monitoring Android cpu or memory usage and create their simple graph with