Changeset 597

Timestamp:

03/19/06 20:18:31 (7 years ago)

Author:

ahu

Message:

move timeval arithmetic away from dnsreplay-mindex, make DTime able to save a few gettimeofdays

Location:

trunk/pdns/pdns

Files:

• dnsreplay-mindex.cc (modified) (1 diff)
• misc.cc (modified) (1 diff)
• misc.hh (modified) (2 diffs)

trunk/pdns/pdns/dnsreplay-mindex.cc

@@ -67 +67 @@
 
 
-void normalizeTV(struct timeval& tv)
-{
-  if(tv.tv_usec > 1000000) {
-    ++tv.tv_sec;
-    tv.tv_usec-=1000000;
-  }
-  else if(tv.tv_usec < 0) {
-    --tv.tv_sec;
-    tv.tv_usec+=1000000;
-  }
-}
-
-const struct timeval operator+(const struct timeval& lhs, const struct timeval& rhs)
-{
-  struct timeval ret;
-  ret.tv_sec=lhs.tv_sec + rhs.tv_sec;
-  ret.tv_usec=lhs.tv_usec + rhs.tv_usec;
-  normalizeTV(ret);
-  return ret;
-}
-
-const struct timeval operator-(const struct timeval& lhs, const struct timeval& rhs)
-{
-  struct timeval ret;
-  ret.tv_sec=lhs.tv_sec - rhs.tv_sec;
-  ret.tv_usec=lhs.tv_usec - rhs.tv_usec;
-  normalizeTV(ret);
-  return ret;
-}
 
 const struct timeval operator*(int fact, const struct timeval& rhs)

trunk/pdns/pdns/misc.cc

@@ -379 +379 @@
   // we don't shuffle the rest
 }
+
+
+void normalizeTV(struct timeval& tv)
+{
+  if(tv.tv_usec > 1000000) {
+    ++tv.tv_sec;
+    tv.tv_usec-=1000000;
+  }
+  else if(tv.tv_usec < 0) {
+    --tv.tv_sec;
+    tv.tv_usec+=1000000;
+  }
+}
+
+const struct timeval operator+(const struct timeval& lhs, const struct timeval& rhs)
+{
+  struct timeval ret;
+  ret.tv_sec=lhs.tv_sec + rhs.tv_sec;
+  ret.tv_usec=lhs.tv_usec + rhs.tv_usec;
+  normalizeTV(ret);
+  return ret;
+}
+
+const struct timeval operator-(const struct timeval& lhs, const struct timeval& rhs)
+{
+  struct timeval ret;
+  ret.tv_sec=lhs.tv_sec - rhs.tv_sec;
+  ret.tv_usec=lhs.tv_usec - rhs.tv_usec;
+  normalizeTV(ret);
+  return ret;
+}

trunk/pdns/pdns/misc.hh

@@ -138 +138 @@
   inline void set();  //!< Reset the timer
   inline int udiff(); //!< Return the number of microseconds since the timer was last set.
+  void setTimeval(const struct timeval& tv)
+  {
+    d_set=tv;
+  }
+  struct timeval getTimeval()
+  {
+    return d_set;
+  }
 private:
   struct timeval d_set;
@@ -232 +240 @@
 string makeHexDump(const string& str);
 void shuffle(vector<DNSResourceRecord>& rrs);
+
+void normalizeTV(struct timeval& tv);
+const struct timeval operator+(const struct timeval& lhs, const struct timeval& rhs);
+const struct timeval operator-(const struct timeval& lhs, const struct timeval& rhs);
+inline float makeFloat(const struct timeval& tv)
+{
+  return tv.tv_sec + tv.tv_usec/1000000.0;
+}
 #endif