[qpid-proton] branch master updated: PROTON-2257: Oops! Unrevert changes committed due to bad git hygiene!
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
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(>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(>timer_manager);
pn_collector_free(p->collector);
pmutex_finalize(>tslot_mutex);
pmutex_finalize(>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(>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
[qpid-proton] branch master updated: PROTON-2257: Add back in aliases for renamed functions - This keeps the shared library compatible and so not to change the major version
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 7f8c814 PROTON-2257: Add back in aliases for renamed functions - This
keeps the shared library compatible and so not to change the major version
7f8c814 is described below
commit 7f8c8144af3629cf363d68262856f12a99b39a28
Author: Andrew Stitcher
AuthorDate: Tue Nov 10 13:49:11 2020 -0500
PROTON-2257: Add back in aliases for renamed functions
- This keeps the shared library compatible and so not to change the major
version
---
c/src/proactor/epoll.c | 2 +-
c/src/proactor/epoll_timer.c | 1 -
c/src/sasl/sasl.c| 11 +++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/c/src/proactor/epoll.c b/c/src/proactor/epoll.c
index 30ef5f1..d2822b4 100644
--- a/c/src/proactor/epoll.c
+++ b/c/src/proactor/epoll.c
@@ -1985,6 +1985,7 @@ void pn_proactor_free(pn_proactor_t *p) {
p->eventfd = -1;
close(p->interruptfd);
p->interruptfd = -1;
+ pni_timer_manager_finalize(>timer_manager);
while (p->contexts) {
pcontext_t *ctx = p->contexts;
p->contexts = ctx->next;
@@ -2000,7 +2001,6 @@ void pn_proactor_free(pn_proactor_t *p) {
}
}
- pni_timer_manager_finalize(>timer_manager);
pn_collector_free(p->collector);
pmutex_finalize(>tslot_mutex);
pmutex_finalize(>sched_mutex);
diff --git a/c/src/proactor/epoll_timer.c b/c/src/proactor/epoll_timer.c
index 6c7c3db..58f0211 100644
--- a/c/src/proactor/epoll_timer.c
+++ b/c/src/proactor/epoll_timer.c
@@ -287,7 +287,6 @@ 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(>context.mutex);
tm->context.working = true;
if (timeout)
tm->timerfd_deadline = 0;
diff --git a/c/src/sasl/sasl.c b/c/src/sasl/sasl.c
index e239e0c..dfb4530 100644
--- a/c/src/sasl/sasl.c
+++ b/c/src/sasl/sasl.c
@@ -184,6 +184,17 @@ void pnx_sasl_set_default_implementation(const
pnx_sasl_implementation* impl)
global_sasl_impl = impl;
}
+// Aliases for linkage compatibility in face of renamings
+PN_EXTERN bool pnx_sasl_is_included_mech(pn_transport_t *transport,
pn_bytes_t s)
+{ return pnx_sasl_is_mechanism_included(transport, s); }
+PN_EXTERN bool pnx_sasl_get_allow_insecure_mechs(pn_transport_t *transport)
+{ return pnx_sasl_get_allow_insecure_mechanisms(transport); }
+PN_EXTERN bool pnx_sasl_get_auth_required(pn_transport_t *transport)
+{ return pnx_sasl_get_authentication_required(transport); }
+PN_EXTERN void pnx_sasl_succeed_authentication(pn_transport_t *transport,
const char *username, const char *authzid)
+{ pnx_sasl_set_succeeded(transport, username, authzid);}
+PN_EXTERN void pnx_sasl_fail_authentication(pn_transport_t *transport)
+{pnx_sasl_set_failed(transport); }
//-
// pni_sasl_impl: Abstract the entry points to the SASL implementation
(virtual function calls)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] branch master updated: PROTON-2292: backout tsan suppression. Apply fix to forced shutdown code path.
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
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(>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(>timer_manager);
pn_collector_free(p->collector);
pmutex_finalize(>tslot_mutex);
pmutex_finalize(>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
[qpid-broker-j] branch master updated: QPID-8485: [Broker-J] Upgrade guava to version 30.0-jre
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/master by this push: new a30bc3f QPID-8485: [Broker-J] Upgrade guava to version 30.0-jre a30bc3f is described below commit a30bc3fccd9c076a82645ea660052f8600607519 Author: Dedeepya T AuthorDate: Mon Nov 9 16:03:20 2020 +0530 QPID-8485: [Broker-J] Upgrade guava to version 30.0-jre This closes #69 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c843cf6..ee62031 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ 7.4.5 10.14.2.0 1.2.3 -28.2-jre +30.0-jre 2.11.2 2.11.2 1.7.30 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated: QPID-8485:[Broker-J]upgrade guava version to latest
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/8.0.x by this push: new 0aed77f QPID-8485:[Broker-J]upgrade guava version to latest 0aed77f is described below commit 0aed77fbe88a4f8455c61be14ffc2d6c705404c4 Author: Dedeepya T AuthorDate: Mon Nov 9 17:18:34 2020 +0530 QPID-8485:[Broker-J]upgrade guava version to latest This closes #70 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f6e8a54..a4a34e0 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ 7.4.5 10.14.2.0 1.2.3 -28.2-jre +30.0-jre 2.11.2 2.11.2 1.7.30 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 7.1.x updated: QPID-8485:[Broker-J]Upgrade guava dependency on 7.1.x
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/7.1.x by this push: new da70544 QPID-8485:[Broker-J]Upgrade guava dependency on 7.1.x da70544 is described below commit da7054494e533742f2dc3c2612779f5bfe783cd0 Author: Dedeepya T AuthorDate: Fri Nov 6 20:21:14 2020 +0530 QPID-8485:[Broker-J]Upgrade guava dependency on 7.1.x This closes #68 --- pom.xml | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 38a3210..0ab14fe 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ 7.4.5 10.13.1.1 1.2.3 -27.0-jre +30.0-jre 2.10.5 2.10.5 1.7.26 @@ -528,19 +528,11 @@ error_prone_annotations -org.codehaus.mojo -animal-sniffer-annotations - - com.google.code.findbugs jsr305 com.google.guava -failureaccess - - -com.google.guava listenablefuture - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
