dango 0.0.30 → 0.0.31

data/lib/dango/client_framework.rb

@@ -80,9 +80,12 @@ class DangoClientFramework
     
     @sock.binmode
     @sock.sync = true
-    @tmutex = Mutex.new # sockの排他処理用
     logger.debug("addr:#{@sock.addr.inspect}")
     
+    @tmutex = Mutex.new # sockの排他処理用
+    
+    dango_heart_beat_thread_init() # ハートビート送信スレッドの起動
+    
     @sid = nil # 接続して決まるsidを保持
     
     # データ受信用のスレッドの開始
@@ -143,6 +146,27 @@ class DangoClientFramework
   end
   private :thread_main
   
+  # ハートビート送信スレッドの起動
+  def dango_heart_beat_thread_init
+    th = Thread.start do
+      loop do
+        begin
+          sleep 10
+          
+          if @sock && ! @sock.closed?
+            logger.debug "dango_heart_beat_thread_init:send heart beat #{Time.now_to_s}"
+            
+            send_action("_notice_heart_beat", {})
+          end
+          
+        rescue
+          logger.error "Exception dango_heart_beat_thread_init #{Time.now_to_s} #{error_message($!, 'u')}"
+        end
+      end
+    end
+    th.priority = 1
+  end
+  
   # 接続直後のsid通知なら
   def dango_receive__notice_sid(rec_obj)
     @sid = rec_obj["_sid"]

data/lib/dango/server_framework.rb

@@ -23,10 +23,11 @@ class DangoServerFramework
   
   # ここから先は普通は変更しなくていいだろうというもの
   SendReceiveSleepIntervalSec = 0.2   # データ送信時のタイムアウトチェック間隔秒
-  SendReceiveTimeoutDefaultSec = 2.0  # データ送受信時のデフォルトタイムアウト秒数
-  SendTimeoutSec = 10.0               # データ送受信時の送信のタイムアウト秒数
-  HeartBeatIntervalSec = 60.0         # S=>Cのheart beatの送信間隔秒数
-  HeartBeatResponseWaitSec = 20.0     # S=>Cのheart beatの返信待ち秒数
+  SendReceiveTimeoutDefaultSec = 5.0  # データ送受信時のデフォルトタイムアウト秒数
+  SendTimeoutSec = 4.0                # データ送受信時の送信のタイムアウト秒数
+  HeartBeatIntervalSec = 10.0         # S=>Cのheart beatの送信間隔秒数
+  HeartBeatResponseWaitSec = 10.0     # S=>Cのheart beatの返信待ち秒数
+  HeartBeatReceiveWaitSec = 20.0      # C=>Sのheart beatの受信待ち秒数
   GCIntervalSec = 5.0                 # GCの発生タイミング
   
   
@@ -267,7 +268,7 @@ class DangoServerFramework
           @mutex_proc_thread.synchronize do
             
             if action_name == '_response' # 送信パケットの返事なら
-#              logger.debug "action_name=#{action_name} #{Time.now_to_s}"
+#              logger.debug "action_name=#{action_name} #{ret_obj['_id']} #{Time.now_to_s}"
               action_name_is_response(ret_obj)
               
             elsif action_name[0, 9] == '_monitor_' # メンテナンスアクション名なら
@@ -334,7 +335,7 @@ class DangoServerFramework
   
   # action_nameが送信パケットの返事なら
   def action_name_is_response(ret_obj)
-#    logger.warn "action_name_is_response:#{ret_obj['_id']} #{session[:sid]} #{Time.now_to_s}" 
+    logger.debug "action_name_is_response: #{ret_obj['_id']} #{session[:sid]} #{Time.now_to_s}" 
     @mutex_send_response.synchronize do
       @arr_send_response.push({:_id => ret_obj["_id"], :time => Time.now})
     end
@@ -357,6 +358,7 @@ class DangoServerFramework
     @send_timeout_sec                  = @config['server']['send_timeout_sec'] || SendTimeoutSec
     @herat_beat_interval_sec           = @config['server']['heart_beat_interval_sec'] || HeartBeatIntervalSec
     @heart_beat_response_wait_sec      = @config['server']['heart_beat_response_wait_sec'] || HeartBeatResponseWaitSec
+    @heart_beat_receive_wait_sec       = @config['server']['heart_beat_receive_wait_sec'] || HeartBeatReceiveWaitSec
     @gc_interval_sec                   = @config['server']['gc_interval_sec'] || GCIntervalSec
     
     
@@ -541,9 +543,32 @@ class DangoServerFramework
     dango_server_receive_decrypt(str)
   end
   
+  # GCスレッドの開始
+  def gc_thread_start
+    th = Thread.start do
+      loop do
+        begin
+          sleep @gc_interval_sec
+          
+          gc_start_time = Time.now
+          GC.enable
+          GC.start 
+          GC.disable
+          logger.debug "GC #{Time.now - gc_start_time}sec #{Time.now_to_s}"
+          
+        rescue
+          logger.error "Exception gc_thread_start #{Time.now_to_s} #{error_message($!, 'u')}"
+        end
+      end
+    end
+    th.priority = -1
+  end
+  
   # ハートビートスレッドの開始
   def heart_beat_thread_start
-    Thread.start do
+    shared[:heart_beat_time_hash] = {}
+    
+    th = Thread.start do
       loop do
         begin
           sleep @herat_beat_interval_sec
@@ -551,13 +576,20 @@ class DangoServerFramework
           if ! @gserver.stopped? # gserverが起動していれば
             logger.debug "heart_beat_thread_start #{Time.now_to_s}"
             
+            # クライアントから来るハートビートのチェック
+            heart_beat_time_hash = shared[:heart_beat_time_hash]
+            
             # 全員へheart_beatパケットを送信
             socket_list.keys.each do |sid|
-#              sock = socket_list[sid]
+              sock = socket_list[sid]
 #              logger.debug "heart_beat_thread_start:sid=#{sid} #{sock} #{sock.closed?}"
-#              dango_send_data(sock, {})
-#              logger.debug "heart_beat_thread_start:sid=#{sid}"
-              send_notice(sid, "_heart_beat", {}, {:timeout=>@heart_beat_response_wait_sec})
+#              send_notice(sid, "_heart_beat", {}, {:timeout=>@heart_beat_response_wait_sec})
+              
+              # クライアントから来たハートビートの時間チェック
+              if heart_beat_time_hash[sid] && heart_beat_time_hash[sid] < Time.now - @heart_beat_receive_wait_sec
+                logger.debug "heart_beat_thread_start:heart beat old #{heart_beat_time_hash[sid]} #{sock} #{sock.closed?}"
+                sock.close if !sock.closed?
+              end
             end
           end
           
@@ -566,25 +598,16 @@ class DangoServerFramework
         end
       end
     end
+    th.priority = 1
   end
   
-  # GCスレッドの開始
-  def gc_thread_start
-    Thread.start do
-      loop do
-        begin
-          sleep @gc_interval_sec
-          
-          gc_start_time = Time.now
-          GC.enable
-          GC.start 
-          GC.disable
-          logger.debug "GC #{Time.now - gc_start_time}sec #{Time.now_to_s}"
-          
-        rescue
-          logger.error "Exception gc_thread_start #{Time.now_to_s} #{error_message($!, 'u')}"
-        end
-      end
+  # クライアントから来たheart_beatなら
+  def dango_receive__notice_heart_beat(ret_obj)
+    logger.debug "dango_receive__notice_heart_beat:#{session[:sid]} #{Time.now_to_s}" 
+    
+    shared.transaction(:heart_beat_time_hash) do |heart_beat_time_hash|
+      heart_beat_time_hash[session[:sid]] = Time.now
+      heart_beat_time_hash
     end
   end
   
@@ -600,7 +623,7 @@ class DangoServerFramework
     
     sock = socket_list[sid]
     if !sock || sock.closed? # sockがないという事はすでに切断済み
-      logger.info "send_notice:already closed socket. sid=#{sid.inspect} sock=#{sock.inspect} #{Time.now_to_s}"
+      logger.info "send_notice:already closed socket. sid=#{sid.inspect} sock=#{sock.inspect} #{sock ? sock.closed? : nil} #{Time.now_to_s}"
       return(self)
     end
     
@@ -652,15 +675,7 @@ class DangoServerFramework
               # タイムアウトチェック
               catch(:send_timeout) do
                 (timeout.to_f / @send_receive_sleep_interval_sec).to_i.times do
-                  if Time.now > end_reserved_time
-                    logger.debug "send_notice:receive timeout:#{notice_name}" 
-                    
-                    if notice_name.to_s == "_heart_beat" # heart beatだったらsockを止める
-                      logger.info "!!!! send_notice:heart_beat timeout" 
-                      sock.close if !sock.closed?
-                    end
-                    break
-                  end
+                  sleep @send_receive_sleep_interval_sec # スリープ
                   
                   @mutex_send_response.synchronize do # データ送信の返信が来たかどうかの確認
                     find_res = @arr_send_response.find{|r| r[:_id] == send_obj_dup["_id"]}
@@ -674,7 +689,16 @@ class DangoServerFramework
                     end
                   end
                   
-                  sleep @send_receive_sleep_interval_sec # スリープ
+                  if Time.now > end_reserved_time
+                    logger.debug "send_notice:receive timeout:#{notice_name} #{sid} #{Time.now_to_s} #{end_reserved_time}" 
+                    
+                    if notice_name.to_s == "_heart_beat" # heart beatだったらsockを止める
+                      logger.info "!!!! send_notice:heart_beat timeout" 
+                      sock.close if !sock.closed?
+                    end
+                    break
+                  end
+                  
                 end # タイムアウト処理終わり
               end # catch 終わり
               
@@ -721,7 +745,7 @@ class DangoServerFramework
     wait_sec = 1.0 / options[:rate]
     logger.debug "flameloop_thread wait_sec:#{wait_sec.inspect}"
     
-    Thread.new do 
+    th = Thread.new do 
       loop do
         @mutex_proc_thread.synchronize do
           begin
@@ -733,6 +757,7 @@ class DangoServerFramework
         sleep wait_sec
       end
     end
+    th.priority = 1
     
   end
   

data/lib/dango/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.0.30
-date: 2007-11-09 00:00:00 +09:00
+  version: 0.0.31
+date: 2007-11-10 00:00:00 +09:00
 summary: Realtime communications network framework for Ruby and Flash on Rails.
 require_paths: 
 - lib