diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2013-12-13 14:05:02 +0100 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-12-13 09:17:40 -0800 |
| commit | 5521e08eb7a233129208a1c04ee11a0599f25879 (patch) | |
| tree | 42b020e48fc5b49bf3b62bccd0a5a3118d50153e /lib/coverage.h | |
| parent | 86e504e102aa69c379cd465966daf197152618e6 (diff) | |
| download | openvswitch-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>
Diffstat (limited to 'lib/coverage.h')
| -rw-r--r-- | lib/coverage.h | 20 |
1 files changed, 6 insertions, 14 deletions
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) |