This is an automated email from the ASF dual-hosted git repository.
astitcher 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 99b03fe PROTON-2257: Oops! Unrevert changes committed due to bad git
hygiene!
99b03fe is described below
commit 99b03febb196e2f9970a15b044fd3454544322c3
Author: Andrew Stitcher <astitc...@apache.org>
AuthorDate: Tue Nov 10 17:05:52 2020 -0500
PROTON-2257: Oops! Unrevert changes committed due to bad git hygiene!
---
c/src/proactor/epoll.c | 2 +-
c/src/proactor/epoll_timer.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
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/c/src/proactor/epoll_timer.c b/c/src/proactor/epoll_timer.c
index 58f0211..6c7c3db 100644
--- a/c/src/proactor/epoll_timer.c
+++ b/c/src/proactor/epoll_timer.c
@@ -287,6 +287,7 @@ void pni_timer_set(pni_timer_t *timer, uint64_t deadline) {
pn_event_batch_t *pni_timer_manager_process(pni_timer_manager_t *tm, bool
timeout, bool wake) {
uint64_t now = pn_proactor_now_64();
+ lock(&tm->context.mutex);
tm->context.working = true;
if (timeout)
tm->timerfd_deadline = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
