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 2016/03/19 00:07:03 UTC
[45/50] [abbrv] qpid-dispatch git commit: DISPATCH-179 - Renamed
"treatment" to "distribution" in the model
DISPATCH-179 - Renamed "treatment" to "distribution" in the model
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/7f66a61f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/7f66a61f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/7f66a61f
Branch: refs/heads/master
Commit: 7f66a61f3a0aa6f90189f27563c098bb6e2ccd8d
Parents: f0cb3ea
Author: Ted Ross <tr...@redhat.com>
Authored: Fri Mar 18 15:28:48 2016 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Fri Mar 18 15:28:48 2016 -0400
----------------------------------------------------------------------
python/qpid_dispatch/management/qdrouter.json | 2 +-
src/router_core/agent_address.c | 14 +++++++-------
tools/qdstat | 14 ++------------
3 files changed, 10 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7f66a61f/python/qpid_dispatch/management/qdrouter.json
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json
index e7d59d3..ee5fe8b 100644
--- a/python/qpid_dispatch/management/qdrouter.json
+++ b/python/qpid_dispatch/management/qdrouter.json
@@ -1035,7 +1035,7 @@
"description": "AMQP address managed by the router.",
"extends": "operationalEntity",
"attributes": {
- "treatment": {
+ "distribution": {
"type": ["flood", "multicast", "closest", "balanced", "linkBalanced"],
"description": "Forwarding treatment for the address: flood - messages delivered to all subscribers along all available paths (this will cause duplicate deliveries if there are redundant paths); multi - one copy of each message delivered to all subscribers; anyClosest - messages delivered to only the closest subscriber; anyBalanced - messages delivered to one subscriber with load balanced across subscribers; linkBalanced - for link-routing, link attaches balanced across destinations."
},
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7f66a61f/src/router_core/agent_address.c
----------------------------------------------------------------------
diff --git a/src/router_core/agent_address.c b/src/router_core/agent_address.c
index c8a1b5d..ef8145c 100644
--- a/src/router_core/agent_address.c
+++ b/src/router_core/agent_address.c
@@ -24,7 +24,7 @@
#define QDR_ADDRESS_IDENTITY 1
#define QDR_ADDRESS_TYPE 2
#define QDR_ADDRESS_KEY 3
-#define QDR_ADDRESS_TREATMENT 4
+#define QDR_ADDRESS_DISTRIBUTION 4
#define QDR_ADDRESS_IN_PROCESS 5
#define QDR_ADDRESS_SUBSCRIBER_COUNT 6
#define QDR_ADDRESS_REMOTE_COUNT 7
@@ -41,7 +41,7 @@ const char *qdr_address_columns[] =
"identity",
"type",
"key",
- "treatment",
+ "distribution",
"inProcess",
"subscriberCount",
"remoteCount",
@@ -73,12 +73,12 @@ static void qdr_insert_address_columns_CT(qdr_address_t *addr,
qd_compose_insert_string(body, "org.apache.qpid.dispatch.router.address");
break;
- case QDR_ADDRESS_TREATMENT: {
+ case QDR_ADDRESS_DISTRIBUTION: {
switch (addr->treatment) {
- case QD_TREATMENT_MULTICAST_FLOOD: qd_compose_insert_string(body, "flood"); break;
- case QD_TREATMENT_MULTICAST_ONCE: qd_compose_insert_string(body, "multi"); break;
- case QD_TREATMENT_ANYCAST_CLOSEST: qd_compose_insert_string(body, "anyClosest"); break;
- case QD_TREATMENT_ANYCAST_BALANCED: qd_compose_insert_string(body, "anyBalanced"); break;
+ case QD_TREATMENT_MULTICAST_FLOOD: qd_compose_insert_string(body, "flood"); break;
+ case QD_TREATMENT_MULTICAST_ONCE: qd_compose_insert_string(body, "multicast"); break;
+ case QD_TREATMENT_ANYCAST_CLOSEST: qd_compose_insert_string(body, "closest"); break;
+ case QD_TREATMENT_ANYCAST_BALANCED: qd_compose_insert_string(body, "balanced"); break;
case QD_TREATMENT_LINK_BALANCED: qd_compose_insert_string(body, "linkBalanced"); break;
}
break;
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7f66a61f/tools/qdstat
----------------------------------------------------------------------
diff --git a/tools/qdstat b/tools/qdstat
index 5218645..764dd72 100755
--- a/tools/qdstat
+++ b/tools/qdstat
@@ -187,16 +187,6 @@ class BusManager(Node):
outlist.append(str(i))
return outlist
- def _trt_text(self, trt):
- trt_map = {'flood' : 'flood',
- 'multi' : 'multi',
- 'anyClosest' : 'closest',
- 'anyBalanced' : 'balanced',
- 'linkBalanced' : 'linkBalanced'}
- if trt in trt_map:
- return trt_map[trt]
- return '-'
-
def displayGeneral(self):
disp = Display(prefix=" ")
heads = []
@@ -291,7 +281,7 @@ class BusManager(Node):
disp = Display(prefix=" ")
heads = []
heads.append(Header("addr"))
- heads.append(Header("treatment"))
+ heads.append(Header("distrib"))
heads.append(Header("in-proc", Header.COMMAS))
heads.append(Header("local", Header.COMMAS))
heads.append(Header("remote", Header.COMMAS))
@@ -308,7 +298,7 @@ class BusManager(Node):
for addr in objects:
row = []
row.append(self._addr_summary(addr.name))
- row.append(self._trt_text(addr.treatment))
+ row.append(addr.distribution)
row.append(addr.inProcess)
row.append(addr.subscriberCount)
row.append(addr.remoteCount)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org