ovn-controller: race between binding-run and patch-run for localnet ports

[cascardo/ovs.git] / lib / coverage.h

diff --git a/lib/coverage.h b/lib/coverage.h
index 4e6c050..34a04aa 100644 (file)
--- a/lib/coverage.h
+++ b/lib/coverage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
  * a useful debugging tool. */
 
 #include "ovs-thread.h"
-#include "vlog.h"
+#include "compiler.h"
 
 /* Makes coverage_run run every 5000 ms (5 seconds).
  * If this value is redefined, the new value must
@@ -54,9 +54,10 @@ struct coverage_counter {
     unsigned int hr[HR_AVG_LEN];
 };
 
+void coverage_counter_register(struct coverage_counter*);
+
 /* Defines COUNTER.  There must be exactly one such definition at file scope
  * within a program. */
-#if USE_LINKER_SECTIONS
 #define COVERAGE_DEFINE(COUNTER)                                        \
         DEFINE_STATIC_PER_THREAD_DATA(unsigned int,                     \
                                       counter_##COUNTER, 0);            \
@@ -74,19 +75,9 @@ struct coverage_counter {
         extern struct coverage_counter counter_##COUNTER;               \
         struct coverage_counter counter_##COUNTER                       \
             = { #COUNTER, COUNTER##_count, 0, 0, {0}, {0} };            \
-        extern struct coverage_counter *counter_ptr_##COUNTER;          \
-        struct coverage_counter *counter_ptr_##COUNTER                  \
-            __attribute__((section("coverage"))) = &counter_##COUNTER
-#else
-#define COVERAGE_DEFINE(COUNTER)                                        \
-        DECLARE_EXTERN_PER_THREAD_DATA(unsigned int,                    \
-                                       counter_##COUNTER);              \
-        static inline void COUNTER##_add(unsigned int n)                \
-        {                                                               \
-            *counter_##COUNTER##_get() += n;                            \
-        }                                                               \
-        extern struct coverage_counter counter_##COUNTER
-#endif
+        OVS_CONSTRUCTOR(COUNTER##_init) {                               \
+            coverage_counter_register(&counter_##COUNTER);              \
+        }
 
 /* Adds 1 to COUNTER. */
 #define COVERAGE_INC(COUNTER) COVERAGE_ADD(COUNTER, 1)
@@ -97,9 +88,7 @@ struct coverage_counter {
 void coverage_init(void);
 void coverage_log(void);
 void coverage_clear(void);
+void coverage_try_clear(void);
 void coverage_run(void);
 
-/* Implementation detail. */
-#define COVERAGE_DEFINE__(COUNTER)                              \
-
 #endif /* coverage.h */