dango 0.0.38 → 0.0.39

data/lib/dango/server_framework.rb

@@ -67,9 +67,17 @@ class DangoServerFramework
     end
   end
   
-  def exit_process() # プロセス終了処理
-    # サーバーを停止
+  def stop_gserver() # gserverの停止
     if @gserver && !@gserver.stopped?
+      # 強制的に接続しているsocketをクローズ
+      logger.info "socket_list.keys:#{socket_list.keys.inspect}"
+      socket_list.keys.each do |sk|
+        logger.debug "sk:#{socket_list[sk].inspect}"
+        socket_list[sk].close if ! socket_list[sk].closed?
+        socket_list[sk]
+      end
+      
+      # サーバーを停止
       @gserver.shutdown
       @gserver.stop
 #      while(!@gserver.stopped?) do
@@ -83,6 +91,9 @@ class DangoServerFramework
       end
     end
     
+  end
+  
+  def exit_process() # プロセス終了処理
     debug_print("shutdown")
     puts "shutdown"
     exit!
@@ -96,14 +107,21 @@ class DangoServerFramework
     
     # SIGINT の捕捉
     Signal.trap(:INT) do 
+      stop_gserver() # gserverの停止
       exit_process() # プロセス終了処理
     end
     
     # 終了処理を登録しておく(これが無いとWindowsではエラーが出てもプロセスが落ちないことがある)
     at_exit do
+      stop_gserver() # gserverの停止
       exit_process() # プロセス終了処理
     end
     
+    # スレッドグループの初期化
+    @thr_gr_gserver_serve = ThreadGroup.new
+    @thr_gr_send_notice = ThreadGroup.new
+    @thr_gr_send_data = ThreadGroup.new
+    
     # サーバー開始
     server_start()
     
@@ -176,22 +194,7 @@ class DangoServerFramework
         @server_reload = nil
         
         debug_print("-- stopping server")
-        
-        # 強制的に接続しているsocketをクローズ
-        logger.info "socket_list.keys:#{socket_list.keys.inspect}"
-        socket_list.keys.each do |sk|
-          logger.debug "sk:#{socket_list[sk].inspect}"
-          socket_list[sk].close if ! socket_list[sk].closed?
-          socket_list[sk]
-        end
-        
-        # サーバーを停止
-        @gserver.shutdown
-        @gserver.stop
-        while(!@gserver.stopped?) do
-          sleep ServerStopWait
-          debug_print("waiting... #{@gserver.stopped?} #{@gserver.connections}")
-        end
+        stop_gserver() # gserverの停止
         
         @gserver = nil
         
@@ -263,6 +266,8 @@ class DangoServerFramework
   def thread_main(sock)
     logger.info "#{sock} is accepted. thread.current=#{Thread.current.object_id} "
     
+    @thr_gr_gserver_serve.add(Thread.current) # スレッドグループに登録
+    
     begin
       sock.binmode
       sock.sync = true
@@ -442,7 +447,7 @@ class DangoServerFramework
       @log_level_str = str if const == @log_level
     end
     
-    
+    # 統計用情報の初期化
     @start_time = Time.now # サーバー起動時間
     @recv_count = 0        # 受信回数
     @send_count = 0        # 送信回数
@@ -559,13 +564,13 @@ class DangoServerFramework
   # セッション
   def session_init # セッション情報の初期化
     @session_list = {}
-    @session_th_list = {}
+#    @session_th_list = {}
   end
   def session
     if !Thread.current[:session]
       Thread.current[:session] = {}
       @session_list[Thread.current.object_id] = Thread.current[:session]
-      @session_th_list[Thread.current.object_id] = Thread.current
+#      @session_th_list[Thread.current.object_id] = Thread.current
     end
     Thread.current[:session]
 #    sid = Thread.current.object_id
@@ -574,11 +579,11 @@ class DangoServerFramework
   end
   def session_del # セッション情報の初期化
     @session_list.delete(Thread.current.object_id)
-    @session_th_list.delete(Thread.current)
+#    @session_th_list.delete(Thread.current)
   end
   
   attr_reader(:session_list)
-  attr_reader(:session_th_list)
+#  attr_reader(:session_th_list)
   
   # ソケットとIDの対応
   def socket_list_init
@@ -646,6 +651,7 @@ class DangoServerFramework
     shared[:_heart_beat_time_hash] = {}
     
     th = Thread.start do
+      count = 0
       loop do
         begin
           sleep @herat_beat_interval_sec
@@ -666,12 +672,26 @@ class DangoServerFramework
               if heart_beat_time_hash[sid] && heart_beat_time_hash[sid] < Time.now - @heart_beat_receive_wait_sec
                 logger.warn "!!!! heart_beat_thread_start:heart beat old:#{sid}:#{heart_beat_time_hash[sid]}:#{sock}:#{sock.closed?}"
                 sock.close if !sock.closed?
-                logger.warn "!!!! heart_beat_thread_start:thread kill:#{session_th_list[sid]}"
-                session_th_list[sid].kill
+#                logger.warn "!!!! heart_beat_thread_start:thread kill:#{session_th_list[sid]}"
+#                session_th_list[sid].kill
               end
             end
           end
           
+          # スレッド情報をログに出力
+          if logger.debug?
+            count += 1
+            if count % 100 == 0
+              sids = socket_list.keys
+              thr_list = @thr_gr_gserver_serve.list.collect{|th| th.object_id }
+              
+              logger.debug "heart_beat_thread_start:sids=#{sids.inspect}"
+              logger.debug "heart_beat_thread_start:thr_list=#{thr_list.inspect}"
+              logger.debug "heart_beat_thread_start:sids-thr_list=#{(sids-thr_list).inspect}"
+              logger.debug "heart_beat_thread_start:thr_list-sids=#{(thr_list-sids).inspect}"
+            end
+          end
+          
         rescue Exception
           logger.error "Exception heart_beat_thread_start  #{error_message($!, 'u')}"
         end
@@ -719,6 +739,8 @@ class DangoServerFramework
     else
       Thread.start(sid, notice_name, send_obj, dtype, timeout, sock) do
         begin
+          @thr_gr_send_notice.add(Thread.current) # send_noticeスレッドグループに登録
+          
           raise(DangoFrameworkError, "not found sid=#{sid}") if !sock
           raise(DangoFrameworkConnectionError, "socket closed. sid=#{sid}") if sock.closed?
           
@@ -734,6 +756,8 @@ class DangoServerFramework
             
             receive_thread = Thread.start(sock, send_obj_dup, dtype) do
               begin
+                @thr_gr_send_data.add(Thread.current) # send_dataスレッドグループに登録
+                
                 dango_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
 #                logger.debug "send_notice:sent:notice_name=#{send_obj_dup['_id']} #{notice_name.inspect} #{sid} "
               rescue DangoFrameworkConnectionError

data/lib/dango/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.0.38
+  version: 0.0.39
 platform: ""
 authors: 
 - Keisuke Minami
@@ -12,15 +12,6 @@ cert_chain: []
 date: 2007-12-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json_pure
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rake
   version_requirement: 
@@ -30,15 +21,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: dango_generator
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.38
-    version: 
 description: Realtime communications network framework for Ruby and Flash on Rails.
 email: keisuke@rccn.com
 executables: []