Author: rhs
Date: Tue Jun 26 15:21:52 2012
New Revision: 1354060
URL: http://svn.apache.org/viewvc?rev=1354060&view=rev
Log:
renamed pn_*_disp to pn_*_disposition
Modified:
qpid/proton/trunk/examples/broker/brokerlib.py
qpid/proton/trunk/examples/mailbox/post
qpid/proton/trunk/examples/mailbox/server
qpid/proton/trunk/proton-c/bindings/php/examples/client.php
qpid/proton/trunk/proton-c/bindings/php/examples/server.php
qpid/proton/trunk/proton-c/bindings/php/tests.php
qpid/proton/trunk/proton-c/include/proton/engine.h
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-c/src/messenger.c
qpid/proton/trunk/proton-c/src/proton.c
qpid/proton/trunk/proton-j/jproton.py
qpid/proton/trunk/tests/proton_tests/engine.py
Modified: qpid/proton/trunk/examples/broker/brokerlib.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/examples/broker/brokerlib.py?rev=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/examples/broker/brokerlib.py (original)
+++ qpid/proton/trunk/examples/broker/brokerlib.py Tue Jun 26 15:21:52 2012
@@ -204,7 +204,7 @@ class Broker:
result = {}
d = pn_unsettled_head(link)
while d:
- rdisp = pn_remote_disp(d)
+ rdisp = pn_remote_disposition(d)
result[pn_delivery_tag(d)] = rdisp
d = pn_unsettled_next(d)
return result
@@ -418,7 +418,7 @@ class Broker:
link = pn_link(delivery)
key = (pn_connection_container(connection), pn_link_name(link))
tag = pn_delivery_tag(delivery)
- rdisp = pn_remote_disp(delivery)
+ rdisp = pn_remote_disposition(delivery)
if pn_is_sender(link):
source = self.sources[key]
if pn_remote_settled(delivery) or rdisp:
@@ -429,7 +429,7 @@ class Broker:
pn_clear(delivery)
elif pn_remote_settled(delivery): # XXX: and not transactional
target = self.targets[key]
- state = target.settle(tag, pn_local_disp(delivery))
+ state = target.settle(tag, pn_local_disposition(delivery))
pn_disposition(delivery, state)
pn_settle(delivery)
else:
Modified: qpid/proton/trunk/examples/mailbox/post
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/examples/mailbox/post?rev=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/examples/mailbox/post (original)
+++ qpid/proton/trunk/examples/mailbox/post Tue Jun 26 15:21:52 2012
@@ -117,7 +117,7 @@ class PostClient(object):
_next = pn_unsettled_next(d)
# if the remote has either settled this delivery OR set the
# disposition, we consider the message received.
- disp = pn_remote_disp(d)
+ disp = pn_remote_disposition(d)
if disp and disp != PN_ACCEPTED:
print("Warning: message was not accepted by the remote!")
if disp or pn_remote_settled(d):
Modified: qpid/proton/trunk/examples/mailbox/server
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/examples/mailbox/server?rev=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/examples/mailbox/server (original)
+++ qpid/proton/trunk/examples/mailbox/server Tue Jun 26 15:21:52 2012
@@ -247,8 +247,8 @@ class MailboxServer(object):
if pn_updated(delivery):
# check to see if the remote has accepted message we sent
self.log("remote disposition for %s: %s " %
(str(pn_delivery_tag(delivery)),
-
str(pn_remote_disp(delivery))))
- if pn_remote_disp(delivery):
+
str(pn_remote_disposition(delivery))))
+ if pn_remote_disposition(delivery):
# once we know the remote has seen the message, we can
# release the delivery.
pn_settle(delivery)
Modified: qpid/proton/trunk/proton-c/bindings/php/examples/client.php
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/examples/client.php?rev=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/examples/client.php (original)
+++ qpid/proton/trunk/proton-c/bindings/php/examples/client.php Tue Jun 26
15:21:52 2012
@@ -87,8 +87,8 @@ $handler = function($c) {
if (pn_updated($delivery)) {
// the disposition was updated, let's report it and settle the delivery
print "disposition for $tag: " .
- pn_local_disp($delivery) . " " .
- pn_remote_disp($delivery) . "\n";
+ pn_local_disposition($delivery) . " " .
+ pn_remote_disposition($delivery) . "\n";
// we could clear the updated flag if we didn't want to settle
// pn_clear($delivery);
pn_settle($delivery);
Modified: qpid/proton/trunk/proton-c/bindings/php/examples/server.php
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/examples/server.php?rev=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/examples/server.php (original)
+++ qpid/proton/trunk/proton-c/bindings/php/examples/server.php Tue Jun 26
15:21:52 2012
@@ -130,7 +130,7 @@ $handler = function($c) {
if (pn_updated($delivery)) {
// the disposition was updated, let's report it and settle the delivery
- print("disposition for $tag: " . pn_remote_disp($delivery) . "\n");
+ print("disposition for $tag: " . pn_remote_disposition($delivery) .
"\n");
// we could clear the updated flag if we didn't want to settle
// pn_clear($delivery);
pn_settle($delivery);
Modified: qpid/proton/trunk/proton-c/bindings/php/tests.php
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/tests.php?rev=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/tests.php (original)
+++ qpid/proton/trunk/proton-c/bindings/php/tests.php Tue Jun 26 15:21:52 2012
@@ -94,7 +94,7 @@ pn_disposition($rd, PN_ACCEPTED);
pump($t1, $t2);
-// assert pn_remote_disp(sd) == pn_local_disp(rd) == PN_ACCEPTED
+// assert pn_remote_disposition(sd) == pn_local_disposition(rd) ==
PN_ACCEPTED
// assert pn_updated(sd)
pn_disposition($sd, PN_ACCEPTED);
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=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/engine.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/engine.h Tue Jun 26 15:21:52 2012
@@ -277,8 +277,8 @@ ssize_t pn_recv(pn_link_t *receiver, cha
pn_delivery_tag_t pn_delivery_tag(pn_delivery_t *delivery);
pn_link_t *pn_link(pn_delivery_t *delivery);
// how do we do delivery state?
-int pn_local_disp(pn_delivery_t *delivery);
-int pn_remote_disp(pn_delivery_t *delivery);
+int pn_local_disposition(pn_delivery_t *delivery);
+int pn_remote_disposition(pn_delivery_t *delivery);
bool pn_remote_settled(pn_delivery_t *delivery);
size_t pn_pending(pn_delivery_t *delivery);
bool pn_writable(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=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Tue Jun 26 15:21:52 2012
@@ -1892,12 +1892,12 @@ pn_link_t *pn_link(pn_delivery_t *delive
return delivery->link;
}
-int pn_local_disp(pn_delivery_t *delivery)
+int pn_local_disposition(pn_delivery_t *delivery)
{
return delivery->local_state;
}
-int pn_remote_disp(pn_delivery_t *delivery)
+int pn_remote_disposition(pn_delivery_t *delivery)
{
return delivery->remote_state;
}
Modified: qpid/proton/trunk/proton-c/src/messenger.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger.c?rev=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/messenger.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger.c Tue Jun 26 15:21:52 2012
@@ -439,7 +439,7 @@ bool pn_messenger_sent(pn_messenger_t *m
if (pn_is_sender(link)) {
pn_delivery_t *d = pn_unsettled_head(link);
while (d) {
- if (pn_remote_disp(d) || pn_remote_settled(d)) {
+ if (pn_remote_disposition(d) || pn_remote_settled(d)) {
pn_settle(d);
} else {
return false;
Modified: qpid/proton/trunk/proton-c/src/proton.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/proton.c?rev=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/proton.c (original)
+++ qpid/proton/trunk/proton-c/src/proton.c Tue Jun 26 15:21:52 2012
@@ -281,7 +281,7 @@ void server_callback(pn_connector_t *cto
}
if (pn_updated(delivery)) {
- if (!ctx->quiet) printf("disposition for %s: %u\n", tagstr,
pn_remote_disp(delivery));
+ if (!ctx->quiet) printf("disposition for %s: %u\n", tagstr,
pn_remote_disposition(delivery));
pn_settle(delivery);
}
@@ -439,7 +439,7 @@ void client_callback(pn_connector_t *cto
}
if (pn_updated(delivery)) {
- if (!ctx->quiet) printf("disposition for %s: %u\n", tagstr,
pn_remote_disp(delivery));
+ if (!ctx->quiet) printf("disposition for %s: %u\n", tagstr,
pn_remote_disposition(delivery));
pn_clear(delivery);
pn_settle(delivery);
if (!--ctx->send_count) {
Modified: qpid/proton/trunk/proton-j/jproton.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/jproton.py?rev=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/jproton.py (original)
+++ qpid/proton/trunk/proton-j/jproton.py Tue Jun 26 15:21:52 2012
@@ -195,11 +195,11 @@ def pn_disposition(d, p):
if p == PN_ACCEPTED:
d.disposition(Accepted.getInstance())
-def pn_remote_disp(d):
+def pn_remote_disposition(d):
if(d.getRemoteState() == Accepted.getInstance()):
return PN_ACCEPTED
-def pn_local_disp(d):
+def pn_local_disposition(d):
if(d.getLocalState() == Accepted.getInstance()):
return PN_ACCEPTED
Modified: qpid/proton/trunk/tests/proton_tests/engine.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/engine.py?rev=1354060&r1=1354059&r2=1354060&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton_tests/engine.py (original)
+++ qpid/proton/trunk/tests/proton_tests/engine.py Tue Jun 26 15:21:52 2012
@@ -449,8 +449,8 @@ class TransferTest(Test):
self.pump()
- rdisp = pn_remote_disp(sd)
- ldisp = pn_local_disp(rd)
+ rdisp = pn_remote_disposition(sd)
+ ldisp = pn_local_disposition(rd)
assert rdisp == ldisp == PN_ACCEPTED, (rdisp, ldisp)
assert pn_updated(sd)
@@ -459,7 +459,7 @@ class TransferTest(Test):
self.pump()
- assert pn_local_disp(sd) == pn_remote_disp(rd) == PN_ACCEPTED
+ assert pn_local_disposition(sd) == pn_remote_disposition(rd) == PN_ACCEPTED
class CreditTest(Test):
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
