December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <rest-service> master : added BackgroundManager testsuite
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 6b22e6615011cdede656a45a96a9b4c271f7e1d5 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 09:44:03 2009 +0100 added BackgroundManager testsuite --- webservice/test/unit/background_manager_test.rb | 77 +++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/webservice/test/unit/background_manager_test.rb b/webservice/test/unit/background_manager_test.rb new file mode 100644 index 0000000..81f0b39 --- /dev/null +++ b/webservice/test/unit/background_manager_test.rb @@ -0,0 +1,77 @@ +require File.dirname(__FILE__) + '/../test_helper' + +class BackgroundManagerTest < ActiveSupport::TestCase + def setup + @bm = BackgroundManager.instance + end + + def test_instance_not_nil + assert_not_equal nil, @bm + end + + def test_background_manager + + # no background progress created yet + assert !@bm.process_running?(:dummy) + assert !@bm.process_finished?(:dummy) + assert_equal nil, @bm.get_progress(:dummy) + assert_equal nil, @bm.get_value(:dummy) + + @bm.update_progress(:dummy) + assert_equal nil, @bm.get_progress(:dummy) + + @bm.update_progress(:dummy) do |s| + s.progress = 10 + end + assert_equal nil, @bm.get_progress(:dummy) + + + # register a process + @bm.add_process(:test) + + assert @bm.process_running?(:test) + assert !@bm.process_finished?(:test) + assert_not_equal nil, @bm.get_progress(:test) + assert_equal 0, @bm.get_progress(:test).progress + assert_equal nil, @bm.get_value(:test) + + + # update progress + pr = 42 + sp = 10 + st = 'testing' + @bm.update_progress(:test) do |p| + p.status = st + p.progress = pr + p.subprogress = sp + end + + assert @bm.process_running?(:test) + assert !@bm.process_finished?(:test) + assert_not_equal nil, @bm.get_progress(:test) + assert_equal st, @bm.get_progress(:test).status + assert_equal pr, @bm.get_progress(:test).progress + assert_equal sp, @bm.get_progress(:test).subprogress + assert_equal nil, @bm.get_value(:test) + + + # finish the process, set a final value + final_value = 'final_value' + @bm.finish_process(:test, final_value) + assert !@bm.process_running?(:test) + assert @bm.process_finished?(:test) + assert_equal nil, @bm.get_progress(:test) + assert_equal final_value, @bm.get_value(:test) + + + # the result is removed after reading + assert_equal nil, @bm.get_value(:test) + assert !@bm.process_running?(:test) + assert !@bm.process_finished?(:test) + + # check the config call + assert_equal Rails.configuration.cache_classes, @bm.background_enabled? + end + + +end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : updated patches test case
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit b37f47302d500a9596de2e754410300d1645a5a0 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 13:32:57 2009 +0100 updated patches test case --- .../test/functional/patches_controller_test.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/patches/test/functional/patches_controller_test.rb b/plugins/patches/test/functional/patches_controller_test.rb index 1b450f5..0097804 100644 --- a/plugins/patches/test/functional/patches_controller_test.rb +++ b/plugins/patches/test/functional/patches_controller_test.rb @@ -30,7 +30,7 @@ class PatchesControllerTest < ActionController::TestCase :repo => "openSUSE-11.1-Updates") Patch.stubs(:mtime).returns(Time.now) - Patch.stubs(:find).with(:available).returns([@p1, @p2]) + Patch.stubs(:find).with(:available, {:background => nil}).returns([@p1, @p2]) Patch.stubs(:find).with('462').returns(@p1) Patch.stubs(:find).with('wrong_id').returns(nil) Patch.stubs(:find).with('not_found').returns(nil) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : patches and status - moved the shared background code
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 1df30176ea58ab96782ad9a185f3544f358e4768 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Tue Dec 15 20:13:59 2009 +0100 patches and status - moved the shared background code to BackgroundManager module (for thread safe acess and better readability) --- plugins/patches/app/models/patch.rb | 53 +++++++++------------- plugins/status/lib/status.rb | 78 ++++++++++++++------------------ webservice/lib/background_manager.rb | 80 ++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 76 deletions(-) diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index dd861de..a3608c6 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -3,14 +3,10 @@ require 'resolvable' # Model for patches available via package kit class Patch < Resolvable - # class variables - they keep the information between requests - # - # currently running patch requests in background (current states) - @@running = Hash.new - # finished requests (actual results) - @@done = Hash.new - # a mutex which guards access to the shared class variables above - @@mutex = Mutex.new + # extend adds the module methods as class methods + # (used instead of include because background processes + # are used in class methods here) + extend BackgroundManager def to_xml( options = {} ) super :patch_update, options @@ -35,7 +31,7 @@ class Patch < Resolvable return patch_updates end - def self.subprocess_find(what, bs) + def self.subprocess_find(what) # open subprocess subproc = IO.popen(subprocess_command) @@ -55,7 +51,8 @@ class Patch < Resolvable result = received['patches'] elsif received.has_key? 'background_status' s = received['background_status'] - @@mutex.synchronize do + + update_progress what do |bs| bs.status = s['status'] bs.progress = s['progress'] bs.subprogress = s['subprogress'] @@ -86,42 +83,34 @@ class Patch < Resolvable # background reading doesn't work correctly if class reloading is active # (static class members are lost between requests) - if background && !Rails.configuration.cache_classes + if background && !background_enabled? Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" background = false end if background - # background status - bs = nil - @@mutex.synchronize do - if @@done.has_key?(what) - Rails.logger.debug "Request #{what} is done" - return @@done.delete(what) - end - - running = @@running[what] - if running - Rails.logger.debug "Request #{what} is already running: #{running.inspect}" - return [running] - end + if process_finished? what + Rails.logger.debug "Request #{what} is done" + return get_value what + end - bs = BackgroundStatus.new - @@running[what] = bs + running = get_progress what + if running + Rails.logger.debug "Request #{what} is already running: #{running.inspect}" + return [running] end + add_process what + Rails.logger.info "Starting background thread for reading patches..." # run the patch query in a separate thread Thread.new do - res = subprocess_find(what, bs) + res = subprocess_find what Rails.logger.info "*** Patches thread: Found #{res.size} applicable patches" - @@mutex.synchronize do - @@running.delete(what) - @@done[what] = res - end + finish_process(what, res) end - return [bs] + return [ get_progress(what) ] else return do_find(what) end diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index c17bc77..cfbf3d9 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -31,12 +31,7 @@ class Status :metrics, :limits - # currently running status requests in background (current states) - @@running = Hash.new - # finished requests (actual results) - @@done = Hash.new - # a mutex which guards access to the shared class variables above - @@mutex = Mutex.new + include BackgroundManager def to_xml(options = {}) if @data.class == Hash && @data.size == 1 && @data[:progress].class == BackgroundStatus @@ -177,51 +172,48 @@ class Status def draw_graph(heigth=nil, width=nil) end + def create_unique_key(start, stop, data) + start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s + end + # this is a wrapper to collect_data def collect_data(start=nil, stop=nil, data = %w{cpu memory disk}, background = false) # background reading doesn't work correctly if class reloading is active # (static class members are lost between requests) - if background && !Rails.configuration.cache_classes + if background && !background_enabled? Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" background = false end if background - # background status - bs = nil - key = start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s - @@mutex.synchronize do - if @@done.has_key?(key) - Rails.logger.debug "Request #{key} is done" - @data = @@done.delete key - @data.delete :progress - return @data - end + key = create_unique_key(start, stop, data) - running = @@running[key] - if running - Rails.logger.debug "Request #{key} is already running: #{running.inspect}" - @data = {:progress => running} - return @data - end + if process_finished? key + Rails.logger.debug "Request #{key} is done" + @data = get_value key + @data.delete :progress + return @data + end - bs = BackgroundStatus.new - @@running[key] = bs + running = get_progress key + if running + Rails.logger.debug "Request #{key} is already running: #{running.inspect}" + @data = {:progress => running} + return @data end + + add_process(key) # read the status in a separate thread Thread.new do Rails.logger.info '*** Background thread for reading status started...' - res = collect_status_data(start, stop, data, bs) - @@mutex.synchronize do - @@running.delete(key) - @@done[key] = res - end + res = collect_status_data(start, stop, data, true) + finish_process(key, res) Rails.logger.info '*** Finishing background status thread' end # return current progress - @data = {:progress => bs} + @data = {:progress => get_progress(key)} return @data else collect_status_data(start, stop, data) @@ -229,8 +221,8 @@ class Status end # creates several metrics for a defined period - def collect_status_data(start=nil, stop=nil, data = %w{cpu memory disk}, progress=nil) - + def collect_status_data(start=nil, stop=nil, data = %w{cpu memory disk}, progress=false) + key = create_unique_key(start, stop, data) if progress metrics = available_metrics #puts metrics.inspect result = Hash.new @@ -238,16 +230,14 @@ class Status current_step = 0 if progress case data when nil, "all", "All" # all metrics - if progress - total_steps = metrics.size - end + total_steps = metrics.size if progress metrics.each_pair do |m, n| if progress - @@mutex.synchronize do - progress.status = m.to_s - progress.progress = 100 * current_step / total_steps - Rails.logger.debug "*** Reading status: #{progress.status}: #{progress.progress}%" + update_progress key do |stat| + stat.status = m.to_s + stat.progress = 100 * current_step / total_steps + Rails.logger.debug "*** Reading status: #{stat.status}: #{stat.progress}%" end end @@ -263,10 +253,10 @@ class Status total_steps = data.size if progress data.each do |d| if progress - @@mutex.synchronize do - progress.status = d.to_s - progress.progress = 100 * current_step / total_steps - Rails.logger.debug "*** Reading status: #{progress.status}: #{progress.progress}%" + update_progress key do |stat| + stat.status = d.to_s + stat.progress = 100 * current_step / total_steps + Rails.logger.debug "*** Reading status: #{stat.status}: #{stat.progress}%" end end diff --git a/webservice/lib/background_manager.rb b/webservice/lib/background_manager.rb new file mode 100644 index 0000000..722d078 --- /dev/null +++ b/webservice/lib/background_manager.rb @@ -0,0 +1,80 @@ + +# this is a helper module for managing background processes with progress +# for long running tasks + +module BackgroundManager + # class variables - they keep the information between requests + # DO NOT USE THEM DIRECTLY, USE THE THREAD SAFE METHODS BELOW! + # + # currently running requests in background (current states) + @@running = Hash.new + # finished requests (actual results) + @@done = Hash.new + # a mutex which guards access to the shared class variables above + @@mutex = Mutex.new + + # define a new background process + # id is unique ID + def add_process(id) + @@mutex.synchronize do + @@running[id] = BackgroundStatus.new unless @@running.has_key?(id) + end + end + + # is the process running? + def process_running?(id) + @@mutex.synchronize do + return @@running.has_key? id + end + end + + # is the process finished? + def process_finished?(id) + @@mutex.synchronize do + return @@done.has_key? id + end + end + + # remove the progress status and remember the real final value + def finish_process(id, value) + @@mutex.synchronize do + @@running.delete(id) + @@done[id] = value + end + end + + # get the current progress + # returns a copy, use update_progress() for updating the progress + def get_progress(id) + @@mutex.synchronize do + ret = @@running[id] + ret.nil? ? nil : ret.dup + end + end + + # get the final value, the value is removed from the internal structure + def get_value(id) + @@mutex.synchronize do + return @@done.delete id + end + end + + # update the progress + def update_progress(id, &block) + @@mutex.synchronize do + bs = @@running[id] + + yield bs if bs && block_given? + end + end + + # is background processing possible? + # if cache_classes is disabled it is not possible + # because all classes are reloaded between requests + # and the static attributes keeping the progress are lost + def background_enabled? + return Rails.configuration.cache_classes + end + +end + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : pass also the requested patch ID to the subscript
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit c771fbf393926da454e4d4781019d34fb32b4ccf Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Dec 16 18:56:58 2009 +0100 pass also the requested patch ID to the subscript --- plugins/patches/app/models/patch.rb | 15 +++++++++------ plugins/patches/scripts/list_patches.rb | 4 +++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index a3608c6..bee5300 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -32,12 +32,13 @@ class Patch < Resolvable end def self.subprocess_find(what) - # open subprocess - subproc = IO.popen(subprocess_command) + subproc = IO.popen(subprocess_command what) result = nil + process_id = what + while !subproc.eof? do begin line = subproc.readline @@ -52,7 +53,7 @@ class Patch < Resolvable elsif received.has_key? 'background_status' s = received['background_status'] - update_progress what do |bs| + update_progress process_id do |bs| bs.status = s['status'] bs.progress = s['progress'] bs.subprogress = s['subprogress'] @@ -155,8 +156,10 @@ class Patch < Resolvable script end - def self.subprocess_command - 'cd ' + RAILS_ROOT + ' && ' + File.join(RAILS_ROOT, 'script/runner') + ' -e ' + - (ENV["RAILS_ENV"] || 'development') + ' ' + subprocess_script + def self.subprocess_command(what) + raise "Invalid parameter" if what.to_s.include?("'") or what.to_s.include?('\\') + ret = "cd #{RAILS_ROOT} && #{File.join(RAILS_ROOT, 'script/runner')} -e #{ENV['RAILS_ENV'] || 'development'} #{subprocess_script}" + ret += " #{what}" if what != :available + ret end end diff --git a/plugins/patches/scripts/list_patches.rb b/plugins/patches/scripts/list_patches.rb index 06c0c74..25d0daf 100644 --- a/plugins/patches/scripts/list_patches.rb +++ b/plugins/patches/scripts/list_patches.rb @@ -12,6 +12,8 @@ bs = BackgroundStatus.new do $stdout.flush end -patches = Patch.do_find(:all, bs) +what = ARGV[0] || :available + +patches = Patch.do_find(what, bs) puts patches.to_xml(:root => "patches", :dasherize => false).gsub!("\n", '') -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : change BackgroundManager module to a singleton object
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 94553d8777b6fb544d7d822b3428e227b851e7f9 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Dec 16 19:57:58 2009 +0100 change BackgroundManager module to a singleton object --- plugins/patches/app/models/patch.rb | 41 ++++++++++++++--------- plugins/status/lib/status.rb | 29 ++++++++++------ webservice/lib/background_manager.rb | 58 ++++++++++++++++++---------------- 3 files changed, 74 insertions(+), 54 deletions(-) diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index bee5300..638ecc4 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -3,10 +3,19 @@ require 'resolvable' # Model for patches available via package kit class Patch < Resolvable - # extend adds the module methods as class methods - # (used instead of include because background processes - # are used in class methods here) - extend BackgroundManager + private + + # just a short cut for accessing the singleton object + def self.bm + BackgroundManager.instance + end + + # create unique id for the background manager + def self.id(what) + "patches_#{what}" + end + + public def to_xml( options = {} ) super :patch_update, options @@ -37,8 +46,6 @@ class Patch < Resolvable result = nil - process_id = what - while !subproc.eof? do begin line = subproc.readline @@ -53,7 +60,7 @@ class Patch < Resolvable elsif received.has_key? 'background_status' s = received['background_status'] - update_progress process_id do |bs| + bm.update_progress id(what) do |bs| bs.status = s['status'] bs.progress = s['progress'] bs.subprogress = s['subprogress'] @@ -84,34 +91,36 @@ class Patch < Resolvable # background reading doesn't work correctly if class reloading is active # (static class members are lost between requests) - if background && !background_enabled? + if background && !bm.background_enabled? Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" background = false end if background - if process_finished? what - Rails.logger.debug "Request #{what} is done" - return get_value what + proc_id = id(what) + if bm.process_finished? proc_id + Rails.logger.debug "Request #{proc_id} is done" + return bm.get_value proc_id end - running = get_progress what + running = bm.get_progress proc_id if running - Rails.logger.debug "Request #{what} is already running: #{running.inspect}" + Rails.logger.debug "Request #{proc_id} is already running: #{running.inspect}" return [running] end - add_process what + + bm.add_process proc_id Rails.logger.info "Starting background thread for reading patches..." # run the patch query in a separate thread Thread.new do res = subprocess_find what Rails.logger.info "*** Patches thread: Found #{res.size} applicable patches" - finish_process(what, res) + bm.finish_process(proc_id, res) end - return [ get_progress(what) ] + return [ bm.get_progress(proc_id) ] else return do_find(what) end diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index cfbf3d9..9ad67e0 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -31,7 +31,14 @@ class Status :metrics, :limits - include BackgroundManager + private + + # just a short cut for accessing the singleton object + def bm + BackgroundManager.instance + end + + public def to_xml(options = {}) if @data.class == Hash && @data.size == 1 && @data[:progress].class == BackgroundStatus @@ -173,14 +180,14 @@ class Status end def create_unique_key(start, stop, data) - start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s + 'status_' + start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s end # this is a wrapper to collect_data def collect_data(start=nil, stop=nil, data = %w{cpu memory disk}, background = false) # background reading doesn't work correctly if class reloading is active # (static class members are lost between requests) - if background && !background_enabled? + if background && !bm.background_enabled? Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" background = false end @@ -188,32 +195,32 @@ class Status if background key = create_unique_key(start, stop, data) - if process_finished? key + if bm.process_finished? key Rails.logger.debug "Request #{key} is done" - @data = get_value key + @data = bm.get_value key @data.delete :progress return @data end - running = get_progress key + running = bm.get_progress key if running Rails.logger.debug "Request #{key} is already running: #{running.inspect}" @data = {:progress => running} return @data end - add_process(key) + bm.add_process(key) # read the status in a separate thread Thread.new do Rails.logger.info '*** Background thread for reading status started...' res = collect_status_data(start, stop, data, true) - finish_process(key, res) + bm.finish_process(key, res) Rails.logger.info '*** Finishing background status thread' end # return current progress - @data = {:progress => get_progress(key)} + @data = {:progress => bm.get_progress(key)} return @data else collect_status_data(start, stop, data) @@ -234,7 +241,7 @@ class Status metrics.each_pair do |m, n| if progress - update_progress key do |stat| + bm.update_progress key do |stat| stat.status = m.to_s stat.progress = 100 * current_step / total_steps Rails.logger.debug "*** Reading status: #{stat.status}: #{stat.progress}%" @@ -253,7 +260,7 @@ class Status total_steps = data.size if progress data.each do |d| if progress - update_progress key do |stat| + bm.update_progress key do |stat| stat.status = d.to_s stat.progress = 100 * current_step / total_steps Rails.logger.debug "*** Reading status: #{stat.status}: #{stat.progress}%" diff --git a/webservice/lib/background_manager.rb b/webservice/lib/background_manager.rb index 722d078..fead92d 100644 --- a/webservice/lib/background_manager.rb +++ b/webservice/lib/background_manager.rb @@ -1,68 +1,72 @@ -# this is a helper module for managing background processes with progress +# this is a singleton class for managing background processes with progress # for long running tasks -module BackgroundManager - # class variables - they keep the information between requests - # DO NOT USE THEM DIRECTLY, USE THE THREAD SAFE METHODS BELOW! - # - # currently running requests in background (current states) - @@running = Hash.new - # finished requests (actual results) - @@done = Hash.new - # a mutex which guards access to the shared class variables above - @@mutex = Mutex.new +class BackgroundManager + + include Singleton + + # instance variables - they keep the information between requests + + def initialize + # currently running requests in background (current states) + @running = Hash.new + # finished requests (actual results) + @done = Hash.new + # a mutex which guards access to the shared class variables above + @mutex = Mutex.new + end # define a new background process # id is unique ID def add_process(id) - @@mutex.synchronize do - @@running[id] = BackgroundStatus.new unless @@running.has_key?(id) + @mutex.synchronize do + @running[id] = BackgroundStatus.new unless @running.has_key?(id) end end # is the process running? def process_running?(id) - @@mutex.synchronize do - return @@running.has_key? id + @mutex.synchronize do + return @running.has_key? id end end # is the process finished? def process_finished?(id) - @@mutex.synchronize do - return @@done.has_key? id + @mutex.synchronize do + return @done.has_key? id end end # remove the progress status and remember the real final value def finish_process(id, value) - @@mutex.synchronize do - @@running.delete(id) - @@done[id] = value + @mutex.synchronize do + @running.delete(id) + @done[id] = value end end # get the current progress # returns a copy, use update_progress() for updating the progress def get_progress(id) - @@mutex.synchronize do - ret = @@running[id] + @mutex.synchronize do + ret = @running[id] ret.nil? ? nil : ret.dup end end # get the final value, the value is removed from the internal structure def get_value(id) - @@mutex.synchronize do - return @@done.delete id + @mutex.synchronize do + return @done.delete id end end # update the progress def update_progress(id, &block) - @@mutex.synchronize do - bs = @@running[id] + @mutex.synchronize do + bs = @running[id] yield bs if bs && block_given? end @@ -71,7 +75,7 @@ module BackgroundManager # is background processing possible? # if cache_classes is disabled it is not possible # because all classes are reloaded between requests - # and the static attributes keeping the progress are lost + # and the attributes keeping the progress are lost def background_enabled? return Rails.configuration.cache_classes end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : use -1 instead of nil for unknown (sub)progress
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit c0e0af0b1708194514760c5b335d01477e49a3f5 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Dec 17 09:40:13 2009 +0100 use -1 instead of nil for unknown (sub)progress --- plugins/patches/app/models/resolvable.rb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/patches/app/models/resolvable.rb b/plugins/patches/app/models/resolvable.rb index e636c44..0e6c2aa 100644 --- a/plugins/patches/app/models/resolvable.rb +++ b/plugins/patches/app/models/resolvable.rb @@ -168,9 +168,9 @@ public proxy.on_signal("ProgressChanged") do |p1, p2, p3, p4| Rails.logger.debug "PackageKit progress: ProgressChanged: #{p1}%" - bg_stat.progress = p1 - # 101% means no subprogress available - bg_stat.subprogress = p2 < 101 ? p2 : nil + # 101% means no progress/subprogress available + bg_stat.progress = p1 < 101 ? p1 : -1 + bg_stat.subprogress = p2 < 101 ? p2 : -1 end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : BackgroundManager - fixed returning values from critical sections
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit deae942e9410fe45dacfe098dc6ed4687520033a Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Dec 16 20:09:42 2009 +0100 BackgroundManager - fixed returning values from critical sections BackgroundStatus - code clean up --- webservice/lib/background_manager.rb | 16 ++++++++++++---- webservice/lib/background_status.rb | 11 +++++------ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/webservice/lib/background_manager.rb b/webservice/lib/background_manager.rb index fead92d..2607e86 100644 --- a/webservice/lib/background_manager.rb +++ b/webservice/lib/background_manager.rb @@ -27,16 +27,20 @@ class BackgroundManager # is the process running? def process_running?(id) + ret = false @mutex.synchronize do - return @running.has_key? id + ret = @running.has_key? id end + ret end # is the process finished? def process_finished?(id) + ret = false @mutex.synchronize do - return @done.has_key? id + ret = @done.has_key? id end + ret end # remove the progress status and remember the real final value @@ -50,17 +54,21 @@ class BackgroundManager # get the current progress # returns a copy, use update_progress() for updating the progress def get_progress(id) + ret = nil @mutex.synchronize do ret = @running[id] - ret.nil? ? nil : ret.dup + ret = ret.dup unless ret.nil? end + ret end # get the final value, the value is removed from the internal structure def get_value(id) + ret = nil @mutex.synchronize do - return @done.delete id + ret = @done.delete id end + ret end # update the progress diff --git a/webservice/lib/background_status.rb b/webservice/lib/background_status.rb index 03ea420..7c666cb 100644 --- a/webservice/lib/background_status.rb +++ b/webservice/lib/background_status.rb @@ -13,9 +13,9 @@ class BackgroundStatus @callback = block_given? ? block : nil end - def status=(status) - if @status != status - @status = status + def status=(stat) + if @status != stat + @status = stat trigger_callback end end @@ -27,6 +27,7 @@ class BackgroundStatus end end + # returns -1 if there is no subprogress def subprogress=(s) if @subprogress != s @subprogress = s @@ -48,9 +49,7 @@ class BackgroundStatus private def trigger_callback - if @callback - @callback.call - end + @callback.try(:call) end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : BackgroundStatus - use Observable design pattern
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 2ed77e11f495104af511080332159bcca979e7e6 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Dec 17 09:41:12 2009 +0100 BackgroundStatus - use Observable design pattern for reporting changes in progress --- plugins/patches/scripts/list_patches.rb | 25 ++++++++++++++++++++----- webservice/lib/background_status.rb | 21 ++++++++++----------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/plugins/patches/scripts/list_patches.rb b/plugins/patches/scripts/list_patches.rb index 25d0daf..e1d692c 100644 --- a/plugins/patches/scripts/list_patches.rb +++ b/plugins/patches/scripts/list_patches.rb @@ -4,14 +4,29 @@ # ruby-dbus is NOT thread safe and therefore patches cannot be safely read # in a separate thread, workaround is to use a separate process (this script) -bs = BackgroundStatus.new do - # print the progress in XML format - puts bs.to_xml +# this an observer class which prints changes in the progress +# in XML format on stdout +class ProgressPrinter + def initialize(prog) + # watch changes in a progress status object + prog.add_observer(self) + end - # print it immediately, flush the output buffer - $stdout.flush + # this is the callback method + def update(progress) + # print the progress in XML format + puts progress.to_xml + + # print it immediately, flush the output buffer + $stdout.flush + end end +bs = BackgroundStatus.new + +# register a progress printer for the progress object +ProgressPrinter.new(bs) + what = ARGV[0] || :available patches = Patch.do_find(what, bs) diff --git a/webservice/lib/background_status.rb b/webservice/lib/background_status.rb index 7c666cb..12afbc6 100644 --- a/webservice/lib/background_status.rb +++ b/webservice/lib/background_status.rb @@ -2,36 +2,41 @@ class BackgroundStatus + # use Observable design pattern for reporting changes + include Observable + attr_reader :status, :progress, :subprogress - def initialize(stat = 'unknown', progress = 0, subprogress = -1, &block) + def initialize(stat = 'unknown', progress = 0, subprogress = -1) @status = stat @progress = progress @subprogress = subprogress - @callback = block_given? ? block : nil end def status=(stat) if @status != stat + changed @status = stat - trigger_callback + notify_observers self end end def progress=(p) if @progress != p + changed @progress = p - trigger_callback + notify_observers self end end # returns -1 if there is no subprogress def subprogress=(s) if @subprogress != s + changed @subprogress = s - trigger_callback + notify_observers self end end @@ -46,10 +51,4 @@ class BackgroundStatus end end - private - - def trigger_callback - @callback.try(:call) - end - end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : code cleanup
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 2106dd376f220e1143c2dd2024433de1d18f4be5 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Dec 17 08:51:37 2009 +0100 code cleanup --- plugins/status/lib/status.rb | 2 +- webservice/lib/background_manager.rb | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index 9ad67e0..544656c 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -180,7 +180,7 @@ class Status end def create_unique_key(start, stop, data) - 'status_' + start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s + "status_#{start}_#{stop}_#{data}" end # this is a wrapper to collect_data diff --git a/webservice/lib/background_manager.rb b/webservice/lib/background_manager.rb index 2607e86..bc22281 100644 --- a/webservice/lib/background_manager.rb +++ b/webservice/lib/background_manager.rb @@ -27,20 +27,16 @@ class BackgroundManager # is the process running? def process_running?(id) - ret = false @mutex.synchronize do - ret = @running.has_key? id + @running.has_key? id end - ret end # is the process finished? def process_finished?(id) - ret = false @mutex.synchronize do - ret = @done.has_key? id + @done.has_key? id end - ret end # remove the progress status and remember the real final value @@ -54,21 +50,18 @@ class BackgroundManager # get the current progress # returns a copy, use update_progress() for updating the progress def get_progress(id) - ret = nil @mutex.synchronize do ret = @running[id] ret = ret.dup unless ret.nil? + ret end - ret end # get the final value, the value is removed from the internal structure def get_value(id) - ret = nil @mutex.synchronize do - ret = @done.delete id + @done.delete id end - ret end # update the progress -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : subprogress: use -1 instead of nil as the default value
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit e2f8459caadcbc072ce3c611579f9711f5a9b027 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Dec 16 15:21:35 2009 +0100 subprogress: use -1 instead of nil as the default value nil.to_i => 0, after deserialization from XML it was not possible to distinguish between 0% and no subprogress --- webservice/lib/background_status.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/webservice/lib/background_status.rb b/webservice/lib/background_status.rb index b7f7127..03ea420 100644 --- a/webservice/lib/background_status.rb +++ b/webservice/lib/background_status.rb @@ -6,7 +6,7 @@ class BackgroundStatus :progress, :subprogress - def initialize(stat = 'unknown', progress = 0, subprogress = nil, &block) + def initialize(stat = 'unknown', progress = 0, subprogress = -1, &block) @status = stat @progress = progress @subprogress = subprogress -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0