dango 0.3.8 → 0.3.9

data/lib/dango/client_framework.rb

@@ -16,7 +16,7 @@ class DangoClientFramework
   
   # send_action_return_notice用の共有メモリ
   def send_return_shared_init
-    @send_return_shared = SharedMemoryStore.new
+    @send_return_shared = SharedMemoryStore.new({})
   end
   def send_return_shared
     @send_return_shared

data/lib/dango/server_framework.rb

@@ -45,6 +45,7 @@ class DangoServerFramework
   
   ServerStopWait = 0.2                # サーバー停止時のGServerの確認待ち時間
   
+  MainLoopWaitSec = 3.0               # メインループの待ち時間（サーバー内ファイルのチェック時間）
   
   class DangoGServer < GServer
     def initialize(parent, *args)
@@ -146,7 +147,7 @@ class DangoServerFramework
     server_start()
     
     loop do # 待ちで無限ループに入る
-      sleep 3
+      sleep MainLoopWaitSec
 #      p( Time.now_to_s + ":#{@server_reload.inspect}")
       check_reload_class()
     end
@@ -574,9 +575,9 @@ EOF
   # コンフィグのshared_database_managerによる使用クラスの選択
   def select_shared_database_manager()
     if @config['server']['shared_database_manager'] == 'MemoryStore'
-      SharedMemoryStore.new
+      SharedMemoryStore.new(@config)
     else
-      SharedMemoryStore.new
+      SharedMemoryStore.new(@config)
     end
   end
   

data/lib/dango/shared/memory_store.rb

@@ -8,7 +8,8 @@
 module DangoFrameworkModule
   # 共有メモリ
   class SharedMemoryStore
-    def initialize
+    def initialize(config)
+      @config = config
       @data = {}
       @mutex = {}
       @size = 0
@@ -20,13 +21,14 @@ module DangoFrameworkModule
     
     def to_hash
       hash = {}
-      @data.keys.each do |key|
-        hash[key] = @data[key].deep_dup
+      @data.each do |k, v|
+        hash[k.to_s] = v.deep_dup
       end
       hash
     end
     
     def transaction(key) # トランザクション処理ブロックを作る
+      key = key.to_s
       if !@mutex.has_key?(key) # 未定義キーならエラー
         raise(DangoFrameworkException, "Shared key is not exist.")
       end
@@ -37,34 +39,19 @@ module DangoFrameworkModule
       end
     end
     
-    def synchronize(key) # 排他処理ブロック用
-      if !@mutex.has_key?(key) # 未定義キーならエラー
-        raise(DangoFrameworkException, "Shared key is not exist.")
-      end
-      @mutex[key].synchronize do
-        yield
-      end
-    end
-    
     def has_key?(key) # キーがあるかどうかを返す
-      @mutex.has_key?(key)
+      key = key.to_s
+      @data.has_key?(key)
     end
     
     def [](key)
+      key = key.to_s
       if !@mutex.has_key?(key) # 未定義キーならエラー
         return(nil)
 #        raise(DangoFrameworkException, "Shared key is not exist.")
       end
       
-      # ロックしてデータを読む
-      if @mutex[key].locked?
-        data = @data[key].deep_dup
-      else
-        data = @mutex[key].synchronize do
-          @data[key].deep_dup
-        end
-      end
-      data
+      @data[key].deep_dup
     end
     
     def []=(key, value)
@@ -73,19 +60,19 @@ module DangoFrameworkModule
         raise(DangoFrameworkException, "Shared key is not String or Symbol.")
       end
       
+      key = key.to_s
+      
       # 未定義なら定義する
       if !@mutex.has_key?(key)
         @mutex[key] = Mutex.new
       end
       
       # ロックしてデータを入れる
-      if @mutex[key].locked?
+      @mutex[key].synchronize do
         @data[key] = value.deep_dup
-      else
-        @mutex[key].synchronize do
-          @data[key] = value.deep_dup
-        end
       end
+      
+      nil
     end
   end
   

data/lib/dango/tester/dango_tester_client.rb

@@ -187,7 +187,7 @@ class TestClient < DangoClientFramework
   
   # dango_client_send_receive_data用の共有メモリ
   def send_receive_shared_init
-    @send_receive_shared = SharedMemoryStore.new
+    @send_receive_shared = SharedMemoryStore.new({})
   end
   attr_reader(:send_receive_shared)
   

data/lib/dango/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-05 00:00:00 +09:00
+date: 2008-09-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency