X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Ftesting%2FTestManager.cpp;h=bd9bbfcca2487a538442ea6b9dc4139ec65cd414;hb=983eaadca6cfae987be3453853d75bb9bce04487;hp=6dfec1ecee2278d598a0b2486f688253f4117aa2;hpb=603b76b5dc02acdfd87c58c51b6d48ae1858f58d;p=anna.git diff --git a/example/diameter/launcher/testing/TestManager.cpp b/example/diameter/launcher/testing/TestManager.cpp index 6dfec1e..bd9bbfc 100644 --- a/example/diameter/launcher/testing/TestManager.cpp +++ b/example/diameter/launcher/testing/TestManager.cpp @@ -21,7 +21,6 @@ // Process #include -#include #include #include #include @@ -30,8 +29,57 @@ class TestTimer; + + +/////////////////////////////////////////////////////////////////////////////////////////////////// +void TestManager::StatSummary::newTCState(const TestCase::State::_v beginState, const TestCase::State::_v endState) throw() { + + if ((beginState == TestCase::State::Initialized)&&(endState == TestCase::State::Initialized)) { // special case (new test case provisioning) + a_initializedTcs++; + return; + } + + switch (beginState) { + case TestCase::State::Initialized: a_initializedTcs--; break; + case TestCase::State::InProgress: a_inprogressTcs--; break; + case TestCase::State::Failed: a_failedTcs--; break; + case TestCase::State::Success: a_sucessTcs--; break; + default: break; + } + switch (endState) { + case TestCase::State::Initialized: a_initializedTcs++; break; + case TestCase::State::InProgress: a_inprogressTcs++; break; + case TestCase::State::Failed: a_failedTcs++; break; + case TestCase::State::Success: a_sucessTcs++; break; + default: break; + } +} + +void TestManager::StatSummary::clear() throw() { + a_initializedTcs = 0; + a_inprogressTcs = 0; + a_failedTcs = 0; + a_sucessTcs = 0; +} + +anna::xml::Node *TestManager::StatSummary::asXML(anna::xml::Node* parent) const throw() { + anna::xml::Node* result = parent->createChild("StatSummary"); + + anna::xml::Node* tcs = result->createChild("TestCasesCounts"); + tcs->createAttribute("Total", a_initializedTcs + a_inprogressTcs + a_failedTcs + a_sucessTcs); + tcs->createAttribute("Initialized", a_initializedTcs); + tcs->createAttribute("InProgress", a_inprogressTcs); + tcs->createAttribute("Failed", a_failedTcs); + tcs->createAttribute("Success", a_sucessTcs); + + return result; +} +/////////////////////////////////////////////////////////////////////////////////////////////////// + + + TestManager::TestManager() : - anna::timex::TimeEventObserver("TestManager") { + anna::timex::TimeEventObserver("TestManager") { a_timeController = NULL; a_reportsDirectory = "./"; a_dumpReports = false; @@ -39,7 +87,6 @@ TestManager::TestManager() : a_synchronousAmount = 1; a_poolRepeats = 0; // repeat disabled by default a_poolCycle = 1; - a_inProgressCount = 0; a_inProgressLimit = UINT_MAX; // no limit a_clock = NULL; //a_testPool.clear(); @@ -76,9 +123,9 @@ throw(anna::RuntimeException) { result->setTimeout(timeout); LOGDEBUG( - std::string msg("TestManager::createTimer | "); - msg += result->asString(); - anna::Logger::debug(msg, ANNA_FILE_LOCATION); + std::string msg("TestManager::createTimer | "); + msg += result->asString(); + anna::Logger::debug(msg, ANNA_FILE_LOCATION); ); a_timeController->activate(result); @@ -91,9 +138,9 @@ throw() { return; LOGDEBUG( - std::string msg("TestManager::cancel | "); - msg += timer->asString(); - anna::Logger::debug(msg, ANNA_FILE_LOCATION); + std::string msg("TestManager::cancel | "); + msg += timer->asString(); + anna::Logger::debug(msg, ANNA_FILE_LOCATION); ); try { @@ -153,15 +200,15 @@ bool TestManager::configureTTPS(int testTicksPerSecond) throw() { if (a_synchronousAmount > 1) { LOGWARNING( - std::string msg = anna::functions::asString("Desired testing time trigger rate (%d events per second) requires more than one sending per event (%d every %lld milliseconds). Consider launch more instances with lower rate (for example %d ADML processes with %d ttps), or configure %d or more sockets to the remote endpoints to avoid burst sendings", - testTicksPerSecond, - a_synchronousAmount, - admlTimeInterval.getValue(), - a_synchronousAmount, - 1000/admlTimeInterval, - a_synchronousAmount); - - anna::Logger::warning(msg, ANNA_FILE_LOCATION); + std::string msg = anna::functions::asString("Desired testing time trigger rate (%d events per second) requires more than one sending per event (%d every %lld milliseconds). Consider launch more instances with lower rate (for example %d ADML processes with %d ttps), or configure %d or more sockets to the remote endpoints to avoid burst sendings", + testTicksPerSecond, + a_synchronousAmount, + admlTimeInterval.getValue(), + a_synchronousAmount, + 1000/admlTimeInterval, + a_synchronousAmount); + + anna::Logger::warning(msg, ANNA_FILE_LOCATION); ); } @@ -208,11 +255,14 @@ TestCase *TestManager::getTestCase(unsigned int id) throw() { bool TestManager::clearPool() throw() { if (!tests()) return false; for (test_pool_it it = a_testPool.begin(); it != a_testPool.end(); it++) delete it->second; + // TODO: stop the possible command threads or there will be a core dump + a_testPool.clear(); a_sessionIdTestCaseMap.clear(); a_currentTestIt = a_testPool.end(); a_poolCycle = 1; configureTTPS(0); // stop + a_statSummary.clear(); return true; } @@ -230,14 +280,18 @@ bool TestManager::resetPool(bool hard) throw() { bool TestManager::tick() throw() { LOGDEBUG(anna::Logger::debug("New test clock tick !", ANNA_FILE_LOCATION)); + return execTestCases(a_synchronousAmount); +} + +bool TestManager::execTestCases(int sync_amount) throw() { if (!tests()) { - LOGWARNING(anna::Logger::warning("Testing pool is empty. You need programming. Stopping test clock", ANNA_FILE_LOCATION)); + LOGWARNING(anna::Logger::warning("Testing pool is empty. You need programming", ANNA_FILE_LOCATION)); return false; } // Synchronous sendings per tick: - int count = a_synchronousAmount; + int count = sync_amount; while (count > 0) { if (!nextTestCase()) return false; // stop the clock count--; @@ -251,7 +305,7 @@ bool TestManager::nextTestCase() throw() { while (true) { // Limit for in-progress test cases: - if (a_inProgressCount >= a_inProgressLimit) { + if (getInProgressCount() >= a_inProgressLimit) { LOGDEBUG(anna::Logger::debug(anna::functions::asString("TestManager next case ignored (over in-progress count limit: %llu)", a_inProgressLimit), ANNA_FILE_LOCATION)); return true; // wait next tick to release OTA test cases } @@ -271,13 +325,13 @@ bool TestManager::nextTestCase() throw() { } else { LOGWARNING( - std::string nolimit = (a_poolRepeats != -1) ? "":" [no limit]"; - anna::Logger::warning(anna::functions::asString("Testing pool cycle %d completed (repeats configured: %d%s). Restarting for the %s cycle", a_poolCycle, a_poolRepeats, nolimit.c_str(), (a_poolRepeats == a_poolCycle) ? "last":"next"), ANNA_FILE_LOCATION); + std::string nolimit = (a_poolRepeats != -1) ? "":" [no limit]"; + anna::Logger::warning(anna::functions::asString("Testing pool cycle %d completed (repeats configured: %d%s). Restarting for the %s cycle", a_poolCycle, a_poolRepeats, nolimit.c_str(), (a_poolRepeats == a_poolCycle) ? "last":"next"), ANNA_FILE_LOCATION); ); a_poolCycle++; //a_currentTestIt = a_testPool.begin(); return true; // avoids infinite loop: if the cycle takes less time than test cases completion, below reset never will turns state - // into Initialized and this while will be infinite. It is preferable to wait one tick when the cycle is completed. + // into Initialized and this while will be infinite. It is preferable to wait one tick when the cycle is completed. } } @@ -289,8 +343,8 @@ bool TestManager::nextTestCase() throw() { if (a_currentTestIt->second->getState() != TestCase::State::InProgress) { a_currentTestIt->second->process(); return true; // is not probably to reach still In-Progress test cases from previous cycles due to the whole - // time for complete the test cases pool regarding the single test case lifetime. You shouldn't - // forget to programm a test case timeout with a reasonable value + // time for complete the test cases pool regarding the single test case lifetime. You shouldn't + // forget to programm a test case timeout with a reasonable value } } } @@ -401,7 +455,7 @@ throw() { if (a_poolRepeats) result->createAttribute("PoolRepeats", a_poolRepeats); else result->createAttribute("PoolRepeats", "disabled"); result->createAttribute("PoolCycle", a_poolCycle); - result->createAttribute("InProgressCount", a_inProgressCount); + a_statSummary.asXML(result); if (a_inProgressLimit == UINT_MAX) result->createAttribute("InProgressLimit", ""); else