@@ -4,8 +4,7 @@ require_relative "rubysermon/mod_template"

 require_relative "rubysermon/configurator"

 require_relative "rubysermon/db"

 require_relative "rubysermon/output_driver_template"

-

-require "date"

+require_relative "rubysermon/result_grabber"

 module Rubysermon

 	LIB_PATH = File.expand_path(File.dirname(__FILE__))

@@ -30,8 +29,6 @@ module Rubysermon

 			require "#{LIB_PATH}/rubysermon/output_drivers/#{@config[:output].downcase}"

 			@output_driver	= (Rubysermon.const_get(@config[:output])).new

-			@results		= []

-

 			check_args()

 		end

@@ -44,9 +41,11 @@ module Rubysermon

 			end

 			#start_db()

-			start_fetch_process_sleep_cycle()

+			start_result_processor()

 		end

+		#TODO destructor na ukoncenie threadov

+

 		private

 		def check_args

@@ -95,29 +94,12 @@ module Rubysermon

 			@db = DB.new(@config[:db_path])

 		end

-		def start_fetch_process_sleep_cycle

-			while true

-				current_time = DateTime.now()

-				@running_mods.each do |mod|

-					save_results(mod, current_time, mod.results())

-					notify() if mod.notify?

-				end

-				make_output()

-				sleep @config[:repeat]

-			end

-		end

-

-		def save_results(mod, time, result)

-			#results should be specialized object

-			mod_results = @results[mod]

-

-			if mod_results.size >= @config[:history_size]

-				mod_results.slice!(@config[:history_size], @results[mod].size)

-			end

+		def start_result_processor

+			@result_grabber = ResultGrabber.new(@running_mods, @config[:repeat])

+			@result_grabber.run()

-			#shift() and push() operations have O(1) complexity.

-			mod_results.shift()

-			mod_results.push([time: time, value: result])

+			#TODO spravit event machine na pytanie sa, ci netreba poslat notify

+			#Kazdy cas interval sa dozadovat grabbera na vysledky.

 		end

 		def notify

new file mode 100644

@@ -0,0 +1,72 @@

+require "date"

+require "monitor"

+

+module Rubysermon

+

+	# Nastartuje nekonecny cyklus v treade, ktory si bude volat

+	# moduly (ich vysledky), tie bude ukladat do svojho hasha,

+	# pripadne vysle signal na notify.

+	#

+	class ResultGrabber

+

+		def initialize(mods, sleep)

+			@results = {}

+			@grabber_thread = nil

+

+			@running_mods = mods

+			@sleep = sleep

+

+			@monitor = Monitor.new

+		end

+

+		def run

+			@grabber_thread = Thread.new do

+				while true

+					current_time = DateTime.now()

+					@running_mods.each do |mod|

+						#$stdout.puts mod.results()

+						save_results(mod.class, current_time, mod.results())

+					end

+					sleep @sleep

+				end

+			end

+		end

+

+		def stop

+			@grabber_thread.exit()

+		end

+

+		def get_last_results

+			results = []

+			@monitor.synchronize do

+				results = get_results()

+				empty_results()

+			end

+

+			results

+		end

+

+		private

+

+		def save_results(mod_name, time, result)

+			mod_results = @results[mod_name].to_a

+

+			@monitor.synchronize do

+				#shift() and push() operations have O(1) complexity.

+				mod_results.shift()

+				mod_results.push({time: time, value: result})

+

+				@results[mod_name] = mod_results

+			end

+		end

+

+		def get_results

+			#TODO samostatny objekt vysledkov a nie pole

+			@results

+		end

+

+		def empty_results

+			@results = {}

+		end

+	end

+end

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,31 @@

+require_relative '../../test_helper.rb'

+

+class ResultGrabber_test < MiniTest::Unit::TestCase

+

+	def test_run_cycle

+		loaded_mods = [Rubysermon::ModLoader.load('cpu')]

+		rp = Rubysermon::ResultGrabber.new(loaded_mods, 1)

+

+		rp.run()

+

+		try_count = 0

+		until ((results = rp.get_last_results()) != {}) do

+			try_count = try_count + 1

+

+			if try_count > 2

+				assert false

+			end

+

+			sleep(1) #neda sa to spravit nejak inak?

+		end

+

+		assert(results.length > 0)

+

+		first_result_pair = results.first[1][0]

+		assert_equal(first_result_pair[:time].class.to_s, "DateTime")

+

+		#todo a teraz nech sa zoberie dalsi vysledok a nech je iny nez ten prvy

+

+		rp.stop()

+	end

+end

\ No newline at end of file

@@ -62,22 +62,4 @@ class Rubysermon_test < MiniTest::Unit::TestCase

 		assert_equal("Wrong config file path. Exiting.", exception.message)

 	end

-

-	def test_results_cpu

-		skip("Use thread instead of sleep")

-		#depends on cpu module

-

-		ARGV[0] = "#{TEST_PATH}/fixtures/dummy_results.json"

-		@app = Rubysermon::App.new

-

-

-		thread = Thread.new do

-			@app.run()

-		end

-

-		sleep(2)

-		thread.kill()

-

-		#todo check stdout

-	end

 end

\ No newline at end of file