You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2018/02/23 20:50:18 UTC
qpid-proton git commit: PROTON-1772: [C++ binding] Fix thread race
accessing listener_context
Repository: qpid-proton
Updated Branches:
refs/heads/master 2b51dcf56 -> 4aebd7946
PROTON-1772: [C++ binding] Fix thread race accessing listener_context
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/4aebd794
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/4aebd794
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/4aebd794
Branch: refs/heads/master
Commit: 4aebd7946a8a8dceb77d18b958daa03ae76f96f3
Parents: 2b51dcf
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Feb 23 15:49:35 2018 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Fri Feb 23 15:49:35 2018 -0500
----------------------------------------------------------------------
.../cpp/src/proactor_container_impl.cpp | 42 ++++++++++++++------
1 file changed, 30 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/4aebd794/proton-c/bindings/cpp/src/proactor_container_impl.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/proactor_container_impl.cpp b/proton-c/bindings/cpp/src/proactor_container_impl.cpp
index 15eff0a..c5f46ed 100644
--- a/proton-c/bindings/cpp/src/proactor_container_impl.cpp
+++ b/proton-c/bindings/cpp/src/proactor_container_impl.cpp
@@ -523,28 +523,41 @@ bool container::impl::handle(pn_event_t* event) {
}
case PN_LISTENER_OPEN: {
pn_listener_t* l = pn_event_listener(event);
- listener_context &lc(listener_context::get(l));
- if (lc.listen_handler_) {
+ proton::listen_handler* handler;
+ {
+ GUARD(lock_);
+ listener_context &lc(listener_context::get(l));
+ handler = lc.listen_handler_;
+ }
+ if (handler) {
listener lstnr(l);
- lc.listen_handler_->on_open(lstnr);
+ handler->on_open(lstnr);
}
return false;
}
case PN_LISTENER_ACCEPT: {
pn_listener_t* l = pn_event_listener(event);
pn_connection_t* c = pn_connection();
- listener_context &lc(listener_context::get(l));
pn_connection_set_container(c, id_.c_str());
connection_options opts = server_connection_options_;
- if (lc.listen_handler_) {
+ listen_handler* handler;
+ listener_context* lc;
+ const connection_options* options;
+ {
+ GUARD(lock_);
+ lc = &listener_context::get(l);
+ handler = lc->listen_handler_;
+ options = lc->connection_options_.get();
+ }
+ if (handler) {
listener lstr(l);
- opts.update(lc.listen_handler_->on_accept(lstr));
+ opts.update(handler->on_accept(lstr));
}
- else if (!!lc.connection_options_) opts.update(*lc.connection_options_);
+ else if (options) opts.update(*options);
// Handler applied separately
connection_context& cc = connection_context::get(c);
cc.container = &container_;
- cc.listener_context_ = &lc;
+ cc.listener_context_ = lc;
cc.handler = opts.handler();
cc.work_queue_ = new container::impl::connection_work_queue(*container_.impl_, c);
pn_transport_t* pnt = pn_transport();
@@ -555,14 +568,19 @@ bool container::impl::handle(pn_event_t* event) {
}
case PN_LISTENER_CLOSE: {
pn_listener_t* l = pn_event_listener(event);
- listener_context &lc(listener_context::get(l));
+ proton::listen_handler* handler;
+ {
+ GUARD(lock_);
+ listener_context &lc(listener_context::get(l));
+ handler = lc.listen_handler_;
+ }
listener lstnr(l);
- if (lc.listen_handler_) {
+ if (handler) {
pn_condition_t* c = pn_listener_condition(l);
if (pn_condition_is_set(c)) {
- lc.listen_handler_->on_error(lstnr, make_wrapper(c).what());
+ handler->on_error(lstnr, make_wrapper(c).what());
}
- lc.listen_handler_->on_close(lstnr);
+ handler->on_close(lstnr);
}
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org