This is an automated email from the ASF dual-hosted git repository.
cliffjansen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new 2ec1ba5 PROTON-2292: backout tsan suppression. Apply fix to forced
shutdown code path.
2ec1ba5 is described below
commit 2ec1ba5026ad821f0f7f6919cd14762f04dcadd2
Author: Cliff Jansen <cliffjan...@apache.org>
AuthorDate: Tue Nov 10 09:50:07 2020 -0800
PROTON-2292: backout tsan suppression. Apply fix to forced shutdown code
path.
---
c/src/proactor/epoll.c | 2 +-
tests/tsan.supp | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/c/src/proactor/epoll.c b/c/src/proactor/epoll.c
index d2822b4..30ef5f1 100644
--- a/c/src/proactor/epoll.c
+++ b/c/src/proactor/epoll.c
@@ -1985,7 +1985,6 @@ void pn_proactor_free(pn_proactor_t *p) {
p->eventfd = -1;
close(p->interruptfd);
p->interruptfd = -1;
- pni_timer_manager_finalize(&p->timer_manager);
while (p->contexts) {
pcontext_t *ctx = p->contexts;
p->contexts = ctx->next;
@@ -2001,6 +2000,7 @@ void pn_proactor_free(pn_proactor_t *p) {
}
}
+ pni_timer_manager_finalize(&p->timer_manager);
pn_collector_free(p->collector);
pmutex_finalize(&p->tslot_mutex);
pmutex_finalize(&p->sched_mutex);
diff --git a/tests/tsan.supp b/tests/tsan.supp
index 5a1c61a..f0f9020 100644
--- a/tests/tsan.supp
+++ b/tests/tsan.supp
@@ -30,7 +30,3 @@ race:cpp/examples/broker
# found by threaderciser, in c/src/proactor/epoll.c
race:^listener_final_free$
race:^pn_proactor_connect2$
-
-# PROTON-2292 & PROTON-1496: false suspected collision between set/free
-mutex:^pni_timer_set$
-mutex:^pni_timer_free$
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
