ParkerBritt/Enzo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: remove static members from singleton, convert to thread safe

Browse Source
This commit is contained in:
parker
2025-07-14 16:36:44 +01:00
parent 4dfae16942
commit a1d4d77be4
9 changed files with 71 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/Benchmarks.cpp
View File

@@ -11,11 +11,11 @@ struct NMReset
{
NMReset()
{
enzo::nt::NetworkManager::_reset();
enzo::nt::nm()._reset();
}
~NMReset()
{
enzo::nt::NetworkManager::_reset();
enzo::nt::nm()._reset();
}
};
@@ -23,7 +23,10 @@ struct NMReset
TEST_CASE_METHOD(NMReset, "Network Manager")
{
using namespace enzo;
nt::OpId startOp = nt::NetworkManager::addOperator(&GOP_test::ctor);
auto& nm = nt::nm();
nt::OpId startOp = nm.addOperator(&GOP_test::ctor);
nt::OpId prevOp = startOp;
std::vector<nt::OpId> prevOps;
@@ -31,7 +34,7 @@ TEST_CASE_METHOD(NMReset, "Network Manager")
{
for(int i=0; i<4; ++i)
{
nt::OpId newOp = nt::NetworkManager::addOperator(&GOP_test::ctor);
nt::OpId newOp = nm.addOperator(&GOP_test::ctor);
prevOps.push_back(newOp);
nt::connectOperators(newOp, i, prevOp, 0);
}
@@ -41,7 +44,7 @@ TEST_CASE_METHOD(NMReset, "Network Manager")
for(int i=0; i<size(prevOpsBuffer); ++i)
{
prevOps.clear();
nt::OpId newOp = nt::NetworkManager::addOperator(GOP_test::ctor);
nt::OpId newOp = nm.addOperator(GOP_test::ctor);
prevOps.push_back(newOp);
nt::connectOperators(newOp, 0, prevOpsBuffer[i], 0);
@@ -50,10 +53,9 @@ TEST_CASE_METHOD(NMReset, "Network Manager")
}
}
nt::NetworkManager* nm = nt::NetworkManager::getInstance();
BENCHMARK("Cook 100 Ops")
{
nm->setDisplayOp(startOp);
nm.setDisplayOp(startOp);
};

40
tests/NetworkTests.cpp
View File

@@ -11,11 +11,11 @@ struct NMReset
{
NMReset()
{
enzo::nt::NetworkManager::_reset();
enzo::nt::nm()._reset();
}
~NMReset()
{
enzo::nt::NetworkManager::_reset();
enzo::nt::nm()._reset();
}
};
@@ -23,32 +23,38 @@ struct NMReset
TEST_CASE_METHOD(NMReset, "network fixture separation start")
{
using namespace enzo;
nt::OpId newOpId = nt::NetworkManager::addOperator(GOP_test::ctor);
auto& nm = nt::nm();
nt::OpId newOpId = nm.addOperator(GOP_test::ctor);
REQUIRE(newOpId==1);
REQUIRE(nt::NetworkManager::isValidOp(1));
REQUIRE(nm.isValidOp(1));
}
TEST_CASE_METHOD(NMReset, "network fixture separation end")
{
using namespace enzo;
REQUIRE_FALSE(nt::NetworkManager::isValidOp(1));
auto& nm = nt::nm();
REQUIRE_FALSE(nm.isValidOp(1));
}
TEST_CASE_METHOD(NMReset, "network")
{
using namespace enzo;
nt::OpId newOpId = nt::NetworkManager::addOperator(GOP_test::ctor);
nt::OpId newOpId2 = nt::NetworkManager::addOperator(GOP_test::ctor);
auto& nm = nt::nm();
REQUIRE(nt::NetworkManager::isValidOp(newOpId));
if(nt::NetworkManager::isValidOp(newOpId))
nt::OpId newOpId = nm.addOperator(GOP_test::ctor);
nt::OpId newOpId2 = nm.addOperator(GOP_test::ctor);
REQUIRE(nm.isValidOp(newOpId));
if(nm.isValidOp(newOpId))
{
auto newConnection = std::make_shared<nt::GeometryConnection>(newOpId, 1, newOpId2, 3);
auto& inputOp = nt::NetworkManager::getGeoOperator(newOpId);
auto& outputOp = nt::NetworkManager::getGeoOperator(newOpId2);
auto& inputOp = nm.getGeoOperator(newOpId);
auto& outputOp = nm.getGeoOperator(newOpId2);
// set output on the upper operator
outputOp.addOutputConnection(newConnection);
@@ -62,14 +68,16 @@ TEST_CASE_METHOD(NMReset, "network")
TEST_CASE_METHOD(NMReset, "reset")
{
using namespace enzo;
nt::OpId newOpId = nt::NetworkManager::addOperator(GOP_test::ctor);
auto& nm = nt::nm();
nt::NetworkManager::_reset();
nt::OpId newOpId = nm.addOperator(GOP_test::ctor);
REQUIRE_FALSE(nt::NetworkManager::isValidOp(newOpId));
nm._reset();
nt::OpId newOpId2 = nt::NetworkManager::addOperator(GOP_test::ctor);
REQUIRE(nt::NetworkManager::isValidOp(newOpId2));
REQUIRE_FALSE(nm.isValidOp(newOpId));
nt::OpId newOpId2 = nm.addOperator(GOP_test::ctor);
REQUIRE(nm.isValidOp(newOpId2));
}