1 files changed, 70 insertions, 13 deletions

diff --git a/ext/tk/lib/tk/bindtag.rb b/ext/tk/lib/tk/bindtag.rb
index 9023a08e06..88c8367a88 100644
--- a/ext/tk/lib/tk/bindtag.rb
+++ b/ext/tk/lib/tk/bindtag.rb
@@ -8,30 +8,64 @@ class TkBindTag
 
   #BTagID_TBL = {}
   BTagID_TBL = TkCore::INTERP.create_table
-  Tk_BINDTAG_ID = ["btag".freeze, "00000".taint].freeze
 
-  TkCore::INTERP.init_ip_env{ BTagID_TBL.clear }
+  (Tk_BINDTAG_ID = ["btag".freeze, "00000".taint]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    BTagID_TBL.mutex.synchronize{ BTagID_TBL.clear }
+  }
 
   def TkBindTag.id2obj(id)
-    BTagID_TBL[id]? BTagID_TBL[id]: id
+    BTagID_TBL.mutex.synchronize{
+      (BTagID_TBL[id])? BTagID_TBL[id]: id
+    }
   end
 
+=begin
   def TkBindTag.new_by_name(name, *args, &b)
-    return BTagID_TBL[name] if BTagID_TBL[name]
+    BTagID_TBL.mutex.synchronize{
+      return BTagID_TBL[name] if BTagID_TBL[name]
+    }
+
     self.new.instance_eval{
-      BTagID_TBL.delete @id
-      @id = name
-      BTagID_TBL[@id] = self
+      BTagID_TBL.mutex.synchronize{
+        BTagID_TBL.delete @id
+        @id = name
+        BTagID_TBL[@id] = self
+      }
       bind(*args, &b) if args != []
       self
     }
   end
+=end
+  def TkBindTag.new_by_name(name, *args, &b)
+    obj = nil
+    BTagID_TBL.mutex.synchronize{
+      if BTagID_TBL[name]
+        obj = BTagID_TBL[name]
+      else
+        (obj = BTagID_TBL[name] = self.allocate).instance_eval{
+          @id = name
+        }
+      end
+    }
+    bind(*args, &b) if obj && args != []
+    obj
+  end
 
   def initialize(*args, &b)
-    # @id = Tk_BINDTAG_ID.join('')
-    @id = Tk_BINDTAG_ID.join(TkCore::INTERP._ip_id_)
-    Tk_BINDTAG_ID[1].succ!
-    BTagID_TBL[@id] = self
+    Tk_BINDTAG_ID.mutex.synchronize{
+      # @id = Tk_BINDTAG_ID.join('')
+      @id = Tk_BINDTAG_ID.join(TkCore::INTERP._ip_id_)
+      Tk_BINDTAG_ID[1].succ!
+    }
+    BTagID_TBL.mutex.synchronize{
+      BTagID_TBL[@id] = self
+    }
     bind(*args, &b) if args != []
   end
 
@@ -63,14 +97,37 @@ end
 
 
 class TkDatabaseClass<TkBindTag
+=begin
   def self.new(name, *args, &b)
-    return BTagID_TBL[name] if BTagID_TBL[name]
+    BTagID_TBL.mutex.synchronize{
+      return BTagID_TBL[name] if BTagID_TBL[name]
+    }
     super(name, *args, &b)
   end
 
   def initialize(name, *args, &b)
     @id = name
-    BTagID_TBL[@id] = self
+    BTagID_TBL.mutex.synchronize{
+      BTagID_TBL[@id] = self
+    }
+    bind(*args, &b) if args != []
+  end
+=end
+  def self.new(name, *args, &b)
+    BTagID_TBL.mutex.synchronize{
+      if BTagID_TBL[name]
+        BTagID_TBL[name]
+      else
+        BTagID_TBL[name] = self.allocate.instance_eval{
+          initialize(name, *args, &b)
+          self
+        }
+      end
+    }
+  end
+
+  def initialize(name, *args, &b)
+    @id = name
     bind(*args, &b) if args != []
   end