dango 0.4.1 → 0.4.2

data/lib/dango/server_framework.rb

@@ -166,6 +166,9 @@ class DangoServerFramework
         logger.warn("start drb server: uri=#{DRb.uri}")
       end
       
+      set_loop_setting(@loop_setting) if @loop_setting # ループ処理を定義
+      
+      
       @gserver = DangoGServer.new(self, @network_port, @server_host, @server_max_connections)
       @gserver.audit = true                 # Turn logging on.
       @gserver.debug = true                 # debug
@@ -473,7 +476,7 @@ EOF
   # 各種サーバー仕様の変数設定
   def set_server_variables() 
     # 変数の初期設定
-    @server_debug                      = @config['server']['debug'] || true
+    @thread_abort_on_exception         = @config['server']['thread_abort_on_exception'] || true
     
     @network_port                      = @config['network']['port'] || DefaultNetworkPort
     @network_host                      = @config['network']['host'] || DefaultNetworkHost
@@ -510,6 +513,8 @@ EOF
     @backdoor_run_drb_port     = @config['server']['backdoor_run_drb_port'] || 12345   # バックドア用のdrbサーバーのポート番号
     @backdoor_host             = @config['server']['backdoor_host'] || '127.0.0.1'     # バックドアのアクセス可能ホスト名
     
+    @loop_setting              = @config['server']['loop_setting']                     # メインループ用の定義
+    
     # ログレベルの設定
     log_level_hash = {
       "FATAL" => Logger::FATAL, 
@@ -528,7 +533,7 @@ EOF
     end
     
     # スレッド終了時に全体停止する
-    Thread.abort_on_exception = true if @server_debug
+    Thread.abort_on_exception = true if @thread_abort_on_exception
     
     # 統計用情報の初期化
     @start_time = Time.now # サーバー起動時間
@@ -840,9 +845,43 @@ EOF
   end
   
   # メインループ用の定義をするためのメソッド
+  def set_loop_setting(options={})
+    logger.debug "loop_setting options:#{options.inspect}"
+    options = options.deep_dup
+    
+    if options["method_name"] # メソッド名が無ければ処理しない
+      method_name = options["method_name"]
+      
+      options["frame_rate"] ||= 5
+      wait_sec = 1.0 / options["frame_rate"]
+      logger.warn "set_loop_setting wait_sec:#{wait_sec.inspect} method_name=#{method_name}"
+      
+      th = Thread.new do 
+        begin
+          loop do
+            before_time = Time.now
+            @mutex_proc_thread.synchronize do
+              begin
+                __send__(method_name)
+              rescue Exception
+                logger.error "set_loop_setting error:#{error_message($!, 'u')}"
+              end
+            end
+            
+            real_wait_sec = wait_sec - (Time.now - before_time)
+            
+            sleep real_wait_sec if real_wait_sec > 0
+          end
+        rescue Exception
+          logger.error "set_loop_setting error:#{error_message($!, 'u')}"
+        end
+      end # th.end
+    end
+  end
+  
+=begin
   def flameloop_thread(loop_method, options={})
     logger.warn "flameloop_thread options:#{options.inspect}"
-
     options = options.deep_dup
     options[:rate] ||= 10
     
@@ -861,9 +900,8 @@ EOF
         sleep wait_sec
       end
     end
-#    th.priority = 1
-    
   end
+=end
   
 end
 

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-17 00:00:00 +09:00
+date: 2008-09-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency