dango 0.0.11 → 0.0.12

data/lib/dango/framework_base.rb

@@ -242,16 +242,14 @@ module DangoFrameworkModule
 #    cs_logger.debug "send_buf:#{send_buf.inspect}"
     
     begin
-#      sock.write send_buf
-#      sock.flush
+      sock.write send_buf
+      sock.flush
 
 #      sock.send(size_str + "\n", 0)
 #      sock.flush
+
 #      sock.send(send_data, 0)
 #      sock.flush
-
-      sock.send(send_buf, 0)
-      sock.flush
     rescue
       raise(DangoFrameworkConnectionError, "sock write failed.\n#{error_message($!, 'u')}")
     end

data/lib/dango/server_framework.rb

@@ -16,7 +16,7 @@ class DangoServerFramework
   
   SendReceiveSleepIntervalSec = 0.1  # データ送信後の順の際のタイムアウトチェック間隔秒
   SendReceiveTimeoutDefaultSec = 0.5 # データ送受信時のデフォルトタイムアウト秒数
-#  SendReceiveTimeoutDefaultSec = 3   # データ送受信時のデフォルトタイムアウト秒数
+  SendTimeoutSec = 10.0    # データ送受信時の送信のタイムアウト秒数
   
   class DangoGServer < GServer
     def initialize(parent, *args)
@@ -186,9 +186,10 @@ class DangoServerFramework
       cs_connect() # 接続時メソッド呼び出し
       
       # 接続直後のsid通知
-      session_id = session_id
-      send_obj = {"_sid"=>session_id}
-      cs_server_send_data(session_id, "_notice_sid", send_obj)
+#      Thread.start do
+        send_obj = {"_sid"=>session_id}
+        cs_server_send_data(session_id, "_notice_sid", send_obj)
+#      end
       
       # メインループ入り
       loop do
@@ -566,48 +567,54 @@ class DangoServerFramework
 #      cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
 #      cs_logger.debug "cs_server_send_data:finish send data notice_name=#{notice_name.inspect}\n"
 #    else
+    if notice_name.to_s == "_notice_sid"
+      cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
+#      cs_logger.debug "cs_server_send_data:finish send data notice_name=#{notice_name.inspect}\n"
+    else
       Thread.start do
         begin
           mutex_socket_list.synchronize(session_id) do
             have_came_response = nil
             
-            receive_thread = nil
-            end_reserved_time = Time.now + timeout
+            receive_thread = Thread.start do
+              begin
+                cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
+#                cs_logger.debug "cs_server_send_data:send data notice_name=#{notice_name.inspect} #{send_obj_dup['_id']}"
+              rescue DangoFrameworkError
+                cs_logger.debug "cs_server_send_data:DangoFrameworkError:notice_name=#{notice_name.inspect}\n"
+              end
+            end
             
-            # タイムアウトチェック
-            catch(:send_timeout) do
-              (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
-                if Time.now > end_reserved_time
-                  cs_logger.debug "timeout:#{notice_name}" 
-                  break
-                end
-                
-                # 送信スレッドが開始していなければ開始
-                if !receive_thread
-                  receive_thread = Thread.start do
-                    begin
-                      cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
-#                      cs_logger.debug "cs_server_send_data:send data notice_name=#{notice_name.inspect} #{send_obj_dup['_id']}"
-                    rescue DangoFrameworkError
-                      cs_logger.debug "cs_server_send_data:DangoFrameworkError:notice_name=#{notice_name.inspect}\n"
-                    end
+            # データ送信スレッドの終了待ち
+            if !receive_thread.join(SendTimeoutSec)
+              # タイムアウトの場合は
+              cs_logger.warn "cs_server_send_data:send timeout:#{notice_name}" 
+            else
+              end_reserved_time = Time.now + timeout
+              
+              # タイムアウトチェック
+              catch(:send_timeout) do
+                (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
+                  if Time.now > end_reserved_time
+                    cs_logger.debug "cs_server_send_data:receive timeout:#{notice_name}" 
+                    break
                   end
-                end
-                
-                @mutex_send_response.synchronize do
-                  if @arr_send_response.delete(send_obj_dup["_id"])
-                    have_came_response = true
-#                    cs_logger.debug "response check ok:#{notice_name} #{send_obj_dup['_id'].inspect}"
-                    throw(:send_timeout)
+                  
+                  @mutex_send_response.synchronize do
+                    if @arr_send_response.delete(send_obj_dup["_id"])
+                      have_came_response = true
+#                      cs_logger.debug "response check ok:#{notice_name} #{send_obj_dup['_id'].inspect}"
+                      throw(:send_timeout)
+                    end
                   end
-                end
-                
-                sleep SendReceiveSleepIntervalSec # スリープ
-              end # タイムアウト処理終わり
-            end # catch 終わり
-            
-            if !have_came_response # 戻ってきたデータがあるかどうかチェック
-              cs_logger.warn "!!! received data is none. #{notice_name} #{send_obj_dup['_id']}"
+                  
+                  sleep SendReceiveSleepIntervalSec # スリープ
+                end # タイムアウト処理終わり
+              end # catch 終わり
+              
+              if !have_came_response # 戻ってきたデータがあるかどうかチェック
+                cs_logger.warn "!!! received data is none. #{notice_name} #{send_obj_dup['_id']}"
+              end
             end
           end
         rescue
@@ -615,7 +622,7 @@ class DangoServerFramework
         end
       end # Thread:end
       
-#    end
+    end
     
     self
   end

data/lib/dango/version.rb

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

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 date: 2007-10-16 00:00:00 +09:00
 summary: Ruby - Flash conneciton network flamework
 require_paths: