use ovsrcu_set first then use ovsrcu_postpone
CC: Jarno Rajahalme <ja...@ovn.org>
Fixes: da9cfca6e2d7 (\Revert "pvector: Expose non-concurrent priority
vector."\)
Acked-by: Yanqin Wei <yanqin....@arm.com>
Signed-off-by: Linhaifeng <haifeng....@huawei.com>
---
lib/pvector.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/pvector.c b/lib/pvector.c
index cc527fdc4..aa8c6cb24 100644
--- a/lib/pvector.c
+++ b/lib/pvector.c
@@ -67,10 +67,11 @@ pvector_init(struct pvector *pvec)
void
pvector_destroy(struct pvector *pvec)
{
+ struct pvector_impl *old = pvector_impl_get(pvec);
free(pvec->temp);
pvec->temp = NULL;
- ovsrcu_postpone(free, pvector_impl_get(pvec));
ovsrcu_set(&pvec->impl, NULL); /* Poison. */
+ ovsrcu_postpone(free, old);
}
/* Iterators for callers that need the 'index' afterward. */
@@ -205,11 +206,11 @@ pvector_change_priority(struct pvector *pvec, void *ptr,
int priority)
/* Make the modified pvector available for iteration. */
void pvector_publish__(struct pvector *pvec)
{
- struct pvector_impl *temp = pvec->temp;
-
+ struct pvector_impl *new = pvec->temp;
+ struct pvector_impl *old = ovsrcu_get_protected(struct pvector_impl *,
+ &pvec->impl);
pvec->temp = NULL;
- pvector_impl_sort(temp); /* Also removes gaps. */
- ovsrcu_postpone(free, ovsrcu_get_protected(struct pvector_impl *,
- &pvec->impl));
- ovsrcu_set(&pvec->impl, temp);
+ pvector_impl_sort(new); /* Also removes gaps. */
+ ovsrcu_set(&pvec->impl, new);
+ ovsrcu_postpone(free, old);
}
--
2.21.0.windows.1
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
