titan 0.3.0 → 0.4.0

data/lib/titan/thread.rb

@@ -5,8 +5,6 @@ module Titan
   # that gets created automatically.
   #
   class Thread
-    TITAN_DIRECTORY = File.expand_path('.titan_threads', '~')
-
     attr_accessor :id, :pid
 
     @@threads = {}
@@ -53,14 +51,30 @@ module Titan
     # Returns the file where its pid gets saved
     #
     def pid_file
-      File.expand_path(@id.to_s + ".pid", Titan::Thread::TITAN_DIRECTORY)
+      File.expand_path(@id.to_s + ".pid", TITAN_DIRECTORY)
+    end
+
+    #
+    # Returns the used memory
+    #
+    def used_memory
+      used_memory = Titan::System.ps('rss', @pid)
+      used_memory ? used_memory.to_i : nil
+    end
+
+    #
+    # Returns the used CPU
+    #
+    def used_cpu
+      used_cpu = Titan::System.ps('%cpu', @pid)
+      used_cpu ? used_cpu.to_f : nil
     end
 
     #
     # Opens the pid file and save its pid in it
     #
     def save
-      Titan::Thread.check_filesystem
+      Titan::System.check_filesystem
       File.open(pid_file, 'w') { |file| file.write(@pid) }
       @@threads[@id] = self
     end
@@ -107,8 +121,8 @@ module Titan
       # Loads threads from pid files inside the TITAN_DIRECTORY
       #
       def load_threads
-        check_filesystem
-        pid_files.each{ |pid_file|
+        Titan::System.check_filesystem
+        Titan::System.pid_files.each{ |pid_file|
           thread     = Titan::Thread.new(:id => File.basename(pid_file, ".pid"))
           thread.pid = File.read(File.expand_path(pid_file, TITAN_DIRECTORY)).to_i
           @@threads[thread.id] = thread
@@ -119,8 +133,8 @@ module Titan
       # Saves threads to pid files inside the TITAN_DIRECTORY
       #
       def save_threads
-        pid_files.each { |pid_file| File.delete(File.expand_path(pid_file, TITAN_DIRECTORY)) }
-        @@threads.each_value{ |thread| thread.save }
+        Titan::System.pid_files.each { |pid_file| File.delete(File.expand_path(pid_file, TITAN_DIRECTORY)) }
+        @@threads.each_value { |thread| thread.save }
       end
 
       #
@@ -131,20 +145,6 @@ module Titan
         save_threads
         @@threads
       end
-
-      #
-      # Checks the file system for neccessary directories and permissions
-      #
-      def check_filesystem
-        Dir.mkdir(TITAN_DIRECTORY) unless File.directory?(TITAN_DIRECTORY)
-      end
-
-      #
-      # Returns a list of all pid files available in the TITAN_DIRECTORY
-      #
-      def pid_files
-        Dir.entries(TITAN_DIRECTORY) - [".", ".."]
-      end
     end
   end
 end

data/lib/titan/thread.rbc

@@ -124,174 +124,183 @@ x
 6
 Thread
 i
-169
+178
 5
 66
-65
+5
 7
 0
-45
+7
 1
+47
+49
 2
+2
+15
+5
 7
 3
-64
-7
+44
+43
 4
-64
+78
 49
 5
-2
+1
 49
 6
 2
 15
-5
+99
 7
 7
 7
 8
-47
+65
+67
 49
 9
-2
+0
+49
+10
+4
 15
-5
+99
 7
-10
-44
-43
 11
-78
-49
+7
 12
-1
+65
+67
 49
-13
-2
+9
+0
+49
+10
+4
 15
 99
 7
-14
+13
 7
-15
+14
 65
 67
 49
-16
+9
 0
 49
-17
+10
 4
 15
 99
 7
-18
+15
 7
-19
+16
 65
 67
 49
-16
+9
 0
 49
-17
+10
 4
 15
 99
 7
-20
+17
 7
-21
+18
 65
 67
 49
-16
+9
 0
 49
-17
+10
 4
 15
 99
 7
-22
+19
 7
-23
+20
 65
 67
 49
-16
+9
 0
 49
-17
+10
 4
 15
 99
 7
-24
+21
 7
-25
+22
 65
 67
 49
-16
+9
 0
 49
-17
+10
 4
 15
 99
 7
-26
+23
 7
-27
+24
 65
 67
 49
-16
+9
 0
 49
-17
+10
 4
 15
 99
 7
-28
+25
 7
-29
+26
 65
 67
 49
-16
+9
 0
 49
-17
+10
 4
 15
 5
 99
 12
 49
-30
+27
 1
 13
 99
 12
 7
-31
+28
 12
 7
-32
+29
 12
 65
 12
 49
-33
+30
 4
 15
 54
 50
-31
+28
 0
 11
 I
@@ -304,26 +313,7 @@ I
 0
 n
 p
-34
-x
-15
-TITAN_DIRECTORY
-x
-4
-File
-n
-s
-14
-.titan_threads
-s
-1
-~
-x
-11
-expand_path
-x
-9
-const_set
+31
 x
 2
 id
@@ -469,27 +459,27 @@ p
 I
 0
 I
-11
+f
 I
 12
 I
-12
+10
 I
 23
 I
-13
+11
 I
 27
 I
-14
+12
 I
 2c
 I
-15
+13
 I
 3d
 I
-16
+14
 I
 3f
 x
@@ -562,11 +552,11 @@ p
 I
 0
 I
-1c
+1a
 I
 0
 I
-1d
+1b
 I
 c
 x
@@ -675,23 +665,23 @@ p
 I
 0
 I
-23
+21
 I
 0
 I
-24
+22
 I
 10
 I
-25
+23
 I
 19
 I
-26
+24
 I
 28
 I
-27
+25
 I
 35
 x
@@ -795,23 +785,23 @@ p
 I
 0
 I
-2d
+2b
 I
 0
 I
-2e
+2c
 I
 c
 I
-2f
+2d
 I
 11
 I
-30
+2e
 I
 22
 I
-31
+2f
 I
 2b
 x
@@ -833,7 +823,7 @@ x
 8
 pid_file
 i
-24
+20
 45
 0
 1
@@ -850,12 +840,8 @@ i
 45
 6
 7
-43
-8
-43
-9
 49
-10
+8
 2
 11
 I
@@ -868,7 +854,7 @@ I
 0
 n
 p
-11
+9
 x
 4
 File
@@ -886,15 +872,9 @@ x
 1
 +
 x
-5
-Titan
-n
-x
-6
-Thread
-x
 15
 TITAN_DIRECTORY
+n
 x
 11
 expand_path
@@ -903,103 +883,293 @@ p
 I
 0
 I
-37
+35
 I
 0
 I
-38
+36
 I
-18
+14
 x
 45
 /Users/stefan/Codes/titan/lib/titan/thread.rb
 p
 0
 x
-4
-save
+11
+used_memory
 M
 1
 n
 n
 x
-4
-save
+11
+used_memory
 i
-41
+29
 45
 0
 1
 43
 2
-49
+7
 3
-0
-15
-45
+64
+39
 4
+49
 5
-5
-48
-6
-7
-7
-64
-56
-8
-50
-9
 2
+19
+0
 15
-65
-7
-10
+20
+0
+9
+27
+20
+0
 49
-11
+6
+0
+8
+28
 1
-39
-12
-5
-13
-18
-3
-49
-13
-2
-15
 11
 I
 4
 I
-0
+1
 I
 0
 I
 0
 n
 p
-14
+7
 x
 5
 Titan
 n
 x
 6
-Thread
-x
-16
-check_filesystem
+System
+s
+3
+rss
 x
 4
-File
-n
+@pid
 x
-8
-pid_file
-s
-1
-w
-M
+2
+ps
+x
+4
+to_i
+p
+7
+I
+0
+I
+3c
+I
+0
+I
+3d
+I
+10
+I
+3e
+I
+1d
+x
+45
+/Users/stefan/Codes/titan/lib/titan/thread.rb
+p
+1
+x
+11
+used_memory
+x
+8
+used_cpu
+M
+1
+n
+n
+x
+8
+used_cpu
+i
+29
+45
+0
+1
+43
+2
+7
+3
+64
+39
+4
+49
+5
+2
+19
+0
+15
+20
+0
+9
+27
+20
+0
+49
+6
+0
+8
+28
+1
+11
+I
+4
+I
+1
+I
+0
+I
+0
+n
+p
+7
+x
+5
+Titan
+n
+x
+6
+System
+s
+4
+%cpu
+x
+4
+@pid
+x
+2
+ps
+x
+4
+to_f
+p
+7
+I
+0
+I
+44
+I
+0
+I
+45
+I
+10
+I
+46
+I
+1d
+x
+45
+/Users/stefan/Codes/titan/lib/titan/thread.rb
+p
+1
+x
+8
+used_cpu
+x
+4
+save
+M
+1
+n
+n
+x
+4
+save
+i
+41
+45
+0
+1
+43
+2
+49
+3
+0
+15
+45
+4
+5
+5
+48
+6
+7
+7
+64
+56
+8
+50
+9
+2
+15
+65
+7
+10
+49
+11
+1
+39
+12
+5
+13
+18
+3
+49
+13
+2
+15
+11
+I
+4
+I
+0
+I
+0
+I
+0
+n
+p
+14
+x
+5
+Titan
+n
+x
+6
+System
+x
+16
+check_filesystem
+x
+4
+File
+n
+x
+8
+pid_file
+s
+1
+w
+M
 1
 p
 2
@@ -1047,7 +1217,7 @@ p
 I
 0
 I
-40
+4e
 I
 c
 x
@@ -1078,19 +1248,19 @@ p
 I
 0
 I
-3e
+4c
 I
 0
 I
-3f
+4d
 I
 9
 I
-40
+4e
 I
 18
 I
-41
+4f
 I
 29
 x
@@ -1234,19 +1404,19 @@ p
 I
 0
 I
-48
+56
 I
 0
 I
-4a
+58
 I
 d
 I
-4c
+5a
 I
 13
 I
-4e
+5c
 I
 1a
 x
@@ -1272,23 +1442,23 @@ p
 I
 0
 I
-47
+55
 I
 0
 I
-48
+56
 I
 b
 I
-50
+5e
 I
 14
 I
-51
+5f
 I
 18
 I
-52
+60
 I
 1a
 x
@@ -1310,7 +1480,7 @@ x
 18
 __metaclass_init__
 i
-114
+86
 5
 66
 99
@@ -1396,34 +1566,6 @@ i
 49
 3
 4
-15
-99
-7
-14
-7
-15
-65
-67
-49
-2
-0
-49
-3
-4
-15
-99
-7
-16
-7
-17
-65
-67
-49
-2
-0
-49
-3
-4
 11
 I
 5
@@ -1435,7 +1577,7 @@ I
 0
 n
 p
-18
+14
 x
 4
 find
@@ -1492,15 +1634,15 @@ p
 I
 0
 I
-59
+67
 I
 0
 I
-5a
+68
 I
 4
 I
-5b
+69
 I
 10
 x
@@ -1562,11 +1704,11 @@ p
 I
 0
 I
-5e
+6c
 I
 0
 I
-5f
+6d
 I
 b
 x
@@ -1625,15 +1767,15 @@ p
 I
 0
 I
-65
+73
 I
 0
 I
-66
+74
 I
 4
 I
-67
+75
 I
 b
 x
@@ -1652,18 +1794,28 @@ x
 12
 load_threads
 i
-13
-5
-48
+23
+45
+0
+1
+43
+2
+49
+3
 0
 15
+45
+0
+4
+43
+2
+49
 5
-48
-1
+0
 56
-2
+6
 50
-3
+7
 0
 11
 I
@@ -1676,10 +1828,18 @@ I
 0
 n
 p
-4
+8
+x
+5
+Titan
+n
+x
+6
+System
 x
 16
 check_filesystem
+n
 x
 9
 pid_files
@@ -1910,19 +2070,19 @@ p
 I
 0
 I
-6f
+7d
 I
 4
 I
-70
+7e
 I
 53
 I
-71
+7f
 I
 71
 I
-72
+80
 I
 86
 x
@@ -1944,17 +2104,17 @@ p
 I
 0
 I
-6d
+7b
 I
 0
 I
-6e
+7c
 I
-4
+9
 I
-6f
+7d
 I
-d
+17
 x
 45
 /Users/stefan/Codes/titan/lib/titan/thread.rb
@@ -1971,26 +2131,31 @@ x
 12
 save_threads
 i
-21
-5
-48
+26
+45
 0
-56
 1
-50
+43
 2
+49
+3
+0
+56
+4
+50
+5
 0
 15
 65
 7
-3
+6
 49
-4
+7
 1
 56
-5
+8
 50
-6
+9
 0
 11
 I
@@ -2003,7 +2168,14 @@ I
 0
 n
 p
-7
+10
+x
+5
+Titan
+n
+x
+6
+System
 x
 9
 pid_files
@@ -2074,7 +2246,7 @@ p
 I
 0
 I
-7a
+88
 I
 16
 x
@@ -2137,7 +2309,7 @@ p
 I
 0
 I
-7b
+89
 I
 a
 x
@@ -2156,17 +2328,17 @@ p
 I
 0
 I
-79
+87
 I
 0
 I
-7a
+88
 I
-9
+e
 I
-7b
+89
 I
-15
+1a
 x
 45
 /Users/stefan/Codes/titan/lib/titan/thread.rb
@@ -2279,7 +2451,7 @@ p
 I
 0
 I
-82
+90
 I
 16
 x
@@ -2304,225 +2476,54 @@ p
 I
 0
 I
-81
+8f
 I
 0
 I
-82
+90
 I
 c
 I
-83
-I
-10
-I
-84
-I
-17
-x
-45
-/Users/stefan/Codes/titan/lib/titan/thread.rb
-p
-0
-x
-16
-check_filesystem
-M
-1
-n
-n
-x
-16
-check_filesystem
-i
-24
-45
-0
-1
-45
-2
-3
-49
-4
-1
-9
-14
-1
-8
-23
-45
-5
-6
-45
-2
-7
-49
-8
-1
-11
-I
-2
-I
-0
-I
-0
-I
-0
-n
-p
-9
-x
-4
-File
-n
-x
-15
-TITAN_DIRECTORY
-n
-x
-10
-directory?
-x
-3
-Dir
-n
-n
-x
-5
-mkdir
-p
-5
-I
-0
-I
-8a
-I
-0
-I
-8b
-I
-18
-x
-45
-/Users/stefan/Codes/titan/lib/titan/thread.rb
-p
-0
-x
-9
-pid_files
-M
-1
-n
-n
-x
-9
-pid_files
-i
-20
-45
-0
-1
-45
-2
-3
-49
-4
-1
-7
-5
-64
-7
-6
-64
-35
-2
-82
-7
-11
-I
-3
-I
-0
-I
-0
-I
-0
-n
-p
-8
-x
-3
-Dir
-n
-x
-15
-TITAN_DIRECTORY
-n
-x
-7
-entries
-s
-1
-.
-s
-2
-..
-x
-1
--
-p
-5
-I
-0
-I
 91
 I
-0
+10
 I
 92
 I
-14
+17
 x
 45
 /Users/stefan/Codes/titan/lib/titan/thread.rb
 p
 0
 p
-17
+13
 I
 2
 I
-59
+67
 I
 10
 I
-5e
+6c
 I
 1e
 I
-65
+73
 I
 2c
 I
-6d
+7b
 I
 3a
 I
-79
+87
 I
 48
 I
-81
+8f
 I
 56
-I
-8a
-I
-64
-I
-91
-I
-72
 x
 45
 /Users/stefan/Codes/titan/lib/titan/thread.rb
@@ -2532,53 +2533,57 @@ x
 13
 attach_method
 p
-23
+25
 I
 2
 I
 8
 I
-15
+c
 I
 a
 I
-1f
+1a
 I
-c
+f
 I
-2d
+28
 I
-11
+1a
 I
-3b
+36
 I
-1c
+21
 I
-49
+44
 I
-23
+2b
 I
-57
+52
 I
-2d
+35
 I
-65
+60
 I
-37
+3c
 I
-73
+6e
 I
-3e
+44
 I
-81
+7c
 I
-47
+4c
 I
-8f
+8a
 I
 55
 I
-a9
+98
+I
+63
+I
+b2
 x
 45
 /Users/stefan/Codes/titan/lib/titan/thread.rb