Copyright 2014->2015

[folly.git] / folly / Logging.h

diff --git a/folly/Logging.h b/folly/Logging.h
index 0c34de24b8e18511ed582092e85bfd01194c7772..d5a31734ccdf8e0655620e6b248209ada3123e9a 100644 (file)
--- a/folly/Logging.h
+++ b/folly/Logging.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2015 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,21 +31,25 @@
  *
  * The implementation uses for statements to introduce variables in
  * a nice way that doesn't mess surrounding statements.  It is thread
- * safe.
+ * safe.  Non-positive intervals will always log.
  */
 #define FB_LOG_EVERY_MS(severity, milli_interval)                            \
-  for (bool FB_LEM_once = true; FB_LEM_once; )                               \
+  for (decltype(milli_interval) FB_LEM_once = 1,                             \
+                                FB_LEM_interval = (milli_interval);          \
+       FB_LEM_once; )                                                        \
     for (::std::chrono::milliseconds::rep FB_LEM_prev, FB_LEM_now =          \
+             FB_LEM_interval <= 0 ? 0 :                                      \
              ::std::chrono::duration_cast< ::std::chrono::milliseconds>(     \
                  ::std::chrono::system_clock::now().time_since_epoch()       \
                  ).count();                                                  \
          FB_LEM_once; )                                                      \
       for (static ::std::atomic< ::std::chrono::milliseconds::rep>           \
-               FB_LEM_hist; FB_LEM_once; FB_LEM_once = false)                \
-        if (FB_LEM_now - (FB_LEM_prev =                                      \
-                          FB_LEM_hist.load(std::memory_order_acquire)) <     \
-                milli_interval ||                                            \
-            !FB_LEM_hist.compare_exchange_strong(FB_LEM_prev, FB_LEM_now)) { \
+               FB_LEM_hist; FB_LEM_once; FB_LEM_once = 0)                    \
+        if (FB_LEM_interval > 0 &&                                           \
+            (FB_LEM_now - (FB_LEM_prev =                                     \
+                           FB_LEM_hist.load(std::memory_order_acquire)) <    \
+                                                          FB_LEM_interval || \
+             !FB_LEM_hist.compare_exchange_strong(FB_LEM_prev,FB_LEM_now))) {\
         } else                                                               \
           LOG(severity)