git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
vswitchd
/
system-stats.c
diff --git
a/vswitchd/system-stats.c
b/vswitchd/system-stats.c
index
9e3d228
..
e8a8512
100644
(file)
--- a/
vswitchd/system-stats.c
+++ b/
vswitchd/system-stats.c
@@
-506,7
+506,7
@@
get_filesys_stats(struct smap *stats OVS_UNUSED)
\f
#define SYSTEM_STATS_INTERVAL (5 * 1000) /* In milliseconds. */
\f
#define SYSTEM_STATS_INTERVAL (5 * 1000) /* In milliseconds. */
-static struct ovs_mutex mutex = OVS_
ADAPTIVE_
MUTEX_INITIALIZER;
+static struct ovs_mutex mutex = OVS_MUTEX_INITIALIZER;
static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
static struct latch latch OVS_GUARDED_BY(mutex);
static bool enabled;
static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
static struct latch latch OVS_GUARDED_BY(mutex);
static bool enabled;
@@
-576,7
+576,7
@@
system_stats_wait(void)
}
static void
}
static void
-discard_stats(void) OVS_REQUIRES(
&
mutex)
+discard_stats(void) OVS_REQUIRES(mutex)
{
if (system_stats) {
smap_destroy(system_stats);
{
if (system_stats) {
smap_destroy(system_stats);