dpif-netdev: Fix double inclusion of cmap.h

[cascardo/ovs.git] / lib / memory.c

diff --git a/lib/memory.c b/lib/memory.c
index c26c743..3e21eb5 100644 (file)
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -24,7 +24,7 @@
 #include "simap.h"
 #include "timeval.h"
 #include "unixctl.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(memory);
 
@@ -51,7 +51,10 @@ static void memory_init(void);
 
 /* Runs the memory monitor.
  *
- * The client should call memory_should_report() afterward. */
+ * The client should call memory_should_report() afterward.
+ *
+ * This function, and the remainder of this module's interface, should be
+ * called from only a single thread. */
 void
 memory_run(void)
 {
@@ -137,8 +140,10 @@ memory_report(const struct simap *usage)
     ds_init(&s);
     compose_report(usage, &s);
 
-    if (want_report && s.length) {
-        VLOG_INFO("%s", ds_cstr(&s));
+    if (want_report) {
+        if (s.length) {
+            VLOG_INFO("%s", ds_cstr(&s));
+        }
         want_report = false;
     }
     if (n_conns) {