sfpagent 0.1.9 → 0.1.10

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/lib/sfpagent/agent.rb

@@ -25,6 +25,7 @@ module Sfp
 
 		BSigFile = "#{CachedDir}/bsig.model"
 		BSigPIDFile = "#{CachedDir}/bsig.pid"
+		BSigThreadsLockFile = "#{CachedDir}/bsig.threads.lock.#{Time.now.nsec}"
 
 		@@logger = WEBrick::Log.new(LogFile, WEBrick::BasicLog::INFO ||
 		                                     WEBrick::BasicLog::ERROR ||
@@ -90,6 +91,7 @@ Sfp::Agent.logger.info "modules dir: " + p[:modules_dir]
 				['INT', 'KILL', 'HUP'].each { |signal|
 					trap(signal) {
 						Sfp::Agent.logger.info "Shutting down web server"
+						bsig_engine.disable
 						server.shutdown
 					}
 				}
@@ -693,13 +695,14 @@ Sfp::Agent.logger.info "modules dir: " + p[:modules_dir]
 			end
 
 			def get_model
-				model = Sfp::Agent.get_model
-
 				# The model is not exist.
-				return [404, '', ''] if model.nil?
+				return [404, '', ''] if not File.exist?(Sfp::Agent::ModelFile)
 
-				# The model is exist, and then send it in JSON.
-				return [200, 'application/json', JSON.generate(model)] if !!model
+				begin
+					# The model is exist, and then send it in JSON.
+					return [200, 'application/json', File.read(Sfp::Agent::ModelFile)]
+				rescue
+				end
 
 				# There is an error when retrieving the model!
 				[500, '', '']
@@ -751,8 +754,6 @@ Sfp::Agent.logger.info "modules dir: " + p[:modules_dir]
 			def satisfy_bsig_request(p={})
 				return [400, '', ''] if not p[:query]
 
-Sfp::Agent.logger.info Sfp::Agent.bsig_engine.to_s
-
 				return [500, '', ''] if Sfp::Agent.bsig_engine.nil?
 
 				req = p[:query]

data/lib/sfpagent/bsig.rb

@@ -8,11 +8,11 @@ class Sfp::BSig
 
 	SatisfierPath = '/bsig/satisfier'
 	CachedDir = (Process.euid == 0 ? '/var/sfpagent' : File.expand_path('~/.sfpagent'))
-	SatisfierLockFile = CachedDir + '/bsig.satisfier.lock'
+	SatisfierLockFile = "#{CachedDir}/bsig.satisfier.lock.#{Time.now.nsec}"
 
-	attr_accessor :enabled, :mode
+	attr_reader :enabled, :mode
 
-	def initialize
+	def initialize(p={})
 		@lock = Mutex.new
 		@enabled = false
 	end
@@ -27,6 +27,7 @@ class Sfp::BSig
 			@enabled = true
 		}
 
+		@mode = p[:mode]
 		if p[:mode] == :main
 			enable_main_thread
 		elsif p[:mode] == :satisfier
@@ -35,53 +36,58 @@ class Sfp::BSig
 	end
 
 	def enable_satisfier_thread
-		@mode = :satisfier
-		Sfp::Agent.logger.info "[satisfier] BSig engine is enabled."
+		Sfp::Agent.logger.info "[#{@mode}] BSig engine is enabled."
 	end
 
 	def enable_main_thread
-		@mode = :main
-
 		['INT', 'KILL', 'HUP'].each { |signal|
 			trap(signal) {
-				Sfp::Agent.logger.info "Shutting down BSig engine"
+				Sfp::Agent.logger.info "[#{@mode}] Shutting down BSig engine"
 				disable
 			}
 		}
 		register_satisfier_thread(:reset)
 
-		Sfp::Agent.logger.info "[main] BSig engine is running."
+		Sfp::Agent.logger.info "[#{@mode}] BSig engine is running."
 
 		puts "BSig Engine is running with PID #{$$}"
 		File.open(Sfp::Agent::BSigPIDFile, 'w') { |f| f.write($$.to_s) }
 
 		self.execute_model
 
-		Sfp::Agent.logger.info "[main] BSig engine has stopped."
+		File.delete(SatisfierLockFile) if File.exist?(SatisfierLockFile)
+		Sfp::Agent.logger.info "[#{@mode}] BSig engine has stopped."
 	end
 
 	def execute_model
+		Sfp::Agent.logger.info "[#{@mode}] Executing BSig model"
+
+		previous_status = nil
 		while @enabled
 			begin
-				Sfp::Agent.logger.info "[main] Sfp::BSig enabled"
 	
 				wait_for_satisfier?
 	
 				bsig = Sfp::Agent.get_bsig
 				if bsig.nil?
+					status = :no_bsig
 					sleep BSigSleepTime
 				else
-					status = achieve_local_goal(bsig['id'], bsig['goal'], bsig['operators'], 1, :main)
-Sfp::Agent.logger.info "[main] execute model - status: " + status.to_s
+					status = achieve_local_goal(bsig['id'], bsig['goal'], bsig['operators'], 1)
 					if status == :failure
-						Sfp::Agent.logger.error "[main] Executing BSig model [Failed]"
+						Sfp::Agent.logger.error "[#{@mode}] Executing BSig model [Failed]"
 						sleep BSigSleepTime
 					elsif status == :no_flaw
 						sleep BSigSleepTime
 					end
 				end
+
+				if previous_status != status
+					Sfp::Agent.logger.info "[#{@mode}] BSig engine - status: " + status.to_s
+					previous_status = status
+				end
 			rescue Exception => e
-				Sfp::Agent.logger.error "Error on executing BSig model\n#{e}\n#{e.backtrace.join("\n")}"
+				Sfp::Agent.logger.error "[#{@mode}] Error on executing BSig model\n#{e}\n#{e.backtrace.join("\n")}"
 				sleep BSigSleepTime
 			end
 		end
@@ -91,7 +97,7 @@ Sfp::Agent.logger.info "[main] execute model - status: " + status.to_s
 		total_satisfier = 1
 		loop do
 			total_satisfier = (File.exist?(SatisfierLockFile) ? File.read(SatisfierLockFile).to_i : 0)
-			return if total_satisfier <= 0
+			return if total_satisfier <= 0 or not @enabled
 			sleep 1
 		end
 	end
@@ -101,13 +107,12 @@ Sfp::Agent.logger.info "[main] execute model - status: " + status.to_s
 	# :failure   : there is a failure on achieving the goal
 	# :ongoing   : the selected operator is being executed
 	# :repaired  : some goal-flaws have been repaired, but the goal may have other flaws
-	def achieve_local_goal(id, goal, operators, pi, mode=nil)
+	def achieve_local_goal(id, goal, operators, pi)
 		operator = nil
 
 		current = get_current_state
 		flaws = compute_flaws(goal, current)
 		return :no_flaw if flaws.length <= 0
-Sfp::Agent.logger.info "[#{mode}] Flaws: #{JSON.generate(flaws)}"
 
 		operator = select_operator(flaws, operators, pi)
 		return :failure if operator.nil?
@@ -115,14 +120,13 @@ Sfp::Agent.logger.info "[#{mode}] Flaws: #{JSON.generate(flaws)}"
 		@lock.synchronize {
 			return :ongoing if operator['selected']
 			operator['selected'] = true
-Sfp::Agent.logger.info "[#{mode}] Selected operator: #{JSON.generate(operator)}"
 		}
+Sfp::Agent.logger.info "[#{@mode}] Selected operator: #{operator['name']}" #{JSON.generate(operator)}"
 
 		next_pi = pi + 1
 		pre_local, pre_remote = split_preconditions(operator)
 
-Sfp::Agent.logger.info "[#{mode}] local-flaws: #{JSON.generate(pre_local)}"
-Sfp::Agent.logger.info "[#{mode}] remote-flaws: #{JSON.generate(pre_remote)}"
+Sfp::Agent.logger.info "[#{@mode}] local-flaws: #{JSON.generate(pre_local)}, remote-flaws: #{JSON.generate(pre_remote)}"
 
 		status = nil
 		tries = MaxTries
@@ -139,8 +143,7 @@ Sfp::Agent.logger.info "[#{mode}] remote-flaws: #{JSON.generate(pre_remote)}"
 			tries -= 1
 		end until tries <= 0
 
-#Sfp::Agent.logger.info "[#{mode}] status local: " + status.to_s
-		return :failure if status == :failure
+		return :failure if status != :no_flaw
 
 		return :failure if not achieve_remote_goal(id, pre_remote, next_pi)
 
@@ -155,9 +158,10 @@ Sfp::Agent.logger.info "[#{mode}] remote-flaws: #{JSON.generate(pre_remote)}"
 	def achieve_remote_goal(id, goal, pi)
 		if goal.length > 0
 			agents = Sfp::Agent.get_agents
-			split_goal_by_agent(goal).each do |agent,g|
-				return false if not agents.has_key?(agent) or agents[agent]['sfpAddress'].to_s == ''
-				return false if not send_goal_to_agent(agents[agent], id, g, pi)
+			split_goal_by_agent(goal).each do |agent_name,agent_goal|
+				return false if not agents.has_key?(agent_name) or agents[agent_name]['sfpAddress'].to_s == ''
+
+				return false if not send_goal_to_agent(agents[agent_name], id, agent_goal, pi, agent_name)
 			end
 		end
 		true
@@ -166,20 +170,16 @@ Sfp::Agent.logger.info "[#{mode}] remote-flaws: #{JSON.generate(pre_remote)}"
 	def receive_goal_from_agent(id, goal, pi)
 		register_satisfier_thread
 
-Sfp::Agent.logger.info "[satisfier] enabled: " + @enabled.to_s
 		return false if not @enabled
 
 		bsig = Sfp::Agent.get_bsig
 
-Sfp::Agent.logger.info "[satisfier] receive_goal_from_agent - " + id.inspect + " - " + goal.inspect + " - " + pi.inspect
-Sfp::Agent.logger.info "[satisfier] " + bsig.inspect
-
 		return false if bsig.nil? or id < bsig['id']
 
 		status = nil
 		tries = MaxTries
 		begin
-			status = achieve_local_goal(bsig['id'], goal, bsig['operators'], pi, :satisfier)
+			status = achieve_local_goal(bsig['id'], goal, bsig['operators'], pi)
 			if status == :no_flaw or status == :failure or not @enabled
 				break
 			elsif status == :ongoing
@@ -191,9 +191,7 @@ Sfp::Agent.logger.info "[satisfier] " + bsig.inspect
 			tries -= 1
 		end until tries <= 0
 
-		return false if status == :failure
-
-		true
+		return (status == :no_flaw)
 
 	ensure
 		unregister_satisfier_thread
@@ -201,8 +199,6 @@ Sfp::Agent.logger.info "[satisfier] " + bsig.inspect
 
 	protected
 	def register_satisfier_thread(mode=nil)
-		return if mode == :reset and File.exist?(SatisfierLockFile)
-
 		File.open(SatisfierLockFile, File::RDWR|File::CREAT, 0644) { |f|
 			f.flock(File::LOCK_EX)
 			value = (mode == :reset ? 0 : (f.read.to_i + 1))
@@ -236,12 +232,14 @@ Sfp::Agent.logger.info "[satisfier] " + bsig.inspect
 		agent_goal
 	end
 
-	def send_goal_to_agent(agent, id, g, pi)
+	def send_goal_to_agent(agent, id, g, pi, agent_name='')
 		data = {'id' => id,
 		        'goal' => JSON.generate(g),
 		        'pi' => pi}
 		code, _ = put_data(agent['sfpAddress'], agent['sfpPort'], SatisfierPath, data)
-Sfp::Agent.logger.info "send_goal_to_agent - status: " + code.to_s
+
+Sfp::Agent.logger.info "[#{@mode}] Request goal to: #{agent_name} - status: " + code.to_s
+
 		(code == '200')
 	end
 
@@ -282,9 +280,7 @@ Sfp::Agent.logger.info "send_goal_to_agent - status: " + code.to_s
 	end
 
 	def can_repair?(operator, flaws)
-		operator['effect'].each { |var,val|
-			return true if flaws[var] == val
-		}
+		operator['effect'].each { |variable,value| return true if flaws[variable] == value }
 		false
 	end
 
@@ -306,6 +302,7 @@ Sfp::Agent.logger.info "send_goal_to_agent - status: " + code.to_s
 	end
 
 	def invoke(operator)
+		Sfp::Agent.logger.info "[#{@mode}] Invoking #{operator['name']}"
 		Sfp::Agent.execute_action(operator)
 	end
 end

data/lib/sfpagent/runtime.rb

@@ -94,24 +94,13 @@ class Sfp::Runtime
 	def update_model(model, root, path)
 		object = {}
 		if model['_context'] == 'object' and model['_isa'].to_s.isref and model['_isa'].to_s != '$.Object'
-			# if this model is an instance of a subclass of Object, then
-			# get the current state of this object
-			obj = (!defined?(@root) or @root.nil? ? nil : @root.at?(path))
-			if obj.is_a?(Hash)
-				object[:_self] = obj[:_self]
-				object[:_self].update_model(model)
-			else
-Sfp::Agent.logger.info "Instantiating object: #{model['_self']}"
-				# the module has not been instantiated yet!
-				object[:_self] = instantiate_sfp_object(model, root)
-			end
+			object[:_self] = instantiate_sfp_object(model, root)
 		end
 
 		model.each do |key,child|
-			next if key[0,1] == '_' or not child.is_a?(Hash) or child['_context'] != 'object' or
-				child['_isa'].to_s == '$.Object'
-				#not child['_isa'].to_s.isref or child['_isa'].to_s == '$.Object'
-			object[key] = update_model(child, root, path.push(key))
+			if key[0,1] != '_' and child.is_a?(Hash) and child['_context'] == 'object' and child['_isa'].to_s != '$.Object'
+				object[key] = update_model(child, root, path.push(key))
+			end
 		end
 
 		object

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &18421700 !ruby/object:Gem::Requirement
+  requirement: &16928140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *18421700
+  version_requirements: *16928140
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables: