evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix server hang while looking for starter world

Browse Source
This commit is contained in:
Kae 2023-07-20 19:10:41 +10:00
parent d0307e7aa7
commit 607be74945
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/game/StarCelestialDatabase.cpp
View File

@ -206,9 +206,6 @@ bool CelestialMasterDatabase::coordinateValid(CelestialCoordinate const& coordin
Maybe<CelestialCoordinate> CelestialMasterDatabase::findRandomWorld(unsigned tries, unsigned trySpatialRange, Maybe<CelestialCoordinate> CelestialMasterDatabase::findRandomWorld(unsigned tries, unsigned trySpatialRange,
function<bool(CelestialCoordinate)> filter, Maybe<uint64_t> seed) { function<bool(CelestialCoordinate)> filter, Maybe<uint64_t> seed) {
//RecursiveMutexLocker locker(m_mutex);
// We don't need this lock, the other calls are locking anyway.
// Having this here is just stopping other threads from having a go in here until we've found a world.
RandomSource randSource; RandomSource randSource;
if (seed) if (seed)
randSource.init(*seed); randSource.init(*seed);
@ -299,7 +296,12 @@ List<CelestialCoordinate> CelestialMasterDatabase::scanSystems(RectI const& regi
List<CelestialCoordinate> systems; List<CelestialCoordinate> systems;
for (auto const& chunkLocation : chunkIndexesFor(region)) { for (auto const& chunkLocation : chunkIndexesFor(region)) {
auto const& chunkData = getChunk(chunkLocation); auto const& chunkData = getChunk(chunkLocation, [&](std::function<void()>&& func) {
locker.unlock();
func();
locker.lock();
});
locker.unlock();
for (auto const& pair : chunkData.systemParameters) { for (auto const& pair : chunkData.systemParameters) {
Vec3I systemLocation = pair.first; Vec3I systemLocation = pair.first;
if (region.contains(systemLocation.vec2())) { if (region.contains(systemLocation.vec2())) {
@ -311,6 +313,7 @@ List<CelestialCoordinate> CelestialMasterDatabase::scanSystems(RectI const& regi
systems.append(CelestialCoordinate(systemLocation)); systems.append(CelestialCoordinate(systemLocation));
} }
} }
locker.lock();
} }
return systems; return systems;
} }
@ -378,8 +381,8 @@ Maybe<CelestialOrbitRegion> CelestialMasterDatabase::orbitRegion(
return {}; return {};
} }
CelestialChunk const& CelestialMasterDatabase::getChunk(Vec2I const& chunkIndex) { CelestialChunk const& CelestialMasterDatabase::getChunk(Vec2I const& chunkIndex, UnlockDuringFunction unlockDuring) {
return m_chunkCache.get(chunkIndex, [this](Vec2I const& chunkIndex) -> CelestialChunk { return m_chunkCache.get(chunkIndex, [&](Vec2I const& chunkIndex) -> CelestialChunk {
auto versioningDatabase = Root::singleton().versioningDatabase(); auto versioningDatabase = Root::singleton().versioningDatabase();
if (m_database.isOpen()) { if (m_database.isOpen()) {
@ -394,7 +397,12 @@ CelestialChunk const& CelestialMasterDatabase::getChunk(Vec2I const& chunkIndex)
} }
} }
auto newChunk = produceChunk(chunkIndex); CelestialChunk newChunk;
auto producer = [&]() { newChunk = produceChunk(chunkIndex); };
if (unlockDuring)
unlockDuring(producer);
else
producer();
if (m_database.isOpen()) { if (m_database.isOpen()) {
auto versionedChunk = versioningDatabase->makeCurrentVersionedJson("CelestialChunk", newChunk.toJson()); auto versionedChunk = versioningDatabase->makeCurrentVersionedJson("CelestialChunk", newChunk.toJson());
m_database.insert(DataStreamBuffer::serialize(chunkIndex), m_database.insert(DataStreamBuffer::serialize(chunkIndex),

3
source/game/StarCelestialDatabase.hpp
View File

@ -162,7 +162,8 @@ protected:
static Maybe<CelestialOrbitRegion> orbitRegion( static Maybe<CelestialOrbitRegion> orbitRegion(
List<CelestialOrbitRegion> const& orbitRegions, int planetaryOrbitNumber); List<CelestialOrbitRegion> const& orbitRegions, int planetaryOrbitNumber);
CelestialChunk const& getChunk(Vec2I const& chunkLocation); typedef std::function<void(std::function<void()>&&)>&& UnlockDuringFunction;
CelestialChunk const& getChunk(Vec2I const& chunkLocation, UnlockDuringFunction unlockDuring = {});
CelestialChunk produceChunk(Vec2I const& chunkLocation) const; CelestialChunk produceChunk(Vec2I const& chunkLocation) const;
Maybe<pair<CelestialParameters, HashMap<int, CelestialPlanet>>> produceSystem( Maybe<pair<CelestialParameters, HashMap<int, CelestialPlanet>>> produceSystem(

7
source/game/StarSystemWorldServerThread.cpp
View File

@ -101,7 +101,12 @@ void SystemWorldServerThread::update() {
for (auto clientId : m_clients) { for (auto clientId : m_clients) {
m_outgoingPacketQueue[clientId].appendAll(m_systemWorld->pullOutgoingPackets(clientId)); m_outgoingPacketQueue[clientId].appendAll(m_systemWorld->pullOutgoingPackets(clientId));
m_clientShipLocations.set(clientId, {m_systemWorld->clientShipLocation(clientId), m_systemWorld->clientSkyParameters(clientId)}); auto shipSystemLocation = m_systemWorld->clientShipLocation(clientId);
auto& shipLocation = m_clientShipLocations[clientId];
if (shipLocation.first != shipSystemLocation) {
shipLocation.first = shipSystemLocation;
shipLocation.second = m_systemWorld->clientSkyParameters(clientId);
}
if (auto warpAction = m_systemWorld->clientWarpAction(clientId)) if (auto warpAction = m_systemWorld->clientWarpAction(clientId))
m_clientWarpActions.set(clientId, *warpAction); m_clientWarpActions.set(clientId, *warpAction);
else if (m_clientWarpActions.contains(clientId)) else if (m_clientWarpActions.contains(clientId))