From 95baf579f3a8f2eed11beebb6befca21c9bd4bdc Mon Sep 17 00:00:00 2001 From: F5 Date: Sun, 20 Oct 2024 16:15:32 +0800 Subject: [PATCH] examples: Keep mtp examples up to date --- examples/mtp/tcp-validation-mtp.cc | 33 +++---------------------- src/mtp/test/mtp-fat-tree-incast.reflog | 18 +++++++------- src/mtp/test/mtp-fat-tree.reflog | 14 +++++------ src/mtp/test/mtp-test-suite.cc | 14 +++++------ 4 files changed, 26 insertions(+), 53 deletions(-) diff --git a/examples/mtp/tcp-validation-mtp.cc b/examples/mtp/tcp-validation-mtp.cc index a53d80e8d..2dbffe232 100644 --- a/examples/mtp/tcp-validation-mtp.cc +++ b/examples/mtp/tcp-validation-mtp.cc @@ -2,34 +2,7 @@ * Copyright (c) 2019 Cable Television Laboratories, Inc. * Copyright (c) 2020 Tom Henderson (adapted for DCTCP testing) * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer, - * without modification. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The names of the authors may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, provided that this notice is retained in full, this - * software may be distributed under the terms of the GNU General - * Public License ("GPL") version 2, in which case the provisions of the - * GPL apply INSTEAD OF those given above. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-3-Clause */ // This program is designed to observe long-running TCP congestion control @@ -259,10 +232,10 @@ TraceFirstDctcp(std::ofstream* ofStream, uint32_t bytesMarked, uint32_t bytesAck NS_LOG_WARN("now " << Now().As(Time::S) << " alpha " << alpha << " (expected <= 0.1)"); g_validationFailed = true; } - if ((now > 7) && ((alpha > 0.09) || (alpha < 0.055))) + if ((now > 7) && ((alpha > 0.09) || (alpha < 0.049))) { NS_LOG_WARN("now " << Now().As(Time::S) << " alpha " << alpha - << " (expected 0.09 <= alpha <= 0.055)"); + << " (expected 0.09 <= alpha <= 0.049)"); g_validationFailed = true; } } diff --git a/src/mtp/test/mtp-fat-tree-incast.reflog b/src/mtp/test/mtp-fat-tree-incast.reflog index c9ab049e7..442cd3d60 100644 --- a/src/mtp/test/mtp-fat-tree-incast.reflog +++ b/src/mtp/test/mtp-fat-tree-incast.reflog @@ -38,16 +38,16 @@ Progressed to 0.8s Progressed to 0.9s Detected #flow = 66 - Finished #flow = 55 - Average FCT (all) = 219106us - Average FCT (finished) = 164425us - Average end to end delay = 8988.1us - Average flow throughput = 0.00591008Gbps - Network throughput = 0.0975597Gbps - Total Tx packets = 12216 - Total Rx packets = 12108 + Finished #flow = 56 + Average FCT (all) = 224669us + Average FCT (finished) = 177315us + Average end to end delay = 8970.54us + Average flow throughput = 0.00587946Gbps + Network throughput = 0.0975372Gbps + Total Tx packets = 12217 + Total Rx packets = 12111 Dropped packets = 0 - Done! - Event count = 234204 + Event count = 234220 diff --git a/src/mtp/test/mtp-fat-tree.reflog b/src/mtp/test/mtp-fat-tree.reflog index 48dc36b04..e5d691f8f 100644 --- a/src/mtp/test/mtp-fat-tree.reflog +++ b/src/mtp/test/mtp-fat-tree.reflog @@ -39,15 +39,15 @@ Progressed to 0.9s Detected #flow = 66 Finished #flow = 64 - Average FCT (all) = 104715us - Average FCT (finished) = 98911.9us - Average end to end delay = 20943us - Average flow throughput = 0.0285373Gbps - Network throughput = 0.218251Gbps - Total Tx packets = 26704 + Average FCT (all) = 104726us + Average FCT (finished) = 98922us + Average end to end delay = 20948.7us + Average flow throughput = 0.0284384Gbps + Network throughput = 0.218204Gbps + Total Tx packets = 26702 Total Rx packets = 25885 Dropped packets = 0 - Done! - Event count = 461898 + Event count = 461877 diff --git a/src/mtp/test/mtp-test-suite.cc b/src/mtp/test/mtp-test-suite.cc index 3724c1022..4860b7e31 100644 --- a/src/mtp/test/mtp-test-suite.cc +++ b/src/mtp/test/mtp-test-suite.cc @@ -104,7 +104,7 @@ class MtpTestSuite : public TestSuite const std::string dataDir, const std::string args = "", const std::string postCmd = "", - const TestDuration duration = QUICK, + const Duration duration = Duration::QUICK, const bool shouldNotErr = true) : TestSuite(name, EXAMPLE) { @@ -118,14 +118,14 @@ static MtpTestSuite g_mtpFatTree1("mtp-fat-tree", NS_TEST_SOURCEDIR, "--bandwidth=100Mbps --thread=4 --flowmon=true", "| grep -v 'Simulation time'", - TestCase::TestDuration::QUICK); + TestCase::Duration::QUICK); static MtpTestSuite g_mtpFatTree2("mtp-fat-tree-incast", "fat-tree-mtp", NS_TEST_SOURCEDIR, "--bandwidth=100Mbps --incast=1 --thread=4 --flowmon=true", "| grep -v 'Simulation time'", - TestCase::TestDuration::QUICK); + TestCase::Duration::QUICK); static MtpTestSuite g_mtpTcpValidation1("mtp-tcp-validation-dctcp-10ms", "tcp-validation-mtp", @@ -133,7 +133,7 @@ static MtpTestSuite g_mtpTcpValidation1("mtp-tcp-validation-dctcp-10ms", "--firstTcpType=dctcp --linkRate=50Mbps --baseRtt=10ms " "--queueUseEcn=1 --stopTime=15s --validate=dctcp-10ms", "", - TestCase::TestDuration::QUICK); + TestCase::Duration::QUICK); static MtpTestSuite g_mtpTcpValidation2("mtp-tcp-validation-dctcp-80ms", "tcp-validation-mtp", @@ -141,7 +141,7 @@ static MtpTestSuite g_mtpTcpValidation2("mtp-tcp-validation-dctcp-80ms", "--firstTcpType=dctcp --linkRate=50Mbps --baseRtt=80ms " "--queueUseEcn=1 --stopTime=40s --validate=dctcp-80ms", "", - TestCase::TestDuration::QUICK); + TestCase::Duration::QUICK); static MtpTestSuite g_mtpTcpValidation3( "mtp-tcp-validation-cubic-50ms-no-ecn", @@ -150,7 +150,7 @@ static MtpTestSuite g_mtpTcpValidation3( "--firstTcpType=cubic --linkRate=50Mbps --baseRtt=50ms --queueUseEcn=0 --stopTime=20s " "--validate=cubic-50ms-no-ecn", "", - TestCase::TestDuration::QUICK); + TestCase::Duration::QUICK); static MtpTestSuite g_mtpTcpValidation4("mtp-tcp-validation-cubic-50ms-ecn", "tcp-validation-mtp", @@ -158,4 +158,4 @@ static MtpTestSuite g_mtpTcpValidation4("mtp-tcp-validation-cubic-50ms-ecn", "--firstTcpType=cubic --linkRate=50Mbps --baseRtt=50ms " "--queueUseEcn=1 --stopTime=20s --validate=cubic-50ms-ecn", "", - TestCase::TestDuration::QUICK); + TestCase::Duration::QUICK);