Merge branch 'proton-j-reactor'
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/92eb75e8 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/92eb75e8 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/92eb75e8 Branch: refs/heads/master Commit: 92eb75e8d53726642c5cfcde90f3a6b9e6e1c402 Parents: e4c99b9 cd42324 Author: Rafael Schloming <r...@alum.mit.edu> Authored: Sun Jul 5 19:32:49 2015 -0400 Committer: Rafael Schloming <r...@alum.mit.edu> Committed: Sun Jul 5 19:32:49 2015 -0400 ---------------------------------------------------------------------- examples/java/reactor/.gitignore | 1 + examples/java/reactor/README.md | 55 ++ examples/java/reactor/pom.xml | 41 ++ examples/java/reactor/run | 4 + .../apache/qpid/proton/example/reactor/Cat.java | 95 ++++ .../proton/example/reactor/CountRandomly.java | 104 ++++ .../qpid/proton/example/reactor/Counter.java | 81 +++ .../qpid/proton/example/reactor/Delegates.java | 68 +++ .../qpid/proton/example/reactor/Echo.java | 90 +++ .../example/reactor/EchoInputStreamWrapper.java | 76 +++ .../proton/example/reactor/GlobalLogger.java | 114 ++++ .../proton/example/reactor/GoodbyeWorld.java | 62 ++ .../qpid/proton/example/reactor/HelloWorld.java | 60 ++ .../proton/example/reactor/ReactorLogger.java | 103 ++++ .../qpid/proton/example/reactor/Recv.java | 79 +++ .../qpid/proton/example/reactor/Scheduling.java | 60 ++ .../qpid/proton/example/reactor/Send.java | 142 +++++ .../qpid/proton/example/reactor/Unhandled.java | 46 ++ pom.xml | 1 + proton-c/src/reactor/connection.c | 2 + proton-c/src/tests/reactor.c | 8 +- proton-j/CMakeLists.txt | 2 +- .../java/org/apache/qpid/proton/Proton.java | 20 +- .../apache/qpid/proton/engine/BaseHandler.java | 45 ++ .../apache/qpid/proton/engine/Collector.java | 1 + .../apache/qpid/proton/engine/Connection.java | 9 +- .../org/apache/qpid/proton/engine/Delivery.java | 2 +- .../org/apache/qpid/proton/engine/Endpoint.java | 3 +- .../org/apache/qpid/proton/engine/Event.java | 14 +- .../apache/qpid/proton/engine/Extendable.java | 34 ++ .../org/apache/qpid/proton/engine/Handler.java | 18 + .../qpid/proton/engine/HandlerException.java | 39 ++ .../org/apache/qpid/proton/engine/Link.java | 2 +- .../org/apache/qpid/proton/engine/Record.java | 36 ++ .../qpid/proton/engine/impl/CollectorImpl.java | 10 +- .../qpid/proton/engine/impl/ConnectionImpl.java | 32 +- .../qpid/proton/engine/impl/DeliveryImpl.java | 7 + .../qpid/proton/engine/impl/EndpointImpl.java | 7 + .../qpid/proton/engine/impl/EventImpl.java | 296 +++++++--- .../qpid/proton/engine/impl/LinkImpl.java | 26 +- .../qpid/proton/engine/impl/RecordImpl.java | 54 ++ .../qpid/proton/engine/impl/SessionImpl.java | 12 +- .../qpid/proton/engine/impl/TransportImpl.java | 33 +- .../qpid/proton/message/impl/MessageImpl.java | 20 + .../apache/qpid/proton/reactor/Acceptor.java | 30 + .../qpid/proton/reactor/FlowController.java | 72 +++ .../apache/qpid/proton/reactor/Handshaker.java | 72 +++ .../org/apache/qpid/proton/reactor/Reactor.java | 96 ++++ .../qpid/proton/reactor/ReactorChild.java | 28 + .../apache/qpid/proton/reactor/Selectable.java | 97 ++++ .../apache/qpid/proton/reactor/Selector.java | 43 ++ .../org/apache/qpid/proton/reactor/Task.java | 32 ++ .../qpid/proton/reactor/impl/AcceptorImpl.java | 138 +++++ .../org/apache/qpid/proton/reactor/impl/IO.java | 44 ++ .../qpid/proton/reactor/impl/IOHandler.java | 342 +++++++++++ .../apache/qpid/proton/reactor/impl/IOImpl.java | 52 ++ .../qpid/proton/reactor/impl/ReactorImpl.java | 427 ++++++++++++++ .../reactor/impl/ReactorInternalException.java | 44 ++ .../proton/reactor/impl/SelectableImpl.java | 252 +++++++++ .../qpid/proton/reactor/impl/SelectorImpl.java | 161 ++++++ .../qpid/proton/reactor/impl/TaskImpl.java | 76 +++ .../apache/qpid/proton/reactor/impl/Timer.java | 70 +++ proton-j/src/main/resources/ccodec.py | 2 +- proton-j/src/main/resources/cengine.py | 27 +- proton-j/src/main/resources/chandlers.py | 21 +- proton-j/src/main/resources/cmessage.py | 3 + proton-j/src/main/resources/cobject.py | 36 +- proton-j/src/main/resources/compat.py | 8 + proton-j/src/main/resources/cproton.py | 1 + proton-j/src/main/resources/creactor.py | 68 ++- proton-j/src/main/resources/csasl.py | 2 +- proton-j/src/main/resources/ctypes.py | 21 + .../apache/qpid/proton/reactor/ReactorTest.java | 566 +++++++++++++++++++ .../proton/reactor/impl/AcceptorImplTest.java | 87 +++ .../proton/reactor/impl/LeakTestReactor.java | 118 ++++ .../org/apache/qpid/proton/ProtonJInterop.java | 203 +++++++ tests/java/pythonTests.ignore | 1 + tests/python/proton_tests/__init__.py | 1 + tests/python/proton_tests/reactor_interop.py | 163 ++++++ 79 files changed, 5279 insertions(+), 139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/92eb75e8/proton-j/src/main/java/org/apache/qpid/proton/engine/Link.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/92eb75e8/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/92eb75e8/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/92eb75e8/proton-j/src/main/resources/cengine.py ---------------------------------------------------------------------- diff --cc proton-j/src/main/resources/cengine.py index 2d82bc4,5ecaaad..1e89220 --- a/proton-j/src/main/resources/cengine.py +++ b/proton-j/src/main/resources/cengine.py @@@ -868,11 -865,8 +865,11 @@@ class pn_transport_wrapper def pn_transport(): return wrap(Proton.transport(), pn_transport_wrapper) +def pn_transport_get_pytracer(trans): + raise Skipped() + def pn_transport_attachments(trans): - return trans.attachments + return trans.impl.attachments() def pn_transport_set_server(trans): trans.server = True; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/92eb75e8/proton-j/src/main/resources/cmessage.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/92eb75e8/proton-j/src/main/resources/csasl.py ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org