Changeset 481

Timestamp:

09/04/05 21:38:38 (8 years ago)

Author:

ahu

Message:

improve locking

Files:

• trunk/pdns/pdns/backends/bind/bindbackend2.cc (modified) (4 diffs)

trunk/pdns/pdns/backends/bind/bindbackend2.cc

@@ -344 +344 @@
 }
 
-
-
 void Bind2Backend::reload()
 {
@@ -600 +598 @@
 void Bind2Backend::queueReload(BB2DomainInfo *bbd)
 {
+  Lock l(&s_zonemap_lock);
+
   s_staging_zone_map.clear(); 
 
@@ -612 +612 @@
     ZP.setDirectory(d_binddirectory);
     ZP.setCallback(&InsertionCallback);  
-
-    // XXX FIXME - I think this is highly bogus as we are copying pointers around here, so we are only creating aliases
 
     s_staging_zone_map[bbd->d_id]=s_id_zone_map[bbd->d_id];
@@ -624 +622 @@
     
     contents.clear();
-    s_id_zone_map[bbd->d_id]=s_staging_zone_map[bbd->d_id];
+
+    s_id_zone_map[bbd->d_id]=s_staging_zone_map[bbd->d_id]; // move over
 
     bbd->setCtime();