You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2017/01/06 22:02:00 UTC
qpid-dispatch git commit: DISPATCH-604 - Removed conflicting
identites for connections. Use the one assigned by the container module so
the identity matches trace logs.
Repository: qpid-dispatch
Updated Branches:
refs/heads/master ba6aacb95 -> 1f8422095
DISPATCH-604 - Removed conflicting identites for connections. Use the one assigned by the
container module so the identity matches trace logs.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/1f842209
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/1f842209
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/1f842209
Branch: refs/heads/master
Commit: 1f84220953098e2f837245c5e8b3ac2bd373922f
Parents: ba6aacb
Author: Ted Ross <tr...@redhat.com>
Authored: Fri Jan 6 17:00:03 2017 -0500
Committer: Ted Ross <tr...@redhat.com>
Committed: Fri Jan 6 17:00:03 2017 -0500
----------------------------------------------------------------------
src/router_core/agent_link.c | 7 +++++--
src/router_core/connections.c | 3 +--
src/router_core/router_core_private.h | 1 -
tools/qdstat | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1f842209/src/router_core/agent_link.c
----------------------------------------------------------------------
diff --git a/src/router_core/agent_link.c b/src/router_core/agent_link.c
index 98edcd2..fca63c0 100644
--- a/src/router_core/agent_link.c
+++ b/src/router_core/agent_link.c
@@ -150,9 +150,12 @@ static void qdr_agent_write_column_CT(qd_composed_field_t *body, int col, qdr_li
qd_compose_insert_ulong(body, link->total_deliveries);
break;
- case QDR_LINK_CONNECTION_ID:
- qd_compose_insert_ulong(body, link->conn->management_id);
+ case QDR_LINK_CONNECTION_ID: {
+ char id[100];
+ snprintf(id, 100, "%"PRId64, link->conn->identity);
+ qd_compose_insert_string(body, id);
break;
+ }
case QDR_LINK_ADMIN_STATE:
text = link->admin_enabled ? "enabled" : "disabled";
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1f842209/src/router_core/connections.c
----------------------------------------------------------------------
diff --git a/src/router_core/connections.c b/src/router_core/connections.c
index ecb8cea..ad2194f 100644
--- a/src/router_core/connections.c
+++ b/src/router_core/connections.c
@@ -73,7 +73,7 @@ qdr_connection_t *qdr_connection_opened(qdr_core_t *core,
qdr_connection_t *conn = new_qdr_connection_t();
ZERO(conn);
- conn->identity = qdr_identifier(core);
+ conn->identity = management_id;
conn->connection_info = connection_info;
conn->core = core;
conn->user_context = 0;
@@ -83,7 +83,6 @@ qdr_connection_t *qdr_connection_opened(qdr_core_t *core,
conn->strip_annotations_in = strip_annotations_in;
conn->strip_annotations_out = strip_annotations_out;
conn->link_capacity = link_capacity;
- conn->management_id = management_id;
conn->mask_bit = -1;
DEQ_INIT(conn->links);
DEQ_INIT(conn->work_list);
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1f842209/src/router_core/router_core_private.h
----------------------------------------------------------------------
diff --git a/src/router_core/router_core_private.h b/src/router_core/router_core_private.h
index 44fc5ce..d032256 100644
--- a/src/router_core/router_core_private.h
+++ b/src/router_core/router_core_private.h
@@ -475,7 +475,6 @@ struct qdr_connection_t {
bool strip_annotations_out;
int link_capacity;
int mask_bit;
- uint64_t management_id; // A unique identifier for the qdr_connection_t copied over from qd_connection_t.
qdr_connection_work_list_t work_list;
sys_mutex_t *work_lock;
qdr_link_ref_list_t links;
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1f842209/tools/qdstat
----------------------------------------------------------------------
diff --git a/tools/qdstat b/tools/qdstat
index 0380051..b8ae9dc 100755
--- a/tools/qdstat
+++ b/tools/qdstat
@@ -128,7 +128,7 @@ class BusManager(Node):
def displayConnections(self):
disp = Display(prefix=" ")
heads = []
- heads.append(Header("Id"))
+ heads.append(Header("id"))
heads.append(Header("host"))
heads.append(Header("container"))
heads.append(Header("role"))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org