You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2010/04/21 16:48:59 UTC
svn commit: r936337 - in /qpid/trunk/qpid/cpp/src/tests: Statistics.cpp
qpid_receive.cpp qpid_send.cpp qpid_stream.cpp receiver.cpp
replaying_sender.cpp resuming_receiver.cpp sender.cpp
Author: aconway
Date: Wed Apr 21 14:48:58 2010
New Revision: 936337
URL: http://svn.apache.org/viewvc?rev=936337&view=rev
Log:
Consistent use of string constants for message property keys in sender/receiver tests.
Modified:
qpid/trunk/qpid/cpp/src/tests/Statistics.cpp
qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp
qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp
qpid/trunk/qpid/cpp/src/tests/qpid_stream.cpp
qpid/trunk/qpid/cpp/src/tests/receiver.cpp
qpid/trunk/qpid/cpp/src/tests/replaying_sender.cpp
qpid/trunk/qpid/cpp/src/tests/resuming_receiver.cpp
qpid/trunk/qpid/cpp/src/tests/sender.cpp
Modified: qpid/trunk/qpid/cpp/src/tests/Statistics.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Statistics.cpp?rev=936337&r1=936336&r2=936337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Statistics.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/Statistics.cpp Wed Apr 21 14:48:58 2010
@@ -56,9 +56,11 @@ ThroughputAndLatency::ThroughputAndLaten
samples(0)
{}
+const std::string TS = "ts";
+
void ThroughputAndLatency::message(const messaging::Message& m) {
Throughput::message(m);
- types::Variant::Map::const_iterator i = m.getProperties().find("ts");
+ types::Variant::Map::const_iterator i = m.getProperties().find(TS);
if (i != m.getProperties().end()) {
++samples;
int64_t start(i->second.asInt64());
Modified: qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp?rev=936337&r1=936336&r2=936337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp Wed Apr 21 14:48:58 2010
@@ -138,6 +138,7 @@ struct Options : public qpid::Options
};
const string EOS("eos");
+const string SN("sn");
class SequenceTracker
{
@@ -147,7 +148,7 @@ class SequenceTracker
bool isDuplicate(Message& message)
{
- uint sn = message.getProperties()["sn"];
+ uint sn = message.getProperties()[SN];
if (lastSn < sn) {
lastSn = sn;
return false;
Modified: qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp?rev=936337&r1=936336&r2=936337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp Wed Apr 21 14:48:58 2010
@@ -192,6 +192,8 @@ struct Options : public qpid::Options
};
const string EOS("eos");
+const string SN("sn");
+const string TS("ts");
}} // namespace qpid::tests
@@ -278,8 +280,8 @@ int main(int argc, char ** argv)
if (opts.rate) interval = qpid::sys::TIME_SEC/opts.rate;
while (contentGen->setContent(msg)) {
- msg.getProperties()["sn"] = ++sent;
- msg.getProperties()["ts"] = int64_t(
+ msg.getProperties()[SN] = ++sent;
+ msg.getProperties()[TS] = int64_t(
qpid::sys::Duration(qpid::sys::EPOCH, qpid::sys::now()));
sender.send(msg);
reporter.message(msg);
@@ -300,7 +302,7 @@ int main(int argc, char ** argv)
}
if (opts.reportTotal) reporter.report();
for (uint i = opts.sendEos; i > 0; --i) {
- msg.getProperties()["sn"] = ++sent;
+ msg.getProperties()[SN] = ++sent;
msg.setContent(EOS);//TODO: add in ability to send digest or similar
sender.send(msg);
}
Modified: qpid/trunk/qpid/cpp/src/tests/qpid_stream.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid_stream.cpp?rev=936337&r1=936336&r2=936337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid_stream.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid_stream.cpp Wed Apr 21 14:48:58 2010
@@ -73,7 +73,7 @@ struct Args : public qpid::Options
Args opts;
-const std::string TIMESTAMP = "ts";
+const std::string TS = "ts";
uint64_t timestamp(const qpid::sys::AbsTime& time)
{
@@ -119,7 +119,7 @@ struct Publish : Client
qpid::sys::AbsTime start = qpid::sys::now();
while (true) {
qpid::sys::AbsTime sentAt = qpid::sys::now();
- msg.getProperties()[TIMESTAMP] = timestamp(sentAt);
+ msg.getProperties()[TS] = timestamp(sentAt);
sender.send(msg);
++sent;
qpid::sys::AbsTime waitTill(start, sent*interval);
@@ -151,7 +151,7 @@ struct Consume : Client
}
//calculate latency
uint64_t receivedAt = timestamp(qpid::sys::now());
- uint64_t sentAt = msg.getProperties()[TIMESTAMP].asUint64();
+ uint64_t sentAt = msg.getProperties()[TS].asUint64();
double latency = ((double) (receivedAt - sentAt)) / qpid::sys::TIME_MSEC;
//update avg, min & max
Modified: qpid/trunk/qpid/cpp/src/tests/receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/receiver.cpp?rev=936337&r1=936336&r2=936337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/receiver.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/receiver.cpp Wed Apr 21 14:48:58 2010
@@ -61,6 +61,7 @@ struct Args : public qpid::TestOptions
};
const string EOS("eos");
+const string SN("sn");
class Receiver : public MessageListener, public FailoverManager::Command
{
@@ -99,7 +100,7 @@ void Receiver::received(Message& message
bool Receiver::isDuplicate(Message& message)
{
- uint sn = message.getHeaders().getAsInt("sn");
+ uint sn = message.getHeaders().getAsInt(SN);
if (lastSn < sn) {
lastSn = sn;
return false;
Modified: qpid/trunk/qpid/cpp/src/tests/replaying_sender.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/replaying_sender.cpp?rev=936337&r1=936336&r2=936337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/replaying_sender.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/replaying_sender.cpp Wed Apr 21 14:48:58 2010
@@ -71,6 +71,8 @@ Sender::Sender(const std::string& queue,
message.getDeliveryProperties().setRoutingKey(queueName.c_str());
}
+const string SN("sn");
+
void Sender::execute(AsyncSession& session, bool isRetry)
{
if (verbosity > 0)
@@ -81,7 +83,7 @@ void Sender::execute(AsyncSession& sessi
stringstream message_data;
message_data << ++sent;
message.setData(message_data.str());
- message.getHeaders().setInt("sn", sent);
+ message.getHeaders().setInt(SN, sent);
if ( persistence )
message.getDeliveryProperties().setDeliveryMode(PERSISTENT);
Modified: qpid/trunk/qpid/cpp/src/tests/resuming_receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/resuming_receiver.cpp?rev=936337&r1=936336&r2=936337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/resuming_receiver.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/resuming_receiver.cpp Wed Apr 21 14:48:58 2010
@@ -73,6 +73,7 @@ Listener::Listener ( int freq, int verbo
queueName ( name )
{}
+const std::string SN("sn");
void Listener::received(Message & message)
{
@@ -108,7 +109,7 @@ void Listener::received(Message & messag
<< endl;
}
} else {
- uint sn = message.getHeaders().getAsInt("sn");
+ uint sn = message.getHeaders().getAsInt(SN);
if (lastSn < sn) {
if (sn - lastSn > 1) {
cerr << "Error: gap in sequence between " << lastSn << " and " << sn << endl;
Modified: qpid/trunk/qpid/cpp/src/tests/sender.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sender.cpp?rev=936337&r1=936336&r2=936337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sender.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/sender.cpp Wed Apr 21 14:48:58 2010
@@ -120,7 +120,7 @@ void Sender::execute(AsyncSession& sessi
string data;
while (getline(std::cin, data)) {
message.setData(data);
- message.getHeaders().setInt("sn", ++sent);
+ message.getHeaders().setInt("SN", ++sent);
string matchKey;
if (lvqMatchValues && getline(lvqMatchValues, matchKey)) {
message.getHeaders().setString(QueueOptions::strLVQMatchProperty, matchKey);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org