This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to tag 1.2.0-NFV
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit dbc0e99d0c684775175b4f97c27859d13db2ba94
Author: Ganesh Murthy <gmur...@redhat.com>
AuthorDate: Thu Sep 6 12:05:12 2018 -0400
Added log info messages when links and addresses are added/removed
---
src/router_core/connections.c | 20 ++++++++++++++++----
src/router_core/route_control.c | 1 +
src/router_core/route_tables.c | 8 +++++++-
src/router_core/transfer.c | 8 ++++++--
4 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/router_core/connections.c b/src/router_core/connections.c
index 721c1a7..a7a96e6 100644
--- a/src/router_core/connections.c
+++ b/src/router_core/connections.c
@@ -710,8 +710,10 @@ static void qdr_link_cleanup_deliveries_CT(qdr_core_t
*core, qdr_connection_t *c
dlv->tracking_addr->outstanding_deliveries[dlv->tracking_addr_bit]--;
dlv->tracking_addr->tracked_deliveries--;
- if (dlv->tracking_addr->tracked_deliveries == 0)
+ if (dlv->tracking_addr->tracked_deliveries == 0) {
+ qd_log(core->log, QD_LOG_INFO,
"************qdr_link_cleanup_deliveries_CT address is being
removed*****************");
qdr_check_addr_CT(core, dlv->tracking_addr, false);
+ }
dlv->tracking_addr = 0;
}
@@ -1041,6 +1043,7 @@ void qdr_check_addr_CT(qdr_core_t *core, qdr_address_t
*addr, bool was_local)
//
if (was_local && DEQ_SIZE(addr->rlinks) == 0) {
const char *key = (const char*)
qd_hash_key_by_handle(addr->hash_handle);
+ qd_log(core->log, QD_LOG_INFO, "************qdr_check_addr_CT Mobile
address %s is being removed*****************", key);
if (key && *key == 'M')
qdr_post_mobile_removed_CT(core, key);
}
@@ -1052,6 +1055,7 @@ void qdr_check_addr_CT(qdr_core_t *core, qdr_address_t
*addr, bool was_local)
if (DEQ_SIZE(addr->subscriptions) == 0 && DEQ_SIZE(addr->rlinks) == 0 &&
DEQ_SIZE(addr->inlinks) == 0 &&
qd_bitmask_cardinality(addr->rnodes) == 0 && addr->ref_count == 0 &&
!addr->block_deletion &&
addr->tracked_deliveries == 0) {
+ qd_log(core->log, QD_LOG_INFO, "************qdr_check_addr_CT Removing
address from coore by calling qdr_core_remove_address****************");
qdr_core_remove_address(core, addr);
}
}
@@ -1564,10 +1568,13 @@ static void qdr_link_inbound_first_attach_CT(qdr_core_t
*core, qdr_action_t *act
//
link->owning_addr = addr;
qdr_add_link_ref(&addr->rlinks, link,
QDR_LINK_LIST_CLASS_ADDRESS);
+ qd_log(core->log, QD_LOG_INFO,
"************qdr_link_inbound_first_attach_CT adding rlink to rlinks");
if (DEQ_SIZE(addr->rlinks) == 1) {
const char *key = (const char*)
qd_hash_key_by_handle(addr->hash_handle);
- if (key && *key == 'M')
+ if (key && *key == 'M') {
+ qd_log(core->log, QD_LOG_INFO,
"************qdr_link_inbound_first_attach_CT DEQ_SIZE(addr->rlinks) == 1
Mobile address %s is being added*****************", key);
qdr_post_mobile_added_CT(core, key);
+ }
qdr_addr_start_inlinks_CT(core, addr);
}
qdr_link_outbound_second_attach_CT(core, link, source, target);
@@ -1667,8 +1674,10 @@ static void qdr_link_inbound_second_attach_CT(qdr_core_t
*core, qdr_action_t *ac
link->owning_addr = link->auto_link->addr;
if (DEQ_SIZE(link->auto_link->addr->rlinks) == 1) {
const char *key = (const char*)
qd_hash_key_by_handle(link->auto_link->addr->hash_handle);
- if (key && *key == 'M')
+ if (key && *key == 'M') {
+ qd_log(core->log, QD_LOG_INFO,
"************qdr_link_inbound_second_attach_CT Mobile address %s is being
added*****************", key);
qdr_post_mobile_added_CT(core, key);
+ }
qdr_addr_start_inlinks_CT(core, link->auto_link->addr);
}
}
@@ -1783,6 +1792,7 @@ static void qdr_link_inbound_detach_CT(qdr_core_t *core,
qdr_action_t *action, b
switch (link->link_type) {
case QD_LINK_ENDPOINT:
if (addr) {
+ qd_log(core->log, QD_LOG_INFO,
"************qdr_link_inbound_detach_CT removing rlink case
QD_LINK_ENDPOINT:*****************");
qdr_del_link_ref(&addr->rlinks, link,
QDR_LINK_LIST_CLASS_ADDRESS);
was_local = true;
}
@@ -1823,8 +1833,10 @@ static void qdr_link_inbound_detach_CT(qdr_core_t *core,
qdr_action_t *action, b
// If there was an address associated with this link, check to see if any
address-related
// cleanup has to be done.
//
- if (addr)
+ if (addr) {
+ qd_log(core->log, QD_LOG_INFO, "************qdr_link_inbound_detach_CT
address is being removed*****************");
qdr_check_addr_CT(core, addr, was_local);
+ }
if (error)
qdr_error_free(error);
diff --git a/src/router_core/route_control.c b/src/router_core/route_control.c
index 53c0b53..9307792 100644
--- a/src/router_core/route_control.c
+++ b/src/router_core/route_control.c
@@ -213,6 +213,7 @@ static void qdr_link_route_deactivate_CT(qdr_core_t *core,
qdr_link_route_t *lr,
if (DEQ_IS_EMPTY(lr->addr->conns)) {
char *address = qdr_link_route_pattern_to_address(lr->pattern,
lr->dir);
qd_log(core->log, QD_LOG_TRACE, "Deactivating link route pattern
[%s]", address);
+ qd_log(core->log, QD_LOG_INFO,
"************qdr_link_route_deactivate_CT Mobile address %s is being
removed*****************", address);
qdr_post_mobile_removed_CT(core, address);
free(address);
}
diff --git a/src/router_core/route_tables.c b/src/router_core/route_tables.c
index 2f7dd54..3b0843f 100644
--- a/src/router_core/route_tables.c
+++ b/src/router_core/route_tables.c
@@ -397,6 +397,9 @@ static void qdr_del_router_CT(qdr_core_t *core,
qdr_action_t *action, bool disca
// Check the address and free it if there are no other interested parties
tracking it
//
oaddr->block_deletion = false;
+
+ qd_log(core->log, QD_LOG_INFO, "************qdr_del_router_CT address is
being removed*****************");
+
qdr_check_addr_CT(core, oaddr, false);
}
@@ -645,7 +648,7 @@ static void qdr_unmap_destination_CT(qdr_core_t *core,
qdr_action_t *action, boo
//
// TODO - If this affects a waypoint, create the proper side effects
//
-
+ qd_log(core->log, QD_LOG_INFO, "************qdr_unmap_destination_CT
address is being removed*****************");
qdr_check_addr_CT(core, addr, false);
} while (false);
@@ -701,6 +704,7 @@ static void qdr_unsubscribe_CT(qdr_core_t *core,
qdr_action_t *action, bool disc
if (!discard) {
DEQ_REMOVE(sub->addr->subscriptions, sub);
sub->addr = 0;
+ qd_log(core->log, QD_LOG_INFO, "************qdr_unsubscribe_CT address
is being removed*****************");
qdr_check_addr_CT(sub->core, sub->addr, false);
}
@@ -715,6 +719,7 @@ static void qdr_do_mobile_added(qdr_core_t *core,
qdr_general_work_t *work)
{
char *address_hash = qdr_field_copy(work->field);
if (address_hash) {
+ qd_log(core->log, QD_LOG_INFO, "Actually adding address %s in
qdr_do_mobile_added", address_hash);
core->rt_mobile_added(core->rt_context, address_hash);
free(address_hash);
}
@@ -727,6 +732,7 @@ static void qdr_do_mobile_removed(qdr_core_t *core,
qdr_general_work_t *work)
{
char *address_hash = qdr_field_copy(work->field);
if (address_hash) {
+ qd_log(core->log, QD_LOG_INFO, "Actually removing address %s in
qdr_do_mobile_removed", address_hash);
core->rt_mobile_removed(core->rt_context, address_hash);
free(address_hash);
}
diff --git a/src/router_core/transfer.c b/src/router_core/transfer.c
index 5ee4ae3..1cc5f6d 100644
--- a/src/router_core/transfer.c
+++ b/src/router_core/transfer.c
@@ -488,8 +488,10 @@ bool qdr_delivery_settled_CT(qdr_core_t *core,
qdr_delivery_t *dlv)
dlv->tracking_addr->outstanding_deliveries[dlv->tracking_addr_bit]--;
dlv->tracking_addr->tracked_deliveries--;
- if (dlv->tracking_addr->tracked_deliveries == 0)
+ if (dlv->tracking_addr->tracked_deliveries == 0) {
+ qd_log(core->log, QD_LOG_INFO,
"************qdr_delivery_settled_CT *****************");
qdr_check_addr_CT(core, dlv->tracking_addr, false);
+ }
dlv->tracking_addr = 0;
}
@@ -532,8 +534,10 @@ static void qdr_delete_delivery_internal_CT(qdr_core_t
*core, qdr_delivery_t *de
delivery->tracking_addr->outstanding_deliveries[delivery->tracking_addr_bit]--;
delivery->tracking_addr->tracked_deliveries--;
- if (delivery->tracking_addr->tracked_deliveries == 0)
+ if (delivery->tracking_addr->tracked_deliveries == 0) {
+ qd_log(core->log, QD_LOG_INFO,
"************qdr_delete_delivery_internal_CT *****************");
qdr_check_addr_CT(core, delivery->tracking_addr, false);
+ }
delivery->tracking_addr = 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
