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 2009/10/02 23:43:24 UTC
svn commit: r821181 - in /qpid/trunk/qpid/cpp: bindings/qmf/ruby/
bindings/qmf/tests/ include/qmf/engine/ src/qmf/engine/
Author: tross
Date: Fri Oct 2 21:43:22 2009
New Revision: 821181
URL: http://svn.apache.org/viewvc?rev=821181&view=rev
Log:
QMF Fixes in Ruby Console:
- AgentProxy object now has broker_bank and agent_bank accessors
- Fixed a bug in the returning og reference values (ObjectId)
- Added package_name accessor to SchemaObjectClass
- Added accessors for agent/broker bank to ObjectId
Modified:
qpid/trunk/qpid/cpp/bindings/qmf/ruby/qmf.rb
qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console.rb
qpid/trunk/qpid/cpp/include/qmf/engine/Console.h
qpid/trunk/qpid/cpp/include/qmf/engine/ObjectId.h
qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.h
qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp
Modified: qpid/trunk/qpid/cpp/bindings/qmf/ruby/qmf.rb
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/ruby/qmf.rb?rev=821181&r1=821180&r2=821181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/ruby/qmf.rb (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/ruby/qmf.rb Fri Oct 2 21:43:22 2009
@@ -252,7 +252,7 @@
when TYPE_SSTR, TYPE_LSTR then val.asString
when TYPE_ABSTIME then val.asInt64
when TYPE_DELTATIME then val.asUint64
- when TYPE_REF then val.asObjectId
+ when TYPE_REF then ObjectId.new(val.asObjectId)
when TYPE_BOOL then val.asBool
when TYPE_FLOAT then val.asFloat
when TYPE_DOUBLE then val.asDouble
@@ -463,11 +463,19 @@
end
def object_num_high
- return @impl.getObjectNumHi
+ @impl.getObjectNumHi
end
def object_num_low
- return @impl.getObjectNumLo
+ @impl.getObjectNumLo
+ end
+
+ def broker_bank
+ @impl.getBrokerBank
+ end
+
+ def agent_bank
+ @impl.getAgentBank
end
def ==(other)
@@ -522,7 +530,7 @@
when TYPE_SSTR, TYPE_LSTR then val.asString
when TYPE_ABSTIME then val.asInt64
when TYPE_DELTATIME then val.asUint64
- when TYPE_REF then val.asObjectId
+ when TYPE_REF then ObjectId.new(val.asObjectId)
when TYPE_BOOL then val.asBool
when TYPE_FLOAT then val.asFloat
when TYPE_DOUBLE then val.asDouble
@@ -796,7 +804,15 @@
@impl.addMethod(meth.impl)
end
- def name
+ def class_key
+ SchemaClassKey.new(@impl.getClassKey)
+ end
+
+ def package_name
+ @impl.getClassKey.getPackageName
+ end
+
+ def class_name
@impl.getClassKey.getClassName
end
end
@@ -1027,14 +1043,23 @@
def label
@impl.getLabel
end
+
+ def broker_bank
+ @impl.getBrokerBank
+ end
+
+ def agent_bank
+ @impl.getAgentBank
+ end
end
class Broker < ConnectionHandler
include MonitorMixin
- attr_reader :impl, :conn, :console
+ attr_reader :impl, :conn, :console, :broker_bank
def initialize(console, conn)
super()
+ @broker_bank = 1
@console = console
@conn = conn
@session = nil
@@ -1281,5 +1306,4 @@
do_events
end
end
-
end
Modified: qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console.rb
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console.rb?rev=821181&r1=821180&r2=821181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console.rb (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console.rb Fri Oct 2 21:43:22 2009
@@ -25,7 +25,7 @@
class App < Qmf::ConsoleHandler
def agent_added(agent)
- puts "AgentAdded: #{agent.label}"
+ puts "AgentAdded: #{agent.label} broker=#{agent.broker_bank} agent=#{agent.agent_bank}"
end
def agent_deleted(agent)
@@ -41,7 +41,10 @@
end
def object_update(object, hasProps, hasStats)
- puts "ObjectUpdate: #{object.object_class.name} props=#{hasProps} stats=#{hasStats}"
+ puts "ObjectUpdate: #{object.object_class.class_name} props=#{hasProps} stats=#{hasStats}"
+ puts " broker-bank=#{object.object_id.broker_bank}"
+ puts " agent-bank=#{object.object_id.agent_bank}"
+ puts " package=#{object.object_class.package_name}"
end
def event_received(event); end
Modified: qpid/trunk/qpid/cpp/include/qmf/engine/Console.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h?rev=821181&r1=821180&r2=821181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/engine/Console.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/engine/Console.h Fri Oct 2 21:43:22 2009
@@ -136,6 +136,8 @@
public:
~AgentProxy();
const char* getLabel() const;
+ uint32_t getBrokerBank() const;
+ uint32_t getAgentBank() const;
private:
friend struct StaticContext;
Modified: qpid/trunk/qpid/cpp/include/qmf/engine/ObjectId.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/engine/ObjectId.h?rev=821181&r1=821180&r2=821181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/engine/ObjectId.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/engine/ObjectId.h Fri Oct 2 21:43:22 2009
@@ -39,6 +39,10 @@
uint32_t getObjectNumLo() const;
bool isDurable() const;
const char* str() const;
+ uint8_t getFlags() const;
+ uint16_t getSequence() const;
+ uint32_t getBrokerBank() const;
+ uint32_t getAgentBank() const;
bool operator==(const ObjectId& other) const;
bool operator<(const ObjectId& other) const;
Modified: qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.cpp?rev=821181&r1=821180&r2=821181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.cpp Fri Oct 2 21:43:22 2009
@@ -730,6 +730,8 @@
AgentProxy::AgentProxy(AgentProxyImpl* i) : impl(i) {}
AgentProxy::~AgentProxy() { delete impl; }
const char* AgentProxy::getLabel() const { return impl->getLabel().c_str(); }
+uint32_t AgentProxy::getBrokerBank() const { return impl->getBrokerBank(); }
+uint32_t AgentProxy::getAgentBank() const { return impl->getAgentBank(); }
BrokerProxy::BrokerProxy(Console& console) : impl(new BrokerProxyImpl(*this, console)) {}
BrokerProxy::~BrokerProxy() { delete impl; }
Modified: qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.h?rev=821181&r1=821180&r2=821181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.h Fri Oct 2 21:43:22 2009
@@ -108,6 +108,8 @@
}
~AgentProxyImpl() {}
const std::string& getLabel() const { return label; }
+ uint32_t getBrokerBank() const { return 1; }
+ uint32_t getAgentBank() const { return agentBank; }
void addSequence(uint32_t seq) { inFlightSequences.insert(seq); }
void delSequence(uint32_t seq) { inFlightSequences.erase(seq); }
void releaseInFlight(SequenceManager& seqMgr) {
Modified: qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp?rev=821181&r1=821180&r2=821181&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp Fri Oct 2 21:43:22 2009
@@ -156,6 +156,10 @@
uint32_t ObjectId::getObjectNumLo() const { return impl->getObjectNumLo(); }
bool ObjectId::isDurable() const { return impl->isDurable(); }
const char* ObjectId::str() const { return impl->asString().c_str(); }
+uint8_t ObjectId::getFlags() const { return impl->getFlags(); }
+uint16_t ObjectId::getSequence() const { return impl->getSequence(); }
+uint32_t ObjectId::getBrokerBank() const { return impl->getBrokerBank(); }
+uint32_t ObjectId::getAgentBank() const { return impl->getAgentBank(); }
bool ObjectId::operator==(const ObjectId& other) const { return *impl == *other.impl; }
bool ObjectId::operator<(const ObjectId& other) const { return *impl < *other.impl; }
bool ObjectId::operator>(const ObjectId& other) const { return *impl > *other.impl; }
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org