You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cc...@apache.org on 2009/11/16 15:02:20 UTC
svn commit: r880755 - in /qpid/trunk/qpid:
cpp/src/qpid/broker/SemanticState.cpp specs/management-schema.xml
Author: cctrieloff
Date: Mon Nov 16 14:02:20 2009
New Revision: 880755
URL: http://svn.apache.org/viewvc?rev=880755&view=rev
Log:
expose less internals and some term clean up thanks to gsim's comments
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
qpid/trunk/qpid/specs/management-schema.xml
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=880755&r1=880754&r2=880755&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Mon Nov 16 14:02:20 2009
@@ -276,10 +276,10 @@
if (agent != 0)
{
- mgmtObject = new _qmf::Subscription(agent, this, ms , queue->GetManagementObject()->getObjectId() ,name ,arguments,
- acquire, ackExpected, syncFrequency, resumeId, resumeTtl, exclusive);
+ mgmtObject = new _qmf::Subscription(agent, this, ms , queue->GetManagementObject()->getObjectId() ,name,
+ !acquire, ackExpected, exclusive ,arguments);
agent->addObject (mgmtObject, agent->allocateId(this));
- mgmtObject->set_mode("WINDOW");
+ mgmtObject->set_creditMode("WINDOW");
}
}
}
@@ -335,7 +335,6 @@
// in future.
//
blocked = !(filter(msg) && checkCredit(msg));
- if (mgmtObject && !blocked && acquire) { mgmtObject->inc_accepted(); }
return !blocked;
}
@@ -566,7 +565,7 @@
{
windowing = true;
if (mgmtObject){
- mgmtObject->set_mode("WINDOW");
+ mgmtObject->set_creditMode("WINDOW");
}
}
@@ -574,7 +573,7 @@
{
windowing = false;
if (mgmtObject){
- mgmtObject->set_mode("CREDIT");
+ mgmtObject->set_creditMode("CREDIT");
}
}
Modified: qpid/trunk/qpid/specs/management-schema.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/specs/management-schema.xml?rev=880755&r1=880754&r2=880755&view=diff
==============================================================================
--- qpid/trunk/qpid/specs/management-schema.xml (original)
+++ qpid/trunk/qpid/specs/management-schema.xml Mon Nov 16 14:02:20 2009
@@ -204,19 +204,15 @@
===============================================================
-->
<class name="Subscription">
- <property name="sessionRef" type="objId" references="Exchange" access="RC" index="y" parentRef="y"/>
- <property name="queueRef" type="objId" references="Session" access="RC" index="y"/>
+ <property name="sessionRef" type="objId" references="Session" access="RC" index="y" parentRef="y"/>
+ <property name="queueRef" type="objId" references="Queue" access="RC" index="y"/>
<property name="name" type="sstr" access="RC" index="y"/>
- <property name="arguments" type="map" access="RC"/>
- <property name="acquire" type="bool" access="RC"/>
- <property name="ackExpected" type="bool" access="RC"/>
- <property name="syncFrequency" type="uint32" access="RC"/>
- <property name="resumeID" type="sstr" access="RC"/>
- <property name="resumeTTL" type="uint64" access="RC"/>
+ <property name="browsing" type="bool" access="RC"/>
+ <property name="acknowledged" type="bool" access="RC"/>
<property name="exclusive" type="bool" access="RC"/>
- <property name="mode" type="sstr" access="RO" desc="WINDOW or CREDIT"/>
+ <property name="creditMode" type="sstr" access="RO" desc="WINDOW or CREDIT"/>
+ <property name="arguments" type="map" access="RC"/>
<statistic name="delivered" type="count64" unit="message" desc="Messages delivered"/>
- <statistic name="accepted" type="count64" unit="message" desc="Messages accepted"/>
</class>
<!--
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org