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]
/
lib
/
ovs-atomic-pthreads.c
diff --git
a/lib/ovs-atomic-pthreads.c
b/lib/ovs-atomic-pthreads.c
index
7e7ef05
..
a501b82
100644
(file)
--- a/
lib/ovs-atomic-pthreads.c
+++ b/
lib/ovs-atomic-pthreads.c
@@
-26,10
+26,10
@@
atomic_flag_test_and_set(volatile atomic_flag *flag_)
atomic_flag *flag = CONST_CAST(atomic_flag *, flag_);
bool old_value;
atomic_flag *flag = CONST_CAST(atomic_flag *, flag_);
bool old_value;
-
ovs
_mutex_lock(&flag->mutex);
+
xpthread
_mutex_lock(&flag->mutex);
old_value = flag->b;
flag->b = true;
old_value = flag->b;
flag->b = true;
-
ovs
_mutex_unlock(&flag->mutex);
+
xpthread
_mutex_unlock(&flag->mutex);
return old_value;
}
return old_value;
}
@@
-46,9
+46,9
@@
atomic_flag_clear(volatile atomic_flag *flag_)
{
atomic_flag *flag = CONST_CAST(atomic_flag *, flag_);
{
atomic_flag *flag = CONST_CAST(atomic_flag *, flag_);
-
ovs
_mutex_lock(&flag->mutex);
+
xpthread
_mutex_lock(&flag->mutex);
flag->b = false;
flag->b = false;
-
ovs
_mutex_unlock(&flag->mutex);
+
xpthread
_mutex_unlock(&flag->mutex);
}
void
}
void