dango 0.0.31 → 0.0.32

data/lib/dango/client_framework.rb

@@ -11,6 +11,7 @@ class DangoClientFramework
   include DangoFrameworkModule
   
   SendReceiveSleepIntervalSec = 0.1 # データ送信後の順の際のタイムアウトチェック間隔秒
+  HeartBeatSendIntervalSec = 5.0    # ハートビート送信の間隔秒
   
   # send_action_return_notice用の共有メモリ
   def send_return_shared_init
@@ -151,10 +152,10 @@ class DangoClientFramework
     th = Thread.start do
       loop do
         begin
-          sleep 10
+          sleep HeartBeatSendIntervalSec
           
           if @sock && ! @sock.closed?
-            logger.debug "dango_heart_beat_thread_init:send heart beat #{Time.now_to_s}"
+            logger.debug "dango_heart_beat_thread_init:send _notice_heart_beat:#{Time.now_to_s}"
             
             send_action("_notice_heart_beat", {})
           end
@@ -202,7 +203,7 @@ class DangoClientFramework
       @sock = nil
       
       @is_session_closed = true
-      logger.info "calling dango_session_closed()"
+      logger.info "calling dango_session_closed():#{Time.now_to_s}"
       dango_session_closed() # セッションが切れると呼ばれる処理
       
       @is_close = true

data/lib/dango/framework_base.rb

@@ -141,9 +141,9 @@ module DangoFrameworkModule
     rescue EOFError, IOError, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ECONNABORTED
       # 接続終了時の切断と思われるものはDangoFrameworkConnectionErrorにしない
       #raise(DangoFrameworkError, "failed to read sock for EOF reached.\n#{error_message($!, 'u')}")
-      raise(DangoFrameworkError, "failed to read sock for EOF reached (and so on). #{$!.class} toid=#{Thread.current.object_id}")
+      raise(DangoFrameworkError, "failed to read sock for EOF reached (and so on). sock=#{sock.inspect} #{$!.class} toid=#{Thread.current.object_id}")
     rescue
-      raise(DangoFrameworkConnectionError, "failed to read sock. toid=#{Thread.current.object_id}\n#{error_message($!, 'u')}")
+      raise(DangoFrameworkConnectionError, "failed to read sock. sock=#{sock.inspect} toid=#{Thread.current.object_id}\n#{error_message($!, 'u')}")
     end
     
     if size_str == ""

data/lib/dango/server_framework.rb

@@ -25,9 +25,9 @@ class DangoServerFramework
   SendReceiveSleepIntervalSec = 0.2   # データ送信時のタイムアウトチェック間隔秒
   SendReceiveTimeoutDefaultSec = 5.0  # データ送受信時のデフォルトタイムアウト秒数
   SendTimeoutSec = 4.0                # データ送受信時の送信のタイムアウト秒数
-  HeartBeatIntervalSec = 10.0         # S=>Cのheart beatの送信間隔秒数
+  HeartBeatIntervalSec = 10.0         # heart beatのチェック間隔秒数
   HeartBeatResponseWaitSec = 10.0     # S=>Cのheart beatの返信待ち秒数
-  HeartBeatReceiveWaitSec = 20.0      # C=>Sのheart beatの受信待ち秒数
+  HeartBeatReceiveWaitSec = 30.0      # C=>Sのheart beatの受信待ち秒数
   GCIntervalSec = 5.0                 # GCの発生タイミング
   
   
@@ -275,7 +275,7 @@ class DangoServerFramework
               ServerMonitorAction.new(self, @config, sock, ret_obj)
               
             else # メンテナンスコマンド以外のユーザーアクション名なら
-              logger.debug "action_name=#{action_name} #{sid} #{Time.now_to_s}"
+              logger.debug "receive_action:#{sid}:#{action_name}:#{Time.now_to_s}"
               begin
                 __send__("dango_receive_#{action_name}", ret_obj)
               rescue NoMethodError
@@ -550,11 +550,12 @@ class DangoServerFramework
         begin
           sleep @gc_interval_sec
           
+          logger.debug "GC start #{Time.now_to_s}"
           gc_start_time = Time.now
           GC.enable
           GC.start 
           GC.disable
-          logger.debug "GC #{Time.now - gc_start_time}sec #{Time.now_to_s}"
+          logger.debug "GC end #{Time.now - gc_start_time}sec #{Time.now_to_s}"
           
         rescue
           logger.error "Exception gc_thread_start #{Time.now_to_s} #{error_message($!, 'u')}"
@@ -587,7 +588,7 @@ class DangoServerFramework
               
               # クライアントから来たハートビートの時間チェック
               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?}"
+                logger.debug "!!!! heart_beat_thread_start:heart beat old:#{sid}:#{heart_beat_time_hash[sid]}:#{Time.now_to_s}:#{sock}:#{sock.closed?}"
                 sock.close if !sock.closed?
               end
             end
@@ -603,7 +604,7 @@ class DangoServerFramework
   
   # クライアントから来たheart_beatなら
   def dango_receive__notice_heart_beat(ret_obj)
-    logger.debug "dango_receive__notice_heart_beat:#{session[:sid]} #{Time.now_to_s}" 
+    logger.debug "dango_receive__notice_heart_beat:#{session[:sid]}:#{ret_obj['_hb_id']} #{Time.now_to_s}" 
     
     shared.transaction(:heart_beat_time_hash) do |heart_beat_time_hash|
       heart_beat_time_hash[session[:sid]] = Time.now
@@ -757,7 +758,7 @@ class DangoServerFramework
         sleep wait_sec
       end
     end
-    th.priority = 1
+#    th.priority = 1
     
   end
   

data/lib/dango/tester/dango_tester_client.rb

@@ -9,13 +9,19 @@ require 'thread'
 
 # テスタークラス
 class DangoTesterClient
-  ConnectionRetryTimes       = 10  # 接続リトライ回数
-  ConnectionRetryIntervalSec = 3   # 接続リトライ時の間隔病数
+  ConnectionRetryTimes       = 10     # 接続リトライ回数
+  ConnectionRetryIntervalSec = 3      # 接続リトライ時の間隔病数
+  GCIntervalSec = 5.0                 # GCの発生タイミング
 
   # テスターのイニシャライズ
   def initialize
     @client_conns = {}
     Thread.abort_on_exception = true
+    
+    # GC発生タイミングを決定
+    @gc_interval_sec = GCIntervalSec
+    gc_thread_start()                     # GCスレッドの開始
+    
   end
   
   # クライアントを１個接続
@@ -65,6 +71,28 @@ class DangoTesterClient
   def self.die(str)
     die(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
+          puts "GC #{Time.now - gc_start_time}sec #{Time.now_to_s}"
+          
+        rescue
+          puts "Exception gc_thread_start #{Time.now_to_s} #{error_message($!, 'u')}"
+        end
+      end
+    end
+    th.priority = -1
+  end
+  
 end
 
 # テスト接続用のクラス

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 31
+    TINY  = 32
 
     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.31
-date: 2007-11-10 00:00:00 +09:00
+  version: 0.0.32
+date: 2007-11-12 00:00:00 +09:00
 summary: Realtime communications network framework for Ruby and Flash on Rails.
 require_paths: 
 - lib