mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-29 05:15:34 +00:00
Code Issues Releases Wiki Activity

Do not repost failed jobs

Browse source 
Failures should not happen except for some weird corner cases. Retrying is
unlikely to help in such situation.
This commit is contained in:
elsid 2024-04-12 18:37:56 +02:00
parent d6f3d34f2f
commit 17bd571a65
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
components/detournavigator/asyncnavmeshupdater.cpp
View file

@ -343,7 +343,8 @@ namespace DetourNavigator
removeJob(job); removeJob(job);
break; break;
case JobStatus::Fail: case JobStatus::Fail:
repost(job); unlockTile(job->mId, job->mAgentBounds, job->mChangedTile);
removeJob(job);
break; break;
case JobStatus::MemoryCacheMiss: case JobStatus::MemoryCacheMiss:
{ {
@ -608,26 +609,6 @@ namespace DetourNavigator
writeToFile(shared->lockConst()->getImpl(), mSettings.get().mNavMeshPathPrefix, navMeshRevision); writeToFile(shared->lockConst()->getImpl(), mSettings.get().mNavMeshPathPrefix, navMeshRevision);
} }
void AsyncNavMeshUpdater::repost(JobIt job)
{
unlockTile(job->mId, job->mAgentBounds, job->mChangedTile);
if (mShouldStop || job->mTryNumber > 2)
return;
const std::lock_guard<std::mutex> lock(mMutex);
if (mPushed.emplace(job->mAgentBounds, job->mChangedTile).second)
{
++job->mTryNumber;
insertPrioritizedJob(job, mWaiting);
mHasJob.notify_all();
return;
}
mJobs.erase(job);
}
bool AsyncNavMeshUpdater::lockTile( bool AsyncNavMeshUpdater::lockTile(
std::size_t jobId, const AgentBounds& agentBounds, const TilePosition& changedTile) std::size_t jobId, const AgentBounds& agentBounds, const TilePosition& changedTile)
{ {

2
components/detournavigator/asyncnavmeshupdater.hpp
View file

@ -197,8 +197,6 @@ namespace DetourNavigator
void writeDebugFiles(const Job& job, const RecastMesh* recastMesh) const; void writeDebugFiles(const Job& job, const RecastMesh* recastMesh) const;
void repost(JobIt job);
bool lockTile(std::size_t jobId, const AgentBounds& agentBounds, const TilePosition& changedTile); bool lockTile(std::size_t jobId, const AgentBounds& agentBounds, const TilePosition& changedTile);
void unlockTile(std::size_t jobId, const AgentBounds& agentBounds, const TilePosition& changedTile); void unlockTile(std::size_t jobId, const AgentBounds& agentBounds, const TilePosition& changedTile);