Author: rhs
Date: Fri Apr 20 15:48:20 2012
New Revision: 1328418
URL: http://svn.apache.org/viewvc?rev=1328418&view=rev
Log:
pn_dirty -> pn_updated; pn_clean -> pn_clear
Modified:
qpid/proton/trunk/proton-c/bindings/php/tests.php
qpid/proton/trunk/proton-c/src/engine/engine-internal.h
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-c/src/proton.c
qpid/proton/trunk/proton-c/tests/engine.py
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=1328418&r1=1328417&r2=1328418&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/tests.php (original)
+++ qpid/proton/trunk/proton-c/bindings/php/tests.php Fri Apr 20 15:48:20 2012
@@ -95,7 +95,7 @@ pn_disposition($rd, PN_ACCEPTED);
pump($t1, $t2);
// assert pn_remote_disp(sd) == pn_local_disp(rd) == PN_ACCEPTED
-// assert pn_dirty(sd)
+// assert pn_updated(sd)
pn_disposition($sd, PN_ACCEPTED);
pn_settle($sd);
Modified: qpid/proton/trunk/proton-c/src/engine/engine-internal.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine-internal.h?rev=1328418&r1=1328417&r2=1328418&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine-internal.h (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine-internal.h Fri Apr 20 15:48:20
2012
@@ -158,7 +158,7 @@ struct pn_delivery_t {
int remote_state;
bool local_settled;
bool remote_settled;
- bool dirty;
+ bool updated;
pn_delivery_t *link_next;
pn_delivery_t *link_prev;
pn_delivery_t *work_next;
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=1328418&r1=1328417&r2=1328418&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Fri Apr 20 15:48:20 2012
@@ -481,7 +481,7 @@ void pn_work_update(pn_connection_t *con
{
pn_link_t *link = pn_link(delivery);
pn_delivery_t *current = pn_current(link);
- if (delivery->dirty) {
+ if (delivery->updated) {
pn_add_work(connection, delivery);
} else if (delivery == current) {
if (link->endpoint.type == SENDER) {
@@ -839,7 +839,7 @@ pn_delivery_t *pn_delivery(pn_link_t *li
delivery->remote_state = 0;
delivery->local_settled = false;
delivery->remote_settled = false;
- delivery->dirty = false;
+ delivery->updated = false;
LL_ADD_PFX(link->head, link->tail, delivery, link_);
delivery->work_next = NULL;
delivery->work_prev = NULL;
@@ -882,10 +882,10 @@ void pn_delivery_dump(pn_delivery_t *d)
char tag[1024];
pn_format(tag, 1024, pn_from_binary(d->tag));
printf("{tag=%s, local_state=%u, remote_state=%u, local_settled=%u, "
- "remote_settled=%u, dirty=%u, current=%u, writable=%u, readable=%u, "
+ "remote_settled=%u, updated=%u, current=%u, writable=%u, readable=%u,
"
"work=%u}",
tag, d->local_state, d->remote_state, d->local_settled,
- d->remote_settled, d->dirty, pn_is_current(d), pn_writable(d),
+ d->remote_settled, d->updated, pn_is_current(d), pn_writable(d),
pn_readable(d), d->work);
}
@@ -1162,7 +1162,7 @@ void pn_do_disposition(pn_dispatcher_t *
pn_delivery_state_t *state = pn_delivery_buffer_get(deliveries, id - lwm);
pn_delivery_t *delivery = state->delivery;
delivery->remote_state = dispo;
- delivery->dirty = true;
+ delivery->updated = true;
pn_work_update(transport->connection, delivery);
}
}
@@ -1620,14 +1620,14 @@ int pn_remote_disp(pn_delivery_t *delive
return delivery->remote_state;
}
-bool pn_dirty(pn_delivery_t *delivery)
+bool pn_updated(pn_delivery_t *delivery)
{
- return delivery ? delivery->dirty : false;
+ return delivery ? delivery->updated : false;
}
-void pn_clean(pn_delivery_t *delivery)
+void pn_clear(pn_delivery_t *delivery)
{
- delivery->dirty = false;
+ delivery->updated = false;
pn_work_update(delivery->link->session->connection, delivery);
}
Modified: qpid/proton/trunk/proton-c/src/proton.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/proton.c?rev=1328418&r1=1328417&r2=1328418&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/proton.c (original)
+++ qpid/proton/trunk/proton-c/src/proton.c Fri Apr 20 15:48:20 2012
@@ -175,9 +175,9 @@ void server_callback(pn_connector_t *cto
}
}
- if (pn_dirty(delivery)) {
+ if (pn_updated(delivery)) {
printf("disposition for %s: %u\n", tagstr, pn_remote_disp(delivery));
- pn_clean(delivery);
+ pn_clear(delivery);
}
delivery = pn_work_next(delivery);
@@ -321,9 +321,9 @@ void client_callback(pn_connector_t *cto
printf("\"\n");
}
- if (pn_dirty(delivery)) {
+ if (pn_updated(delivery)) {
printf("disposition for %s: %u\n", tagstr, pn_remote_disp(delivery));
- pn_clean(delivery);
+ pn_clear(delivery);
pn_settle(delivery);
if (!--ctx->send_count) {
pn_link_close(link);
Modified: qpid/proton/trunk/proton-c/tests/engine.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/tests/engine.py?rev=1328418&r1=1328417&r2=1328418&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/tests/engine.py (original)
+++ qpid/proton/trunk/proton-c/tests/engine.py Fri Apr 20 15:48:20 2012
@@ -378,7 +378,7 @@ class TransferTest(Test):
self.pump()
assert pn_remote_disp(sd) == pn_local_disp(rd) == PN_ACCEPTED
- assert pn_dirty(sd)
+ assert pn_updated(sd)
pn_disposition(sd, PN_ACCEPTED)
pn_settle(sd)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
