svn commit: r704211 - /incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp

[gs...@apache.org]

Author: gsim
Date: Mon Oct 13 12:24:26 2008
New Revision: 704211

URL: http://svn.apache.org/viewvc?rev=704211&view=rev
Log:
Optimisation for testing expiration and disabling of setting timestamp until performance impact is evaluated


Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp?rev=704211&r1=704210&r2=704211&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp Mon Oct 13 12:24:26 2008
@@ -307,11 +307,14 @@
 
 void Message::setTimestamp()
 {
-    time_t now = ::time(0);
     DeliveryProperties* props = getProperties<DeliveryProperties>();    
-    props->setTimestamp(now);
+    //Spec states that timestamp should be set, evaluate the
+    //performance impact before re-enabling this:
+    //time_t now = ::time(0);
+    //props->setTimestamp(now);
     if (props->getTtl()) {
         //set expiration (nb: ttl is in millisecs, time_t is in secs)
+        time_t now = ::time(0);
         props->setExpiration(now + (props->getTtl()/1000));
         expiration = AbsTime(AbsTime::now(), Duration(props->getTtl() * TIME_MSEC));
     }
@@ -319,5 +322,5 @@
 
 bool Message::hasExpired() const
 {
-    return expiration < AbsTime::now();
+    return expiration < FAR_FUTURE && expiration < AbsTime::now();
 }