From 04fb4fdba88145a473b9a3a56ac6fd531af89af2 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 28 Nov 2007 20:17:55 +0000 Subject: Add unit_test.h to distribution. Updated/removed sundry FIXME comments. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@599128 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/perftest.cpp | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'cpp/src/tests/perftest.cpp') diff --git a/cpp/src/tests/perftest.cpp b/cpp/src/tests/perftest.cpp index da0eaf0f8a..8439da6b5d 100644 --- a/cpp/src/tests/perftest.cpp +++ b/cpp/src/tests/perftest.cpp @@ -334,6 +334,7 @@ struct Controller : public Client { } }; + struct PublishThread : public Client { string destination; string routingKey; @@ -419,19 +420,32 @@ struct SubscribeThread : public Client { Message msg; AbsTime start=now(); + size_t lastMsg=0; for (size_t i = 0; i < opts.subQuota; ++i) { msg=lq.pop(); - // FIXME aconway 2007-11-23: Verify message sequence numbers. - // Need an array of counters, one per publisher and need - // publisher ID in the message for multiple publishers. + // TODO aconway 2007-11-23: check message sequence for + // multiple publishers. Need an array of counters, + // one per publisher and a publisher ID in the + // message. Careful not to introduce a lot of overhead + // here, e.g. no std::map, std::string etc. + // + // For now verify order only for a single publisher. + if (opts.pubs == 1) { + char* data = const_cast(msg.getData().data()); + size_t n = *reinterpret_cast(data); + if (n < lastMsg) { + // Report to control. + Message error("Out-of-sequence messages", "sub_done"); + session.messageTransfer(arg::content=error); + return; + } + lastMsg=n; + } } if (opts.ack !=0) msg.acknowledge(); // Cumulative ack for final batch. AbsTime end=now(); - // FIXME aconway 2007-11-23: close the subscription, - // release any pending messages. - // Report to publisher. Message result(lexical_cast(opts.subQuota/secs(start,end)), "sub_done"); -- cgit v1.2.1