likely: make dependencies correctly conditional on CCAN_LIKELY_DEBUG.

[ccan] / ccan / likely / likely.h

diff --git a/ccan/likely/likely.h b/ccan/likely/likely.h
index 5e4fc831c960dbe09d480fbc20182c596e3703f6..8683a2c94782104153ebe98f976eac38d61e45ba 100644 (file)
--- a/ccan/likely/likely.h
+++ b/ccan/likely/likely.h
@@ -2,7 +2,6 @@
 #ifndef CCAN_LIKELY_H
 #define CCAN_LIKELY_H
 #include "config.h"
-#include <ccan/str/str.h>
 #include <stdbool.h>
 
 #ifndef CCAN_LIKELY_DEBUG
@@ -57,6 +56,8 @@
 #define unlikely(cond) (!!(cond))
 #endif
 #else /* CCAN_LIKELY_DEBUG versions */
+#include <ccan/str/str.h>
+
 #define likely(cond) \
        (_likely_trace(!!(cond), 1, stringify(cond), __FILE__, __LINE__))
 #define unlikely(cond) \
@@ -65,16 +66,13 @@
 long _likely_trace(bool cond, bool expect,
                   const char *condstr,
                   const char *file, unsigned int line);
-#endif
-
-#ifdef CCAN_LIKELY_DEBUG
 /**
  * likely_stats - return description of abused likely()/unlikely()
  * @min_hits: minimum number of hits
  * @percent: maximum percentage correct
  *
  * When CCAN_LIKELY_DEBUG is defined, likely() and unlikely() trace their
- * results: this causes a significant slowdown, but allows analysis of 
+ * results: this causes a significant slowdown, but allows analysis of
  * whether the branches are labelled correctly.
  *
  * This function returns a malloc'ed description of the least-correct
@@ -101,6 +99,13 @@ long _likely_trace(bool cond, bool expect,
  *     #endif
  *     }
  */
-const char *likely_stats(unsigned int min_hits, unsigned int percent);
+char *likely_stats(unsigned int min_hits, unsigned int percent);
+
+/**
+ * likely_stats_reset - free up memory of likely()/unlikely() branches.
+ *
+ * This can also plug memory leaks.
+ */
+void likely_stats_reset(void);
 #endif /* CCAN_LIKELY_DEBUG */
 #endif /* CCAN_LIKELY_H */