knjrbfw 0.0.8 → 0.0.9

data/lib/knj/threadpool.rb

@@ -1,19 +1,27 @@
 class Knj::Threadpool
-	attr_reader :workers, :blocks, :mutex, :args, :events
-	
-	def initialize(args = {})
-		@args = args
-		@args[:sleep] = 0.01 if !@args.key?(:sleep)
-		@workers = []
-		@blocks = []
-		@mutex = Mutex.new
-		@events = Knj::Event_handler.new
-		@events.add_event(:name => :on_error)
-		
-		self.start
-	end
-	
-	def start
+  def self.worker_data
+    raise "This thread is not running via the threadpool." if !Thread.current[:knj_threadpool]
+    return Thread.current[:knj_threadpool]
+  end
+  
+  attr_reader :workers, :blocks, :mutex, :args, :events
+  
+  def initialize(args = {})
+    @args = args
+    @args[:sleep] = 0.2 if !@args.key?(:sleep)
+    
+    raise "Invalid number of threads: '#{@args[:threads]}'." if !@args[:threads] or @args[:threads].to_i <= 0
+    
+    @workers = []
+    @blocks = []
+    @mutex = Mutex.new
+    @events = Knj::Event_handler.new
+    @events.add_event(:name => :on_error)
+    
+    self.start
+  end
+  
+  def start
     @mutex.synchronize do
       if !@running
         @workers.length.upto(@args[:threads]) do |count|
@@ -23,9 +31,9 @@ class Knj::Threadpool
         @running = true
       end
     end
-	end
-	
-	def stop
+  end
+  
+  def stop
     if @running
       @workers.each do |worker|
         if !worker.running
@@ -36,142 +44,184 @@ class Knj::Threadpool
       
       @running = false
     end
-	end
-	
-	def run(*args, &block)
-		raise "No block given." if !block_given?
-		blockdata = {:block => block, :result => nil, :running => false, :runned => false, :args => args}
-		@blocks << blockdata
-		
-		loop do
-			sleep @args[:sleep]
-			
-			if blockdata[:runned]
-				begin
-					res = blockdata[:result]
-					raise blockdata[:error] if blockdata.key?(:error)
-				ensure
-					@mutex.synchronize do
-						blockdata.clear
-						@blocks.delete(blockdata)
-					end
-				end
-				
-				return res
-			end
-		end
-	end
-	
-	def run_async(*args, &block)
-		raise "No block given." if !block_given?
-		
-		@mutex.synchronize do
-			blockdata = {:block => block, :running => false, :runned => false, :args => args}
-			@blocks << blockdata
-		end
-	end
-	
-	def get_block
+  end
+  
+  def run(*args, &block)
+    raise "No block given." if !block_given?
+    blockdata = {:block => block, :result => nil, :running => false, :runned => false, :args => args}
+    @blocks << blockdata
+    
+    loop do
+      sleep @args[:sleep]
+      
+      if blockdata[:runned]
+        begin
+          res = blockdata[:result]
+          raise blockdata[:error] if blockdata.key?(:error)
+        ensure
+          @mutex.synchronize do
+            blockdata.clear
+            @blocks.delete(blockdata)
+          end
+        end
+        
+        return res
+      end
+    end
+  end
+  
+  def run_async(*args, &block)
+    raise "No block given." if !block_given?
+    
+    @mutex.synchronize do
+      blockdata = {:block => block, :running => false, :runned => false, :args => args}
+      @blocks << blockdata
+      return blockdata
+    end
+  end
+  
+  def get_block
     return false if !@running
     
-		@mutex.synchronize do
-			@blocks.each do |blockdata|
-				if blockdata and !blockdata[:running] and !blockdata[:runned]
-					blockdata[:running] = true
-					return blockdata
-				end
-			end
-			
-			return false
-		end
-	end
+    @mutex.synchronize do
+      @blocks.each do |blockdata|
+        if blockdata and !blockdata[:running] and !blockdata[:runned]
+          blockdata[:running] = true
+          return blockdata
+        end
+      end
+      
+      return false
+    end
+  end
 end
 
 class Knj::Threadpool::Worker
   attr_reader :running
   
-	def initialize(args)
-		@args = args
-		@tp = @args[:threadpool]
-		@mutex_tp = @tp.mutex
-		@sleep = @tp.args[:sleep]
-		@running = false
-		
-		@thread = Knj::Thread.new do
-			loop do
-				if !@blockdata
-					sleep @sleep
-					@blockdata = @tp.get_block if !@blockdata
-				end
-				
-				next if !@blockdata
-				
-				res = nil
-				raise "No block in blockdata?" if !@blockdata[:block]
-				
-				if @blockdata.key?(:result)
-					begin
-            @running = true
-						res = @blockdata[:block].call(*@blockdata[:args])
-					rescue Exception => e
-						@mutex_tp.synchronize do
-							@blockdata[:error] = e
-						end
-					ensure
-            @running = false
-            
-						@mutex_tp.synchronize do
-							@blockdata[:result] = res
-							@blockdata[:runned] = true
-							@blockdata[:running] = false
-						end
-						
-						#Try to avoid slowdown of sleep by checking if there is a new block right away.
-						@blockdata = @tp.get_block
-					end
-				else
-					begin
-						@blockdata[:block].call(*@blockdata[:args])
-					rescue Exception => e
-						if @tp.events.connected?(:on_error)
-							@tp.events.call(:on_error, e)
-						else
-							puts e.inspect
-							puts e.backtrace
-						end
-					ensure
-						@mutex_tp.synchronize do
-							@blockdata.clear
-							@tp.blocks.delete(@blockdata)
-						end
-						
-						#Try to avoid slowdown of sleep by checking if there is a new block right away.
-						@blockdata = @tp.get_block
-					end
-				end
-			end
-		end
-	end
-	
-	def busy?
-		return true if @blockdata
-	end
-	
-	def id
-		return @args[:id]
-	end
-	
-	def kill
-    return false if !@mutex_tp
-    
+  def initialize(args)
+    @args = args
+    @tp = @args[:threadpool]
+    @mutex_tp = @tp.mutex
+    @sleep = @tp.args[:sleep]
+    @running = false
+    self.spawn_thread
+  end
+  
+  #Starts the workers thread.
+  def spawn_thread
+    @thread = Knj::Thread.new do
+      loop do
+        if !@blockdata
+          sleep @sleep
+          @blockdata = @tp.get_block if !@blockdata
+        end
+        
+        next if !@blockdata
+        
+        res = nil
+        raise "No block in blockdata?" if !@blockdata[:block]
+        @blockdata[:worker] = self
+        Thread.current[:knj_threadpool] = {
+          :worker => self,
+          :blockdata => @blockdata
+        }
+        
+        begin
+          if @blockdata.key?(:result)
+            begin
+              @running = true
+              res = @blockdata[:block].call(*@blockdata[:args])
+            rescue Exception => e
+              @mutex_tp.synchronize do
+                @blockdata[:error] = e
+              end
+            ensure
+              @running = false
+              
+              @mutex_tp.synchronize do
+                @blockdata[:result] = res
+                @blockdata[:runned] = true
+                @blockdata[:running] = false
+              end
+              
+              #Try to avoid slowdown of sleep by checking if there is a new block right away.
+              @blockdata = @tp.get_block
+            end
+          else
+            begin
+              @blockdata[:block].call(*@blockdata[:args])
+            rescue Exception => e
+              if @tp.events.connected?(:on_error)
+                @tp.events.call(:on_error, e)
+              else
+                STDOUT.print Knj::Errors.error_str(e)
+              end
+            ensure
+              @mutex_tp.synchronize do
+                @blockdata.clear if @blockdata
+                @tp.blocks.delete(@blockdata)
+              end
+              
+              #Try to avoid slowdown of sleep by checking if there is a new block right away.
+              @blockdata = @tp.get_block
+            end
+          end
+        ensure
+          Thread.current[:knj_threadpool] = nil
+        end
+      end
+    end
+  end
+  
+  #Returns true if the worker is currently working with a block.
+  def busy?
+    return true if @blockdata
+  end
+  
+  #Returns the ID of the worker.
+  def id
+    return @args[:id]
+  end
+  
+  #Kills the current thread and restarts the worker.
+  def restart
     @mutex_tp.synchronize do
       @thread.kill
-      @args = nil
-      @tp = nil
-      @mutex_tp = nil
-      @sleep = nil
+      
+      if @blockdata
+        @blockdata[:runned] = true
+        @blockdata[:running] = false
+        
+        begin
+          sleep 0.1
+          raise "The worker was stopped during execution of the block."
+        rescue Exception => e
+          @blockdata[:error] = e
+        end
+      end
+      
+      #Dont run the job again - remove it from the queue.
+      @tp.blocks.delete(@blockdata)
       @blockdata = nil
-      @thread = nil
+      @running = false
+      
+      #Spawn a new thread - we killed the previous.
+      self.spawn_thread
+    end
+  end
+  
+  #Sleeps the thread.
+  def stop
+    @mutex_tp.synchronize do
+      @thread.stop
+    end
+  end
+  
+  #Kills the thread.
+  def kill
+    @mutex_tp.synchronize do
+      @thread.kill
     end
-	end
+  end
 end

data/lib/knj/translations.rb

@@ -1,124 +1,133 @@
 class Knj::Translations
-	attr_accessor :args, :db, :ob, :cache
-	
-	def initialize(args)
-		@args = args
-		@cache = {}
-		
-		raise "No DB given." if !@args[:db]
-		@db = @args[:db]
-		
-		@ob = Knj::Objects.new(
-			:db => @args[:db],
-			:extra_args => [self],
-			:class_path => File.dirname(__FILE__),
-			:module => Knj::Translations,
-			:require => false,
-			:datarow => true
-		)
-	end
-	
-	def get(obj, key, args = {})
-		return "" if !obj
-		
-		if args[:locale]
-			locale = args[:locale]
-		else
-			locale = @args[:locale]
-		end
-		
-		classn = obj.class.name
-		objid = obj.id.to_s
-		
-		if @cache[classn] and @cache[classn][objid] and @cache[classn][objid][key] and @cache[classn][objid][key][locale]
-			return @cache[classn][objid][key][locale][:value]
-		end
-		
-		trans = @ob.list(:Translation, {
-			"object_class" => classn,
-			"object_id" => objid,
-			"key" => key,
-			"locale" => locale
-		})
-		return "" if trans.empty?
-		
-		trans.each do |tran|
-			if !@cache.key?(classn)
-				@cache[classn] = {
-					objid => {
-						key => {
-							locale => tran
-						}
-					}
-				}
-			elsif !@cache[classn][objid]
-				@cache[classn][objid] = {
-					key => {
-						locale => tran
-					}
-				}
-			elsif !@cache[classn][objid][key]
-				@cache[classn][objid][key] = {
-					locale => tran
-				}
-			elsif !@cache[classn][objid][key][locale]
-				@cache[classn][objid][key][locale] = tran
-			end
-		end
-		
-		return trans[0][:value]
-	end
-	
-	def set(obj, values, args = {})
-		if args[:locale]
-			locale = args[:locale]
-		else
-			locale = @args[:locale]
-		end
-		
-		values.each do |key, val|
-			trans = @ob.get_by(:Translation, {
-				"object_id" => obj.id,
-				"object_class" => obj.class.name,
-				"key" => key,
-				"locale" => locale
-			})
-			
-			if trans
-				trans.update(:value => val)
-			else
-				@ob.add(:Translation, {
-					:object => obj,
-					:key => key,
-					:locale => locale,
-					:value => val
-				})
-			end
-		end
-	end
-	
-	def delete(obj)
-		classn = obj.class.name
-		objid = obj.id.to_s
-		
-		trans = @ob.list(:Translation, {
-			"object_id" => obj.id,
-			"object_class" => obj.class.name
-		})
-		trans.each do |tran|
-			@ob.delete(tran)
-		end
-		
-		@cache[classn].delete(objid) if @cache.key?(classn) and @cache.key?(objid)
-	end
+  attr_accessor :args, :db, :ob, :cache
+  
+  def initialize(args)
+    @args = args
+    
+    raise "No DB given." if !@args[:db]
+    @db = @args[:db]
+    
+    @ob = Knj::Objects.new(
+      :db => @args[:db],
+      :extra_args => [self],
+      :class_path => File.dirname(__FILE__),
+      :module => Knj::Translations,
+      :require => false,
+      :datarow => true
+    )
+  end
+  
+  #Returns the translated value for an object by the given key.
+  def get(obj, key, args = {})
+    return "" if !obj
+    
+    if args[:locale]
+      locale = args[:locale].to_sym
+    else
+      locale = @args[:locale].to_sym
+    end
+    
+    #Force to symbol to save memory when caching.
+    key = key.to_sym
+    
+    #Set-get the cache-hash for the object.
+    if !obj.instance_variable_defined?("@knj_translations_cache")
+      obj.instance_variable_set("@knj_translations_cache", {})
+    end
+    
+    cache = obj.instance_variable_get("@knj_translations_cache")
+    
+    #Return from cache if set.
+    if cache.key?(key) and cache[key].key?(locale)
+      return cache[key][locale]
+    end
+    
+    trans = @ob.list(:Translation, {
+      "object_class" => obj.class.name,
+      "object_id" => obj.id,
+      "key" => key,
+      "locale" => locale
+    })
+    
+    if trans.empty?
+      print "Nothing found - returning empty string.\n" if @args[:debug] or args[:debug]
+      return ""
+    end
+    
+    trans.each do |tran|
+      if !cache[key]
+        cache[key] = {
+          locale => tran[:value]
+        }
+      elsif !cache[key][locale]
+        cache[key][locale] = tran[:value]
+      end
+    end
+    
+    return cache[key][locale]
+  end
+  
+  #Sets translations for an object by the given hash-keys and hash-values.
+  def set(obj, values, args = {})
+    #Reset cache to reflect the updates when read next time.
+    obj.instance_variable_set("@knj_translations_cache", {})
+    
+    if args[:locale]
+      locale = args[:locale]
+    else
+      locale = @args[:locale]
+    end
+    
+    values.each do |key, val|
+      trans = @ob.get_by(:Translation, {
+        "object_id" => obj.id,
+        "object_class" => obj.class.name,
+        "key" => key,
+        "locale" => locale
+      })
+      
+      if trans
+        trans.update(:value => val)
+      else
+        @ob.add(:Translation, {
+          :object => obj,
+          :key => key,
+          :locale => locale,
+          :value => val
+        })
+      end
+    end
+  end
+  
+  #Deletes all translations for a given object.
+  def delete(obj)
+    classn = obj.class.name
+    objid = obj.id.to_s
+    
+    if obj.instance_variable_defined?("@knj_translations_cache")
+      cache = obj.instance_variable_get("@knj_translations_cache")
+    end
+    
+    trans = @ob.list(:Translation, {
+      "object_id" => obj.id,
+      "object_class" => obj.class.name
+    })
+    trans.each do |tran|
+      #Delete the translation object.
+      @ob.delete(tran)
+      
+      #Delete the cache if defined on the object.
+      cache.delete(tran[:key].to_sym) if cache and cache.key?(tran[:key].to_sym)
+    end
+  end
 end
 
 class Knj::Translations::Translation < Knj::Datarow
-	def self.add(d)
-		if d.data[:object]
-			d.data[:object_class] = d.data[:object].class.name
-			d.data[:object_id] = d.data[:object].id
-			d.data.delete(:object)
-		end
-	end
+  def self.add(d)
+    if d.data[:object]
+      d.data[:object_class] = d.data[:object].class.name
+      d.data[:object_id] = d.data[:object].id
+      d.data.delete(:object)
+    end
+  end
 end