cellumon 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8c771c909a0dcfadcaaf03a9f3365512ed905b2
-  data.tar.gz: 560365358c89e138292cd0722ec7c9264ab262cf
+  metadata.gz: 393429643d51ab62509e289d26e26b6ff9525392
+  data.tar.gz: 317bf1a9f1481c17ff687e0d3fabb08e6e3a2776
 SHA512:
-  metadata.gz: c9c19bdaf3a6e418f0c7b8d8e62d7786639a98cd80ba4a41d1b2e9b7d27a3d29d709afd477de54a5a6a510021ba356135453f580f848a09a7b91c86de52702a8
-  data.tar.gz: 146126ea2a81af3c29523e5d85a3cb8de1ae15b11fb7f9af35bfe8809a47860bf9181a3dac107ff6a19a448ec4dae514721d9461076374b0aec4a3ad06262f7d
+  metadata.gz: 2e46df51abd66e48a5835ab8af203edf580f9a82a93f0bc857bc341dc113d24f21119aa942a76aa29510eb3ddb0e75f8a6dd585345674e7d42fce354e0bbf216
+  data.tar.gz: 9703a1b0387a1a90ecf06175bdb691f2ddea703aa88aa22e02e54a655185283716224f8528f75e7b02bab76252fa0dcfe9128a79b5699597f32b37ffbdf1aef6

data/cellumon.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name         = "cellumon"
-  gem.version      = "0.1.0"
+  gem.version      = "0.3.0"
   gem.platform     = Gem::Platform::RUBY
   gem.summary      = "Monitor threads, processes, and states of Celluloid and its Actor System."
   gem.description  = "Thread summary and reporting actor, utility for finding leaks and monitoring."
@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
 
   gem.authors      = ["digitalextremist //"]
   gem.email        = ["code@extremist.digital"]
-  gem.homepage     = "https://github.com/digitalextremist/cellumon"
+  gem.homepage     = "https://github.com/abstractive/cellumon"
 
   gem.required_ruby_version     = ">= 1.9.2"
   gem.required_rubygems_version = ">= 1.3.6"

data/lib/cellumon.rb

@@ -19,16 +19,21 @@ class Cellumon
     memory_count: 13
   }
 
-  def initialize
+  def initialize(mark=false)
     @semaphor = {}
     @status = {}
     @timers = {}
+    @mark = mark
     @intervals = MONITORS.dup
   end
 
+  def mark
+    @mark ? "Cellumon > " : ""
+  end
+
   MONITORS.each { |m,i|
     define_method(:"start_#{m}!") { |interval=nil|
-      async.send1(:"starting_#{m}")
+      async.send(:"starting_#{m}")
     }
     define_method(:"starting_#{m}") { |interval=nil|
       @intervals[m] = interval || MONITORS[m]
@@ -46,12 +51,20 @@ class Cellumon
     
   def memory_count!
     if ready? :memory_count
-      console("Memory usage: #{`pmap #{Process.pid} | tail -1`[10,40].strip}")
+      total = `pmap #{Process.pid} | tail -1`[10,40].strip[0..-1]
+      console("Memory usage: #{memory(total)}")
       ready! :memory_count
     end    
     @timers[:memory_count] = after(@intervals[:memory_count]) { memory_count! }
   end
 
+  def memory(total)
+    total = total.to_i
+    gb = (total / (1024 * 1024)).to_i
+    mb = total % gb
+    "#{'%0.2f' % "#{gb}.#{mb}"}gb" #de Very fuzzy math but fine for now.
+  end
+
   def thread_survey!
     if ready? :thread_survey
       Celluloid.stack_summary
@@ -71,21 +84,19 @@ class Cellumon
   def thread_report!
     if ready? :thread_report
       threads = Thread.list.inject({}) { |l,t| l[t.object_id] = t.status; l }
-      running = threads.select { |id,status| status == 'run' }.count
-      sleeping = threads.select { |id,status| status == 'sleep' }.count
-      aborting = threads.select { |id,status| status == 'aborting' }.count
-      normally_terminated = threads.select { |id,status| status === false }.count
-      exception_terminated = threads.select { |id,status| status.nil? }.count
-      console "Threads #{threads.count}; " +
-        "Running (#{running}) Sleeping (#{sleeping}) Aborting (#{aborting}); " +
-        "Terminated: Normally (#{normally_terminated}) Exception (#{exception_terminated})"
+      r = threads.select { |id,status| status == 'run' }.count
+      s = threads.select { |id,status| status == 'sleep' }.count
+      a = threads.select { |id,status| status == 'aborting' }.count
+      nt = threads.select { |id,status| status === false }.count
+      te = threads.select { |id,status| status.nil? }.count
+      console "Threads #{threads.count}: #{r}r #{s}s #{a}a #{nt}nt #{te}te"
       ready! :thread_report
     end
     @timers[:thread_report] = after(@intervals[:thread_report]) { thread_report! }
   end
 
   def console(message)
-    puts "*, [#{Time.now.strftime('%FT%T.%L')}] Cellumon > #{message}"
+    puts "*, [#{Time.now.strftime('%FT%T.%L')}] #{mark}#{message}"
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellumon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - digitalextremist //
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-19 00:00:00.000000000 Z
 dependencies: []
 description: Thread summary and reporting actor, utility for finding leaks and monitoring.
 email:
@@ -23,7 +23,7 @@ files:
 - Rakefile
 - cellumon.gemspec
 - lib/cellumon.rb
-homepage: https://github.com/digitalextremist/cellumon
+homepage: https://github.com/abstractive/cellumon
 licenses:
 - MIT
 metadata: {}