You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/09/19 11:58:58 UTC
svn commit: r1626165 - in /qpid/proton/trunk/proton-c/src:
engine/engine-internal.h engine/engine.c transport/transport.c
Author: gsim
Date: Fri Sep 19 09:58:57 2014
New Revision: 1626165
URL: http://svn.apache.org/r1626165
Log:
PROTON-688: reset transport state on unbind
Modified:
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/transport/transport.c
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=1626165&r1=1626164&r2=1626165&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine-internal.h (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine-internal.h Fri Sep 19 09:58:57 2014
@@ -313,6 +313,8 @@ void pn_work_update(pn_connection_t *con
void pn_clear_modified(pn_connection_t *connection, pn_endpoint_t *endpoint);
void pn_connection_unbound(pn_connection_t *conn);
int pn_do_error(pn_transport_t *transport, const char *condition, const char *fmt, ...);
+void pn_session_unbound(pn_session_t* ssn);
+void pn_link_unbound(pn_link_t* link);
void pni_close_tail(pn_transport_t *transport);
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=1626165&r1=1626164&r2=1626165&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Fri Sep 19 09:58:57 2014
@@ -746,6 +746,17 @@ pn_session_t *pn_session(pn_connection_t
return ssn;
}
+void pn_session_unbound(pn_session_t* ssn)
+{
+ assert(ssn);
+ ssn->state.local_channel = (uint16_t)-1;
+ ssn->state.remote_channel = (uint16_t)-1;
+ ssn->incoming_bytes = 0;
+ ssn->outgoing_bytes = 0;
+ ssn->incoming_deliveries = 0;
+ ssn->outgoing_deliveries = 0;
+}
+
size_t pn_session_get_incoming_capacity(pn_session_t *ssn)
{
assert(ssn);
@@ -862,6 +873,15 @@ pn_link_t *pn_link_new(int type, pn_sess
return link;
}
+void pn_link_unbound(pn_link_t* link)
+{
+ assert(link);
+ link->state.local_handle = -1;
+ link->state.remote_handle = -1;
+ link->state.delivery_count = 0;
+ link->state.link_credit = 0;
+}
+
pn_terminus_t *pn_link_source(pn_link_t *link)
{
return link ? &link->source : NULL;
Modified: qpid/proton/trunk/proton-c/src/transport/transport.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/transport/transport.c?rev=1626165&r1=1626164&r2=1626165&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/transport/transport.c (original)
+++ qpid/proton/trunk/proton-c/src/transport/transport.c Fri Sep 19 09:58:57 2014
@@ -89,6 +89,7 @@ void pn_delivery_map_clear(pn_delivery_m
pn_delivery_t *dlv = (pn_delivery_t *) pn_hash_value(hash, entry);
pn_delivery_map_del(dm, dlv);
}
+ dm->next = 0;
}
static ssize_t pn_input_read_amqp_header(pn_io_layer_t *io_layer, const char *bytes, size_t available);
@@ -190,12 +191,12 @@ static void pni_map_remote_channel(pn_se
session->state.remote_channel = channel;
}
-void pni_transport_unbind_handles(pn_hash_t *handles);
+void pni_transport_unbind_handles(pn_hash_t *handles, bool reset_state);
static void pni_unmap_remote_channel(pn_session_t *ssn)
{
// XXX: should really update link state also
- pni_transport_unbind_handles(ssn->state.remote_handles);
+ pni_transport_unbind_handles(ssn->state.remote_handles, false);
pn_transport_t *transport = ssn->connection->transport;
uint16_t channel = ssn->state.remote_channel;
ssn->state.remote_channel = -2;
@@ -286,10 +287,14 @@ int pn_transport_bind(pn_transport_t *tr
return 0;
}
-void pni_transport_unbind_handles(pn_hash_t *handles)
+void pni_transport_unbind_handles(pn_hash_t *handles, bool reset_state)
{
for (pn_handle_t h = pn_hash_head(handles); h; h = pn_hash_next(handles, h)) {
uintptr_t key = pn_hash_key(handles, h);
+ if (reset_state) {
+ pn_link_t *link = (pn_link_t *) pn_hash_value(handles, h);
+ pn_link_unbound(link);
+ }
pn_hash_del(handles, key);
}
}
@@ -299,8 +304,9 @@ void pni_transport_unbind_channels(pn_ha
for (pn_handle_t h = pn_hash_head(channels); h; h = pn_hash_next(channels, h)) {
uintptr_t key = pn_hash_key(channels, h);
pn_session_t *ssn = (pn_session_t *) pn_hash_value(channels, h);
- pni_transport_unbind_handles(ssn->state.local_handles);
- pni_transport_unbind_handles(ssn->state.remote_handles);
+ pni_transport_unbind_handles(ssn->state.local_handles, true);
+ pni_transport_unbind_handles(ssn->state.remote_handles, true);
+ pn_session_unbound(ssn);
pn_hash_del(channels, key);
}
}
@@ -1661,7 +1667,7 @@ bool pn_pointful_buffering(pn_transport_
static void pni_unmap_local_channel(pn_session_t *ssn) {
// XXX: should really update link state also
- pni_transport_unbind_handles(ssn->state.local_handles);
+ pni_transport_unbind_handles(ssn->state.local_handles, false);
pn_transport_t *transport = ssn->connection->transport;
pn_session_state_t *state = &ssn->state;
uintptr_t channel = state->local_channel;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org