Changeset 1105

Timestamp:

11/17/07 22:30:56 (2 years ago)

Author:

ahu

Message:

64-bit fix for the slave cycle interval, which might lead to locked up systems!

Location:

trunk/pdns/pdns

Files:

• communicator.cc (modified) (4 diffs)
• communicator.hh (modified) (2 diffs)

trunk/pdns/pdns/communicator.cc

@@ -56 +56 @@
 void CommunicatorClass::suck(const string &domain,const string &remote)
 {
+  L<<Logger::Error<<"Initiating transfer of '"<<domain<<"' from remote '"<<remote<<"'"<<endl;
   uint32_t domain_id;
   PacketHandler P;
@@ -289 +290 @@
 }  
 
-int CommunicatorClass::doNotifications()
+time_t CommunicatorClass::doNotifications()
 {
   ComboAddress from;
@@ -424 +425 @@
     time_t next;
 
-    int tick;
+    time_t tick;
 
     for(;;) {
@@ -433 +434 @@
                d_tickinterval);
 
+      L<<Logger::Error<<"tick = "<<tick<<", d_tickinterval = "<<d_tickinterval<<endl;
       next=time(0)+tick;
 
-      while(time(0)<next) {
+      while(time(0) < next) {
         rc=d_any_sem.tryWait();
 

trunk/pdns/pdns/communicator.hh

@@ -132 +132 @@
     d_masterschanged=d_slaveschanged=true;
   }
-  int doNotifications();    
+  time_t doNotifications();    
   void go()
   {
@@ -164 +164 @@
   Semaphore d_suck_sem;
   Semaphore d_any_sem;
-  int d_tickinterval;
+  time_t d_tickinterval;
   NotificationQueue d_nq;
   bool d_masterschanged, d_slaveschanged;