You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2012/06/05 15:17:16 UTC
svn commit: r1346379 - in /qpid/proton/trunk: examples/brokerlib.py
proton-c/include/proton/engine.h proton-c/src/engine/engine.c
tests/proton_tests/engine.py
Author: rhs
Date: Tue Jun 5 13:17:15 2012
New Revision: 1346379
URL: http://svn.apache.org/viewvc?rev=1346379&view=rev
Log:
added pn_unsettled; made pn_settle automatically advance when settling the current delivery; allow credit to go negative
Modified:
qpid/proton/trunk/examples/brokerlib.py
qpid/proton/trunk/proton-c/include/proton/engine.h
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/tests/proton_tests/engine.py
Modified: qpid/proton/trunk/examples/brokerlib.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/examples/brokerlib.py?rev=1346379&r1=1346378&r2=1346379&view=diff
==============================================================================
--- qpid/proton/trunk/examples/brokerlib.py (original)
+++ qpid/proton/trunk/examples/brokerlib.py Tue Jun 5 13:17:15 2012
@@ -178,10 +178,11 @@ class Broker:
lnk = pn_link_head(connection, PN_LOCAL_ACTIVE | PN_REMOTE_CLOSED)
while lnk:
- if pn_is_sender(lnk):
- self.detach_sender(lnk, connection)
- else:
- self.detach_receiver(lnk, connection)
+ if not pn_unsettled(lnk):
+ if pn_is_sender(lnk):
+ self.detach_sender(lnk, connection)
+ else:
+ self.detach_receiver(lnk, connection)
lnk = pn_link_next(lnk, PN_LOCAL_ACTIVE | PN_REMOTE_CLOSED)
# XXX: need to destroy links
Modified: qpid/proton/trunk/proton-c/include/proton/engine.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/engine.h?rev=1346379&r1=1346378&r2=1346379&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/engine.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/engine.h Tue Jun 5 13:17:15 2012
@@ -253,6 +253,7 @@ bool pn_advance(pn_link_t *link);
int pn_credit(pn_link_t *link);
int pn_queued(pn_link_t *link);
+int pn_unsettled(pn_link_t *link);
pn_delivery_t *pn_unsettled_head(pn_link_t *link);
pn_delivery_t *pn_unsettled_next(pn_delivery_t *delivery);
Modified: qpid/proton/trunk/proton-c/src/engine/engine.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine.c?rev=1346379&r1=1346378&r2=1346379&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Tue Jun 5 13:17:15 2012
@@ -904,6 +904,11 @@ pn_delivery_t *pn_delivery(pn_link_t *li
return delivery;
}
+int pn_unsettled(pn_link_t *link)
+{
+ return link->unsettled_count;
+}
+
pn_delivery_t *pn_unsettled_head(pn_link_t *link)
{
return link->head;
@@ -949,21 +954,17 @@ pn_delivery_t *pn_current(pn_link_t *lin
void pn_advance_sender(pn_link_t *link)
{
- if (pn_credit(link) > 0) {
- link->current->done = true;
- link->queued++;
- link->credit--;
- pn_add_tpwork(link->current);
- link->current = link->current->link_next;
- }
+ link->current->done = true;
+ link->queued++;
+ link->credit--;
+ pn_add_tpwork(link->current);
+ link->current = link->current->link_next;
}
void pn_advance_receiver(pn_link_t *link)
{
- if (link->current) {
- link->credit--;
- link->queued--;
- }
+ link->credit--;
+ link->queued--;
link->current = link->current->link_next;
}
@@ -1003,7 +1004,6 @@ void pn_real_settle(pn_delivery_t *deliv
LL_ADD_PFX(link->settled_head, link->settled_tail, delivery, link_);
pn_clear_tag(delivery);
pn_clear_bytes(delivery);
- link->unsettled_count--;
delivery->settled = true;
}
@@ -1019,6 +1019,14 @@ void pn_full_settle(pn_delivery_buffer_t
void pn_settle(pn_delivery_t *delivery)
{
+ if (!delivery) return;
+
+ pn_link_t *link = delivery->link;
+ if (pn_is_current(delivery)) {
+ pn_advance(link);
+ }
+
+ link->unsettled_count--;
delivery->local_settled = true;
pn_add_tpwork(delivery);
pn_work_update(delivery->link->session->connection, delivery);
@@ -1573,16 +1581,16 @@ int pn_process_msg_data(pn_transport_t *
}
if (state && !state->sent && (delivery->done || delivery->size > 0) &&
- ssn_state->outgoing_window > 0) {
+ ssn_state->outgoing_window > 0 && link_state->link_credit > 0) {
if (delivery->bytes) {
pn_set_payload(transport->disp, delivery->bytes, delivery->size);
delivery->size = 0;
}
// XXX: need to handle sending settled
- int err = pn_post_frame(transport->disp, ssn_state->local_channel, "DL[IIzIno]", TRANSFER,
+ int err = pn_post_frame(transport->disp, ssn_state->local_channel, "DL[IIzIoo]", TRANSFER,
link_state->local_handle, state->id,
delivery->tag.size, delivery->tag.start,
- 0, !delivery->done);
+ 0, delivery->local_settled, !delivery->done);
if (err) return err;
ssn_state->outgoing_transfer_count++;
ssn_state->outgoing_window--;
Modified: qpid/proton/trunk/tests/proton_tests/engine.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/engine.py?rev=1346379&r1=1346378&r2=1346379&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton_tests/engine.py (original)
+++ qpid/proton/trunk/tests/proton_tests/engine.py Tue Jun 5 13:17:15 2012
@@ -478,7 +478,7 @@ class CreditTest(Test):
extra = pn_delivery(self.snd, "extra")
assert extra
- assert not pn_advance(self.snd)
+ assert pn_advance(self.snd)
self.pump()
assert pn_queued(self.rcv) == PN_SESSION_WINDOW, pn_queued(self.rcv)
@@ -549,3 +549,96 @@ class CreditTest(Test):
assert pn_advance(self.rcv)
assert not pn_current(self.rcv)
assert pn_credit(self.rcv) == 0, pn_credit(self.rcv)
+
+ def testNegative(self):
+ assert pn_credit(self.snd) == 0
+ d = pn_delivery(self.snd, "tag")
+ assert d
+ assert pn_advance(self.snd)
+ self.pump()
+
+ assert pn_credit(self.rcv) == 0
+ assert pn_queued(self.rcv) == 0
+
+ pn_flow(self.rcv, 1)
+ assert pn_credit(self.rcv) == 1
+ assert pn_queued(self.rcv) == 0
+ self.pump()
+ assert pn_credit(self.rcv) == 1
+ assert pn_queued(self.rcv) == 1
+
+ c = pn_current(self.rcv)
+ assert c
+ assert pn_delivery_tag(c) == "tag"
+ assert pn_advance(self.rcv)
+ assert pn_credit(self.rcv) == 0
+ assert pn_queued(self.rcv) == 0
+
+class SettlementTest(Test):
+
+ def setup(self):
+ self.snd, self.rcv = self.link("test-link")
+ self.c1 = pn_get_connection(pn_get_session(self.snd))
+ self.c2 = pn_get_connection(pn_get_session(self.rcv))
+ pn_link_open(self.snd)
+ pn_link_open(self.rcv)
+ self.pump()
+
+ def teardown(self):
+ self.cleanup()
+
+ def testSettleCurrent(self):
+ pn_flow(self.rcv, 10)
+ self.pump()
+
+ assert pn_credit(self.snd) == 10, pn_credit(self.snd)
+ d = pn_delivery(self.snd, "tag")
+ e = pn_delivery(self.snd, "tag2")
+ assert d
+ assert e
+ c = pn_current(self.snd)
+ assert pn_delivery_tag(c) == "tag", pn_delivery_tag(c)
+ pn_settle(c)
+ c = pn_current(self.snd)
+ assert pn_delivery_tag(c) == "tag2", pn_delivery_tag(c)
+ pn_settle(c)
+ c = pn_current(self.snd)
+ assert not c
+ self.pump()
+
+ c = pn_current(self.rcv)
+ assert c
+ assert pn_delivery_tag(c) == "tag", pn_delivery_tag(c)
+ assert pn_remote_settled(c)
+ pn_settle(c)
+ c = pn_current(self.rcv)
+ assert c
+ assert pn_delivery_tag(c) == "tag2", pn_delivery_tag(c)
+ assert pn_remote_settled(c)
+ pn_settle(c)
+ c = pn_current(self.rcv)
+ assert not c
+
+ def testUnsettled(self):
+ pn_flow(self.rcv, 10)
+ self.pump()
+
+ assert pn_unsettled(self.snd) == 0, pn_unsettled(self.snd)
+ assert pn_unsettled(self.rcv) == 0, pn_unsettled(self.rcv)
+
+ d = pn_delivery(self.snd, "tag")
+ assert d
+ assert pn_unsettled(self.snd) == 1, pn_unsettled(self.snd)
+ assert pn_unsettled(self.rcv) == 0, pn_unsettled(self.rcv)
+ assert pn_advance(self.snd)
+ self.pump()
+
+ assert pn_unsettled(self.snd) == 1, pn_unsettled(self.snd)
+ assert pn_unsettled(self.rcv) == 1, pn_unsettled(self.rcv)
+
+ c = pn_current(self.rcv)
+ assert c
+ pn_settle(c)
+
+ assert pn_unsettled(self.snd) == 1, pn_unsettled(self.snd)
+ assert pn_unsettled(self.rcv) == 0, pn_unsettled(self.rcv)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org