sfp 0.1.1 → 0.1.3

data/lib/sfp/executor.rb

@@ -0,0 +1,207 @@
+#!/usr/bin/env ruby
+
+require 'json'
+require 'thread'
+
+module Sfp
+	module Executor
+		class ExecutionException < Exception; end
+		class ParallelExecutionException < Exception; end
+		class SequentialExecutionException < Exception; end
+
+		# @param :plan the plan to be executed
+		# @param :owner an object that implement the action
+		# @param :retry number of retries (default: 2) when execution is failed
+		#
+		def execute_plan(params={})
+			if params[:plan].nil? or not params[:plan].is_a?(Hash)
+				raise ExecutionException, 'Plan is not available.'
+			elsif params[:plan]['type'].to_s == 'parallel' or
+			      params[:plan][:type].to_s == 'parallel'
+				return self.execute_parallel_plan(params)
+			elsif params[:plan]['type'].to_s == 'sequential' or
+			      params[:plan][:type].to_s == 'sequential'
+				return self.execute_sequential_plan(params)
+			else
+				raise ExecutionException, 'Unknown type of plan!'
+			end
+			false
+		end
+
+		# @param :plan the plan to be executed
+		# @param :owner an object that implement the action
+		# @param :retry number of retries (default: 2) when execution is failed
+		#
+		def execute_parallel_plan(params={})
+			def assign_action_with_id(id)
+				thread_id = next_thread_id
+				action = @actions[id]
+				action[:executor] = thread_id
+				self.thread_execute_action(thread_id, action)
+			end
+
+			def next_thread_id
+				id = 0
+				@mutex.synchronize { @thread_id = id = @thread_id + 1 }
+				id
+			end
+
+			def action_to_string(action)
+				"#{action['id']}:#{action['name']}#{JSON.generate(action['parameters'])}"
+			end
+
+			def thread_execute_action(tid, action)
+				t = Thread.new {
+					@mutex.synchronize { @threads << tid }
+
+					while not @failed and not action[:executed]
+						# execute the action
+						op_str = action_to_string(action)
+						#Nuri::Util.puts "[ExecutorThread: #{tid}] #{op_str}"
+						success = false
+						num = @retry
+						begin
+							success = @owner.execute_action { action }
+							num -= 1
+						end while not success and num > 0
+
+						# check if execution failed
+						if success
+							next_actions = []
+							@mutex.synchronize {
+								# set executed
+								action[:executed] = true
+								# select next action to be executed from all predecessor actions
+								# if each action has not been assigned to any thread yet
+								if action['successors'].length > 0
+									action['successors'].each { |id|
+										if @actions[id][:executor].nil?
+											predecessors_ok = true
+											@actions[id]['predecessors'].each { |pid|
+												predecessors_ok = (predecessors_ok and @actions[pid][:executed])
+											}
+											next_actions << id if predecessors_ok
+										end
+									}
+								end
+								next_actions.each { |id| @actions[id][:executor] = tid }
+							}
+							if next_actions.length > 0
+								# execute next actions
+								action = @actions[next_actions[0]]
+								if next_actions.length > 1
+									for i in 1..(next_actions.length-1)
+										assign_action_with_id(next_actions[i])
+									end
+								end
+							end
+								
+						else
+							Nuri::Util.error "Failed executing #{op_str}!"
+							@mutex.synchronize {
+								@failed = true # set global flag
+								@actions_failed << action
+							}
+						end
+					end
+
+					@mutex.synchronize { @threads.delete(tid) }
+				}
+			end
+
+			if params[:plan].nil? or not params[:plan].is_a?(Hash)
+				raise ParallelExecutionException, 'Plan is not available.'
+			elsif params[:plan]['type'].to_s == 'parallel' or
+			      params[:plan][:type].to_s == 'parallel'
+			else
+				raise ParallelExecutionException, 'Not a parallel plan.'
+			end
+
+			@owner = params[:owner]
+			@retry = (params[:retry].nil? ? 2 : params[:retry].to_i)
+
+			@actions = params[:plan]['workflow']
+			@actions.sort! { |x,y| x['id'] <=> y['id'] }
+			@actions.each { |op| op[:executed] = false; op[:executor] = nil; }
+
+			@threads = []
+			@actions_failed = []
+			@mutex = Mutex.new
+			@failed = false
+			@thread_id = 0
+
+			params[:plan]['init'].each { |op_id| assign_action_with_id(op_id) }
+
+			begin
+				sleep 1
+			end while @threads.length > 0
+
+			Nuri::Util.log "Using #{@thread_id} threads in execution."
+
+			return (not @failed)
+		end
+
+		# @param :plan the plan to be executed
+		# @param :owner an object that implement the action
+		# @param :retry number of retries (default: 2) when execution is failed
+		#
+		def execute_sequential_plan(params={})
+			if params[:plan].nil? or not params[:plan].is_a?(Hash)
+				raise ParallelExecutionException, 'Plan is not available.'
+			elsif params[:plan]['type'].to_s == 'sequential' or
+			      params[:plan][:type].to_s == 'sequential'
+			else
+				raise ParallelExecutionException, 'Not a parallel plan.'
+			end
+
+			@owner = params[:owner]
+			@retry = (params[:retry].nil? ? 2 : params[:retry].to_i)
+			params[:plan]['workflow'].each { |action|
+				success = false
+				num = @retry
+				begin
+					success, data = @owner.execute_action { action }
+					puts data.to_s if params[:print_output]
+					num -= 1
+				end while not success and num > 0
+				return false if not success
+			}
+			true
+		end
+	end
+
+	class RubyExecutor
+		def execute_plan(params={})
+			exec = Object.new
+			exec.extend(Sfp::Executor)
+			params[:owner] = self
+			exec.execute_plan(params)
+		end
+
+		def execute_action
+			# TODO
+			action = yield
+			puts "Exec: #{action.inspect}"
+			[true, nil]
+		end
+	end
+
+	class BashExecutor < RubyExecutor
+		def execute_action
+			# TODO
+			action = yield
+			module_dir = (ENV.has_key?("SFP_HOME") ? ENV['SFP_HOME'] : ".")
+			script_path = "#{action['name'].sub!(/^\$\./, '')}"
+			script_path = "#{module_dir}/#{script_path.gsub!(/\./, '/')}"
+			cmd = "/bin/bash #{script_path}"
+			action['parameters'].each { |p| cmd += " '#{p}'" }
+			begin
+				data = `#{cmd}`
+			rescue Exception => exp
+				$stderr.puts "#{exp}\n#{exp.backtrace}"
+				[false, nil]
+			end
+			[true, data]
+		end
+	end
+end

data/lib/sfp/planner.rb

@@ -296,12 +296,19 @@ module Sfp
 
 		def self.path
 			os = `uname -s`.downcase.strip
-			planner = case os
-				when 'linux' then File.expand_path(File.dirname(__FILE__) + '/../../bin/solver/linux')
-				when 'macos', 'darwin' then File.expand_path(File.dirname(__FILE__) + '/../../bin/solver/macos')
-				else nil
+			machine = `uname -m`.downcase.strip
+			planner = nil
+
+			if os == 'linux' and machine[0,3] == 'x86'
+				planner = File.expand_path(File.dirname(__FILE__) + '/../../bin/solver/linux-x86')
+			elsif os == 'linux' and machine[0,3] == 'arm'
+				planner = File.expand_path(File.dirname(__FILE__) + '/../../bin/solver/linux-arm')
+				#Sfp::Planner::Config.set_max_memory(512)
+			elsif os == 'macos' or os == 'darwin'
+				planner = File.expand_path(File.dirname(__FILE__) + '/../../bin/solver/macos')
 			end
-			raise UnsupportedPlatformException, os + ' is not supported' if planner == nil
+
+			raise UnsupportedPlatformException, "#{os} is not supported" if planner.nil?
 			planner
 		end
 
@@ -314,6 +321,21 @@ module Sfp
 				when 'cg' then '--search "lazy_greedy(cg(cost_type=2))"'
 				when 'cea' then '--search "lazy_greedy(cea(cost_type=2))"'
 				when 'mad' then '--search "lazy_greedy(mad())"'
+				when 'lama2011' then ' \
+                --heuristic "hlm1,hff1=lm_ff_syn(lm_rhw(
+                    reasonable_orders=true,lm_cost_type=1,cost_type=1))" \
+                --heuristic "hlm2,hff2=lm_ff_syn(lm_rhw(
+                    reasonable_orders=true,lm_cost_type=2,cost_type=2))" \
+                --search "iterated([
+                    lazy_greedy([hff1,hlm1],preferred=[hff1,hlm1],
+                                cost_type=1,reopen_closed=false),
+                    lazy_greedy([hff2,hlm2],preferred=[hff2,hlm2],
+                                reopen_closed=false),
+                    lazy_wastar([hff2,hlm2],preferred=[hff2,hlm2],w=5),
+                    lazy_wastar([hff2,hlm2],preferred=[hff2,hlm2],w=3),
+                    lazy_wastar([hff2,hlm2],preferred=[hff2,hlm2],w=2),
+                    lazy_wastar([hff2,hlm2],preferred=[hff2,hlm2],w=1)],
+                    repeat_last=true,continue_on_fail=true)"'
 				else '--search "lazy_greedy(ff(cost_type=0))"'
 			end
 		end

data/sfp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 	s.name			= 'sfp'
-	s.version		= '0.1.1'
-	s.date			= '2013-04-20'
+	s.version		= '0.1.3'
+	s.date			= '2013-05-06'
 	s.summary		= 'SFP Parser and Planner'
 	s.description	= 'A Ruby gem that provides a Ruby API to SFP language parser and ' +
 			  'SFP planner. It also provides a planner sript to solve a planning problem ' +
@@ -13,13 +13,14 @@ Gem::Specification.new do |s|
 	s.files			= `git ls-files`.split("\n")
 	s.test_files	= `git ls-files -- test/*`.split("\n")
 
-	`git ls-files -- bin/*`.split("\n") { |f|
-		s.executables << f
-	}
+	s.files.delete_if { |f| f =~ /linux\-arm/ }
+
+	`git ls-files --exclude=bin/solver/linux-arm/* -- bin/*`.split("\n") { |f| s.executables << f }
 
 	s.require_paths = ['lib']
 
 	s.homepage		= 'https://github.com/herry13/sfp-ruby'
+	s.rubyforge_project = 'sfp'
 
 	s.add_dependency 'json', '~> 1.7.5'
 	s.add_dependency 'antlr3', '~> 1.8.12'

data/src/SfpLang.g

@@ -104,7 +104,7 @@ composite
 	;
 
 class_definition
-	:	'class' ID
+	:	('class'|'schema') ID
 		{
 			@now[$ID.text] = { '_self' => $ID.text,
 				'_context' => 'class',

data/src/build.sh

@@ -1,7 +1,14 @@
 #!/bin/sh
 
+BASEDIR="$(dirname "$0")"
+CURRENTDIR=`pwd`
+
+cd $BASEDIR
+
 antlr4ruby SfpLang.g
 
 rm -f SfpLang.tokens
 mv -f SfpLangLexer.rb ../lib/sfp
 mv -f SfpLangParser.rb ../lib/sfp
+
+cd $CURRENTDIR

data/test/{cloud-classes.sfp → cloud-schemas.sfp}

@@ -1,4 +1,4 @@
-class Machine {
+schema Machine {
 	running is false
 	address is ""
 
@@ -10,6 +10,7 @@ class Machine {
 			this.running is true
 		}
 	}
+
 	procedure stop {
 		conditions {
 			this.running is true
@@ -20,7 +21,7 @@ class Machine {
 	}
 }
 
-class VM extends Machine {
+schema VM extends Machine {
 	created is false
 
 	procedure start {
@@ -41,7 +42,7 @@ class VM extends Machine {
 	}
 }
 
-class Cloud {
+schema Cloud {
 	running is false
 
 	procedure create_vm(vm isref VM) {
@@ -64,7 +65,7 @@ class Cloud {
 	}
 }
 
-class Client {
+schema Client {
 	refer isref Service
 
 	procedure redirect (s isref Service) {
@@ -75,3 +76,5 @@ class Client {
 		}
 	}
 }
+
+

data/test/{v1.1.sfp → future/test1.sfp}

@@ -9,8 +9,8 @@ schema S {
 	}
 }
 
-a extends S
-b extends S
+a isa S
+b isa S
 
 constraint goal {
 	a.foo is false

data/test/{cloud1.sfp → nd-cloud1.sfp}

@@ -1,4 +1,4 @@
-include "service-classes.sfp"
+include "service-schemas.sfp"
 
 // generate all possible states with constraint solver
 initial state {

data/test/{cloud2.sfp → nd-cloud2.sfp}

@@ -1,4 +1,4 @@
-include "service-classes.sfp"
+include "service-schemas.sfp"
 
 // generate all possible states with constraint solver
 initial state {

data/test/{cloud3.sfp → nd-cloud3.sfp}

@@ -1,4 +1,4 @@
-include "service-classes.sfp"
+include "service-schemas.sfp"
 
 // generate all possible states with constraint solver
 initial state {

data/test/{service1.sfp → nd-service1.sfp}

@@ -1,5 +1,4 @@
-//include "cloud-classes.sfp"
-include "service-classes.sfp"
+include "service-schemas.sfp"
 
 initial state {
 	s1 isa Service {

data/test/{service3.sfp → nd-service2.sfp}

@@ -1,4 +1,4 @@
-include "service-classes.sfp"
+include "service-schemas.sfp"
 
 // generate all possible states with constraint solver
 initial state {

data/test/run.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+BASEDIR="$(dirname "$0")"
+CURRENTDIR=`pwd`
+
+# a function to check the execution status
+function test {
+	"$@" 1>/dev/null
+	status=$?
+	if [ $status -ne 0 ]; then
+		echo "$2 [Failed]"
+	else
+		echo "$2 [OK]"
+	fi
+	return $status
+}
+
+# go to test's base dir
+cd $BASEDIR
+
+##
+# Tests use deterministic problem
+##
+testcases[0]="test1.sfp"
+testcases[1]="test2.sfp"
+testcases[2]="test3.sfp"
+testcases[3]="test4.sfp"
+
+echo "Deterministic usecases..."
+for tc in "${testcases[@]}"
+do
+	test ../bin/sfp $tc
+done
+
+##
+# Tests use non-deterministic problems
+##
+testcases[0]="nd-service1.sfp"
+testcases[1]="nd-service2.sfp"
+testcases[2]="nd-cloud1.sfp"
+testcases[3]="nd-cloud2.sfp"
+#testcases[4]="nd-cloud3.sfp"
+
+echo "Non-Deterministic usecases..."
+for tc in "${testcases[@]}"
+do
+	test ../bin/sfp $tc
+done
+
+##
+# Back to previous directory
+##
+cd $CURRENTDIR