[Box Backup-commit] COMMIT r3128 - box/trunk/lib/common

subversion at boxbackup.org subversion at boxbackup.org
Tue Nov 6 23:57:04 GMT 2012


Author: chris
Date: 2012-11-06 23:57:03 +0000 (Tue, 06 Nov 2012)
New Revision: 3128

Modified:
   box/trunk/lib/common/Logging.h
   box/trunk/lib/common/Timer.cpp
Log:
Convert FORMAT_MICROSECONDS into a global utility macro.


Modified: box/trunk/lib/common/Logging.h
===================================================================
--- box/trunk/lib/common/Logging.h	2012-10-22 20:56:04 UTC (rev 3127)
+++ box/trunk/lib/common/Logging.h	2012-11-06 23:57:03 UTC (rev 3128)
@@ -144,6 +144,10 @@
 	std::setw(6) << \
 	timespec.tv_usec
 
+#define BOX_FORMAT_MICROSECONDS(t) \
+	(int)((t) / 1000000) << "." << \
+	(int)((t) % 1000000) << " seconds"
+
 #undef ERROR
 
 namespace Log

Modified: box/trunk/lib/common/Timer.cpp
===================================================================
--- box/trunk/lib/common/Timer.cpp	2012-10-22 20:56:04 UTC (rev 3127)
+++ box/trunk/lib/common/Timer.cpp	2012-11-06 23:57:03 UTC (rev 3128)
@@ -170,10 +170,6 @@
 	}
 }
 
-#define FORMAT_MICROSECONDS(t) \
-	(int)(t / 1000000) << "." << \
-	(int)(t % 1000000) << " seconds"
-
 // --------------------------------------------------------------------------
 //
 // Function
@@ -242,7 +238,7 @@
 				*/
 				BOX_TRACE(TIMER_ID_OF(**i) "has expired, "
 					"triggering " <<
-					FORMAT_MICROSECONDS(-timeToExpiry) <<
+					BOX_FORMAT_MICROSECONDS(-timeToExpiry) <<
 					" late");
 				rTimer.OnExpire();
 				spTimers->erase(i);
@@ -295,7 +291,7 @@
 	else
 	{
 		BOX_TRACE("timer: next event: " << nameOfNextEvent <<
-			" expires in " << FORMAT_MICROSECONDS(timeToNextEvent));
+			" expires in " << BOX_FORMAT_MICROSECONDS(timeToNextEvent));
 	}
 
 	struct itimerval timeout;
@@ -397,7 +393,7 @@
 	if (timeToExpiry <= 0)
 	{
 		BOX_WARNING(TIMER_ID << "fudging expiry from -" <<
-			FORMAT_MICROSECONDS(-timeToExpiry))
+			BOX_FORMAT_MICROSECONDS(-timeToExpiry))
 		timeToExpiry = 1;
 	}
 




More information about the Boxbackup-commit mailing list