qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject [3/4] qpid-proton git commit: PROTON-1734: Doc changes only
Date Thu, 22 Feb 2018 20:12:08 GMT
PROTON-1734: Doc changes only


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/093355f6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/093355f6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/093355f6

Branch: refs/heads/master
Commit: 093355f604d0b3503f6627cb2f28022af0ef851b
Parents: bbc83aa
Author: Alan Conway <aconway@redhat.com>
Authored: Mon Jan 8 12:10:05 2018 -0500
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Thu Feb 22 10:40:15 2018 -0500

----------------------------------------------------------------------
 proton-c/bindings/cpp/include/proton/container.hpp |  3 +--
 proton-c/include/proton/proactor.h                 | 15 ++++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/093355f6/proton-c/bindings/cpp/include/proton/container.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/container.hpp b/proton-c/bindings/cpp/include/proton/container.hpp
index 9733f78..c6a876c 100644
--- a/proton-c/bindings/cpp/include/proton/container.hpp
+++ b/proton-c/bindings/cpp/include/proton/container.hpp
@@ -190,8 +190,7 @@ class PN_CPP_CLASS_EXTERN container {
     ///
     /// When the process is complete, `run()` returns in all threads.
     ///
-    /// **Thread safety** - It is safe to call this method across
-    /// threads.
+    /// **Thread safety** - It is safe to call this method in any thread.
     PN_CPP_EXTERN void stop();
 
     /// Open a connection and sender for `addr_url`.

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/093355f6/proton-c/include/proton/proactor.h
----------------------------------------------------------------------
diff --git a/proton-c/include/proton/proactor.h b/proton-c/include/proton/proactor.h
index 3e47d99..be20ff1 100644
--- a/proton-c/include/proton/proactor.h
+++ b/proton-c/include/proton/proactor.h
@@ -161,13 +161,14 @@ PNP_EXTERN void pn_proactor_listen(pn_proactor_t *proactor, pn_listener_t
*liste
  * @ref PN_LISTENER_CLOSE, @ref PN_TRANSPORT_CLOSED and other @ref proactor_events are
  * generated as usual.
  *
- * If no new listeners or connections are created, then a @ref
- * PN_PROACTOR_INACTIVE event will be generated when all connections and
- * listeners are disconnected and no timeout is pending - see
- * pn_proactor_set_timeout() pn_proactor_cancel_timeout()
- *
- * Note the proactor remains active, connections and listeners created after a call to
- * pn_proactor_disconnect() are not affected by it.
+ * A @ref PN_PROACTOR_INACTIVE event will be generated when all connections and
+ * listeners are disconnected and no timeout is pending. The event will also be
+ * generated if there are no listeners, connections or timeout when
+ * pn_proactor_disconnect() is called.
+ *
+ * Creating new connections and listeners after this call and before the
+ * PN_PROACTOR_INACTIVE event may prevent the proactor from becoming inactive.
+ * After the PN_PROACTOR_INACTIVE event, the proactor can be used normally.
  *
  * @note Thread-safe
  *


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message