summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2013-12-13 14:05:02 +0100
committerBen Pfaff <blp@nicira.com>2013-12-13 09:17:40 -0800
commit5521e08eb7a233129208a1c04ee11a0599f25879 (patch)
tree42b020e48fc5b49bf3b62bccd0a5a3118d50153e
parent86e504e102aa69c379cd465966daf197152618e6 (diff)
downloadopenvswitch-5521e08eb7a233129208a1c04ee11a0599f25879.tar.gz
coverage: Use OVS_CONSTRUCTOR to initialize the coverage counter array
Use a static array in coverage.c that gets initialized by constructor functions per coverage definition. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
-rw-r--r--lib/coverage.c46
-rw-r--r--lib/coverage.h20
2 files changed, 21 insertions, 45 deletions
diff --git a/lib/coverage.c b/lib/coverage.c
index c7a00284e..eae1799d3 100644
--- a/lib/coverage.c
+++ b/lib/coverage.c
@@ -29,37 +29,9 @@
VLOG_DEFINE_THIS_MODULE(coverage);
/* The coverage counters. */
-#if USE_LINKER_SECTIONS
-extern struct coverage_counter *__start_coverage[];
-extern struct coverage_counter *__stop_coverage[];
-#define coverage_counters __start_coverage
-#define n_coverage_counters (__stop_coverage - __start_coverage)
-#else /* !USE_LINKER_SECTIONS */
-#define COVERAGE_COUNTER(COUNTER) \
- DECLARE_EXTERN_PER_THREAD_DATA(unsigned int, \
- counter_##COUNTER); \
- DEFINE_EXTERN_PER_THREAD_DATA(counter_##COUNTER, 0); \
- static unsigned int COUNTER##_count(void) \
- { \
- unsigned int *countp = counter_##COUNTER##_get(); \
- unsigned int count = *countp; \
- *countp = 0; \
- return count; \
- } \
- extern struct coverage_counter counter_##COUNTER; \
- struct coverage_counter counter_##COUNTER \
- = { #COUNTER, COUNTER##_count, 0, 0, {0}, {0} };
-#include "coverage.def"
-#undef COVERAGE_COUNTER
-
-extern struct coverage_counter *coverage_counters[];
-struct coverage_counter *coverage_counters[] = {
-#define COVERAGE_COUNTER(NAME) &counter_##NAME,
-#include "coverage.def"
-#undef COVERAGE_COUNTER
-};
-#define n_coverage_counters ARRAY_SIZE(coverage_counters)
-#endif /* !USE_LINKER_SECTIONS */
+static struct coverage_counter **coverage_counters = NULL;
+static unsigned int n_coverage_counters = 0;
+static unsigned int allocated_coverage_counters = 0;
static struct ovs_mutex coverage_mutex = OVS_MUTEX_INITIALIZER;
@@ -73,6 +45,18 @@ static void coverage_read(struct svec *);
static unsigned int coverage_array_sum(const unsigned int *arr,
const unsigned int len);
+/* Registers a coverage counter with the coverage core */
+void
+coverage_counter_register(struct coverage_counter* counter)
+{
+ if (n_coverage_counters >= allocated_coverage_counters) {
+ coverage_counters = x2nrealloc(coverage_counters,
+ &allocated_coverage_counters,
+ sizeof(struct coverage_counter*));
+ }
+ coverage_counters[n_coverage_counters++] = counter;
+}
+
static void
coverage_unixctl_show(struct unixctl_conn *conn, int argc OVS_UNUSED,
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
diff --git a/lib/coverage.h b/lib/coverage.h
index 4e6c05064..0b41b0019 100644
--- a/lib/coverage.h
+++ b/lib/coverage.h
@@ -29,6 +29,7 @@
#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 +55,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 +76,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)