Modified: incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp?view=diff&rev=472545&r1=472544&r2=472545 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp Wed Nov 8 09:07:44 2006 @@ -23,7 +23,7 @@ #include "qpid/client/Queue.h" #include "qpid/sys/Monitor.h" #include "unistd.h" -#include <apr-1/apr_time.h> +#include <qpid/sys/Time.h> #include <cstdlib> #include <iostream> @@ -43,7 +43,7 @@ public: Publisher(Channel* channel, const std::string& controlTopic, bool tx); virtual void received(Message& msg); - apr_time_t publish(int msgs, int listeners, int size); + int64_t publish(int msgs, int listeners, int size); void terminate(); }; @@ -105,19 +105,19 @@ channel.start(); int batchSize(args.getBatches()); - apr_time_t max(0); - apr_time_t min(0); - apr_time_t sum(0); + int64_t max(0); + int64_t min(0); + int64_t sum(0); for(int i = 0; i < batchSize; i++){ if(i > 0 && args.getDelay()) sleep(args.getDelay()); - apr_time_t time = publisher.publish(args.getMessages(), args.getSubscribers(), args.getSize()); + int64_t time = publisher.publish(args.getMessages(), args.getSubscribers(), args.getSize()); if(!max || time > max) max = time; if(!min || time < min) min = time; sum += time; - std::cout << "Completed " << (i+1) << " of " << batchSize << " in " << time << "ms" << std::endl; + std::cout << "Completed " << (i+1) << " of " << batchSize << " in " << nsecsToMsecs(time) << "ms" << std::endl; } publisher.terminate(); - apr_time_t avg = sum / batchSize; + int64_t avg = sum / batchSize; if(batchSize > 1){ std::cout << batchSize << " batches completed. avg=" << avg << ", max=" << max << ", min=" << min << std::endl; @@ -135,12 +135,11 @@ void Publisher::received(Message& msg){ //count responses and when all are received end the current batch - monitor.acquire(); + Monitor::ScopedLock l(monitor); if(--count == 0){ monitor.notify(); } std::cout << "Received report: " << msg.getData() << " (" << count << " remaining)." << std::endl; - monitor.release(); } void Publisher::waitForCompletion(int msgs){ @@ -148,26 +147,27 @@ monitor.wait(); } -apr_time_t Publisher::publish(int msgs, int listeners, int size){ - monitor.acquire(); +int64_t Publisher::publish(int msgs, int listeners, int size){ Message msg; msg.setData(generateData(size)); - apr_time_t start(apr_time_as_msec(apr_time_now())); - for(int i = 0; i < msgs; i++){ - channel->publish(msg, Exchange::DEFAULT_TOPIC_EXCHANGE, controlTopic); - } - //send report request - Message reportRequest; - reportRequest.getHeaders().setString("TYPE", "REPORT_REQUEST"); - channel->publish(reportRequest, Exchange::DEFAULT_TOPIC_EXCHANGE, controlTopic); - if(transactional){ - channel->commit(); + int64_t start = getTimeMsecs(); + { + Monitor::ScopedLock l(monitor); + for(int i = 0; i < msgs; i++){ + channel->publish(msg, Exchange::DEFAULT_TOPIC_EXCHANGE, controlTopic); + } + //send report request + Message reportRequest; + reportRequest.getHeaders().setString("TYPE", "REPORT_REQUEST"); + channel->publish(reportRequest, Exchange::DEFAULT_TOPIC_EXCHANGE, controlTopic); + if(transactional){ + channel->commit(); + } + + waitForCompletion(listeners); } - waitForCompletion(listeners); - monitor.release(); - apr_time_t finish(apr_time_as_msec(apr_time_now())); - + int64_t finish(getTimeMsecs()); return finish - start; }
Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/apr/APRBaseTest.cpp (from r472534, incubator/qpid/trunk/qpid/cpp/test/unit/qpid/sys/APRBaseTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/apr/APRBaseTest.cpp?view=diff&rev=472545&p1=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/sys/APRBaseTest.cpp&r1=472534&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/apr/APRBaseTest.cpp&r2=472545 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/test/unit/qpid/sys/APRBaseTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/apr/APRBaseTest.cpp Wed Nov 8 09:07:44 2006 @@ -15,7 +15,7 @@ * limitations under the License. * */ -#include "qpid/sys/APRBase.h" +#include "qpid/apr/APRBase.h" #include <qpid_test_plugin.h> #include <iostream> Modified: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp?view=diff&rev=472545&r1=472544&r2=472545 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp Wed Nov 8 09:07:44 2006 @@ -15,14 +15,12 @@ * limitations under the License. * */ -#include "qpid/sys/APRBase.h" -#include "qpid/broker/Message.h" +#include <qpid/broker/Message.h> #include <qpid_test_plugin.h> #include <iostream> using namespace qpid::broker; using namespace qpid::framing; -using namespace qpid::sys; class MessageTest : public CppUnit::TestCase { @@ -34,7 +32,6 @@ void testMe() { - APRBase::increment(); const int size(10); for(int i = 0; i < size; i++){ Message::shared_ptr msg = Message::shared_ptr(new Message(0, "A", "B", true, true)); Propchange: incubator/qpid/trunk/qpid/gentools/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Nov 8 09:07:44 2006 @@ -0,0 +1,2 @@ +out.cpp +out.java Modified: incubator/qpid/trunk/qpid/python/tests/basic.py URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/tests/basic.py?view=diff&rev=472545&r1=472544&r2=472545 ============================================================================== --- incubator/qpid/trunk/qpid/python/tests/basic.py (original) +++ incubator/qpid/trunk/qpid/python/tests/basic.py Wed Nov 8 09:07:44 2006 @@ -260,7 +260,6 @@ for i in range(1, 6): msg = queue.get(timeout=1) self.assertEqual("Message %d" % i, msg.content.body) - try: extra = queue.get(timeout=1) self.fail("Got unexpected 6th message in original queue: " + extra.content.body)
