MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 23:44:01 +01:00
Code Issues Releases Wiki Activity

construct: Rename million-tick test to megatest; minor cleanup.

Browse source
This commit is contained in:
Jason Volk 2021-02-09 22:17:44 -08:00
parent fdcf12358a
commit f0cf5e68c8
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
construct/construct.cc
View file

@ -42,7 +42,7 @@ bool read_only;
bool write_avoid; bool write_avoid;
bool slave; bool slave;
std::array<bool, 6> smoketest; std::array<bool, 6> smoketest;
bool milltest; bool megatest;
bool soft_assert; bool soft_assert;
bool nomatrix; bool nomatrix;
bool matrix {true}; // matrix server by default. bool matrix {true}; // matrix server by default.
@ -78,7 +78,7 @@ lgetopt opts[]
{ "wa", &write_avoid, lgetopt::BOOL, "Like read-only mode, but writes permitted if triggered" }, { "wa", &write_avoid, lgetopt::BOOL, "Like read-only mode, but writes permitted if triggered" },
{ "slave", &slave, lgetopt::BOOL, "Like read-only mode; allows multiple instances of server" }, { "slave", &slave, lgetopt::BOOL, "Like read-only mode; allows multiple instances of server" },
{ "smoketest", &smoketest[0], lgetopt::BOOL, "Starts and stops the daemon to return success" }, { "smoketest", &smoketest[0], lgetopt::BOOL, "Starts and stops the daemon to return success" },
{ "milltest", &milltest, lgetopt::BOOL, "Trap execution every millionth tick for diagnostic and statistics." }, { "megatest", &megatest, lgetopt::BOOL, "Trap execution every millionth tick for diagnostic and statistics." },
{ "sassert", &soft_assert, lgetopt::BOOL, "Softens assertion effects in debug mode" }, { "sassert", &soft_assert, lgetopt::BOOL, "Softens assertion effects in debug mode" },
{ "nomatrix", &nomatrix, lgetopt::BOOL, "Prevent loading the matrix application module" }, { "nomatrix", &nomatrix, lgetopt::BOOL, "Prevent loading the matrix application module" },
{ "matrix", &matrix, lgetopt::BOOL, "Allow loading the matrix application module" }, { "matrix", &matrix, lgetopt::BOOL, "Allow loading the matrix application module" },
@ -258,7 +258,7 @@ noexcept try
// Loops until a clean exit from a quit() or an exception comes out of it. // Loops until a clean exit from a quit() or an exception comes out of it.
// Alternatively, ios.run() could be otherwise used here. // Alternatively, ios.run() could be otherwise used here.
size_t epoch{0}; size_t epoch{0};
if(likely(!milltest)) if(likely(!megatest))
for(; !ios.stopped(); ++epoch) for(; !ios.stopped(); ++epoch)
{ {
ios.run_one(); ios.run_one();
@ -272,8 +272,8 @@ noexcept try
}; };
} }
// Milltest is a mock execution which traps on every 1048576th tick. // megatest is a mock execution which traps on every 1048576th tick.
if(milltest) if(megatest)
while(!ios.stopped()) while(!ios.stopped())
{ {
ios.run_one(); ios.run_one();
@ -290,7 +290,6 @@ noexcept try
ircd::debugtrap(); ircd::debugtrap();
} }
// 13
// The smoketest is enabled if the first value is true; then all of the // The smoketest is enabled if the first value is true; then all of the
// values must be true for the smoketest to pass. // values must be true for the smoketest to pass.
if(smoketest[0]) if(smoketest[0])