From d37870c56f30099fccf8e876ff7ea70829a1458a Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 27 Jan 2009 21:17:47 +0000 Subject: Producer side rate throttling: This uses the Message.Flow command to send credit from broker to client to ensure that the client doesn't exceed a rate configured on the broker per session. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@738247 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RateFlowcontrolTest.cpp | 64 ++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 qpid/cpp/src/tests/RateFlowcontrolTest.cpp (limited to 'qpid/cpp/src/tests/RateFlowcontrolTest.cpp') diff --git a/qpid/cpp/src/tests/RateFlowcontrolTest.cpp b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp new file mode 100644 index 0000000000..3e2e2fa777 --- /dev/null +++ b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp @@ -0,0 +1,64 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +#include "unit_test.h" + +#include "qpid/broker/RateFlowcontrol.h" +#include "qpid/sys/Time.h" + +using namespace qpid::broker; +using namespace qpid::sys; + +QPID_AUTO_TEST_SUITE(RateFlowcontrolTestSuite) + +QPID_AUTO_TEST_CASE(RateFlowcontrolTest) +{ + // BOOST_CHECK(predicate); + // BOOST_CHECK_EQUAL(a, b); + + RateFlowcontrol fc(100); + AbsTime n=AbsTime::now(); + + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 0), 0U ); + + fc.sentCredit(n, 0); + + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 0), 0U ); + fc.sentCredit(n, 100); + + Duration d=250*TIME_MSEC; + + n = AbsTime(n,d); + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 48), 25U ); + fc.sentCredit(n, 25); + + n = AbsTime(n,d); + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 0), 23U ); + fc.sentCredit(n, 23); + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 100), 0U); + BOOST_CHECK(fc.flowStopped()); + + n = AbsTime(n,d); + n = AbsTime(n,d); + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 0), 50U); +} + +QPID_AUTO_TEST_SUITE_END() -- cgit v1.2.1 From d35d9452f0830ddd9a1954d9f7f75dbba83b6ec2 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 4 Feb 2009 22:57:34 +0000 Subject: Fixes to producer flow control to reduce the number of flow messages sent to the client and to eliminate a concurrency issue updating the broker flow control state. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@740933 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RateFlowcontrolTest.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'qpid/cpp/src/tests/RateFlowcontrolTest.cpp') diff --git a/qpid/cpp/src/tests/RateFlowcontrolTest.cpp b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp index 3e2e2fa777..b8fda09f61 100644 --- a/qpid/cpp/src/tests/RateFlowcontrolTest.cpp +++ b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp @@ -42,21 +42,23 @@ QPID_AUTO_TEST_CASE(RateFlowcontrolTest) fc.sentCredit(n, 0); BOOST_CHECK_EQUAL( fc.receivedMessage(n, 0), 0U ); - fc.sentCredit(n, 100); + fc.sentCredit(n, 50); Duration d=250*TIME_MSEC; n = AbsTime(n,d); - BOOST_CHECK_EQUAL( fc.receivedMessage(n, 48), 25U ); - fc.sentCredit(n, 25); + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 25), 0U ); + BOOST_CHECK_EQUAL( fc.availableCredit(n), 25U ); n = AbsTime(n,d); - BOOST_CHECK_EQUAL( fc.receivedMessage(n, 0), 23U ); - fc.sentCredit(n, 23); - BOOST_CHECK_EQUAL( fc.receivedMessage(n, 100), 0U); + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 23), 48U ); + BOOST_CHECK_EQUAL( fc.availableCredit(n), 48U ); + fc.sentCredit(n, 48); + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 50), 0U); BOOST_CHECK(fc.flowStopped()); n = AbsTime(n,d); + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 0), 25U); n = AbsTime(n,d); BOOST_CHECK_EQUAL( fc.receivedMessage(n, 0), 50U); } -- cgit v1.2.1 From ffd20ee19a5fd027e0007c27a12dd402dbeca4f8 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 14 Jul 2009 14:32:39 +0000 Subject: Add directory to #include git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@793909 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RateFlowcontrolTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/src/tests/RateFlowcontrolTest.cpp') diff --git a/qpid/cpp/src/tests/RateFlowcontrolTest.cpp b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp index b8fda09f61..9f6aeea4c7 100644 --- a/qpid/cpp/src/tests/RateFlowcontrolTest.cpp +++ b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/broker/RateFlowcontrol.h" #include "qpid/sys/Time.h" -- cgit v1.2.1 From 795b3bb9e5c033abf33635119694e21e7143fc0a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 14 Jul 2009 14:41:22 +0000 Subject: Remove incorrect directory from #include git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@793912 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RateFlowcontrolTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/src/tests/RateFlowcontrolTest.cpp') diff --git a/qpid/cpp/src/tests/RateFlowcontrolTest.cpp b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp index 9f6aeea4c7..b8fda09f61 100644 --- a/qpid/cpp/src/tests/RateFlowcontrolTest.cpp +++ b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp @@ -19,7 +19,7 @@ * */ -#include "tests/unit_test.h" +#include "unit_test.h" #include "qpid/broker/RateFlowcontrol.h" #include "qpid/sys/Time.h" -- cgit v1.2.1 From 9259c46ecb8c5f3e98441080a26914bdea59bffe Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 9 Sep 2009 19:46:56 +0000 Subject: Tidied up namespace usage Miscelleneous whitespace fixes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@813094 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RateFlowcontrolTest.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'qpid/cpp/src/tests/RateFlowcontrolTest.cpp') diff --git a/qpid/cpp/src/tests/RateFlowcontrolTest.cpp b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp index b8fda09f61..80ad06af8c 100644 --- a/qpid/cpp/src/tests/RateFlowcontrolTest.cpp +++ b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,25 +27,28 @@ using namespace qpid::broker; using namespace qpid::sys; +namespace qpid { +namespace tests { + QPID_AUTO_TEST_SUITE(RateFlowcontrolTestSuite) QPID_AUTO_TEST_CASE(RateFlowcontrolTest) { // BOOST_CHECK(predicate); // BOOST_CHECK_EQUAL(a, b); - + RateFlowcontrol fc(100); AbsTime n=AbsTime::now(); - + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 0), 0U ); - + fc.sentCredit(n, 0); - + BOOST_CHECK_EQUAL( fc.receivedMessage(n, 0), 0U ); fc.sentCredit(n, 50); Duration d=250*TIME_MSEC; - + n = AbsTime(n,d); BOOST_CHECK_EQUAL( fc.receivedMessage(n, 25), 0U ); BOOST_CHECK_EQUAL( fc.availableCredit(n), 25U ); @@ -64,3 +67,5 @@ QPID_AUTO_TEST_CASE(RateFlowcontrolTest) } QPID_AUTO_TEST_SUITE_END() + +}} // namespace qpid::tests -- cgit v1.2.1