Skip to content

A bugfix for BSTaskPool infinite loop edge cases #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

A bugfix for BSTaskPool infinite loop edge cases #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c04260
fix taskpool infinite loop in some cases
naitro2010 May 5, 2025
78ea0be
attempt to fix code formatting
naitro2010 May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions skse64/Hooks_Threads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,27 @@ void BSTaskPool::ProcessTasks()
{
CALL_MEMBER_FN(this, ProcessTaskQueue_HookTarget)();

// create temporary vector array to copy queue contents into
std::vector<TaskDelegate*> tasks_vector;

// copy queue contents until queue is empty (this is to prevent an infinite loop in some cases)
while (!IsTaskQueueEmpty())
{
s_taskQueueLock.Enter();
TaskDelegate * cmd = s_tasks.front();
TaskDelegate* cmd = s_tasks.front();
tasks_vector.push_back(cmd);
s_tasks.pop();
s_taskQueueLock.Leave();
}

// run copied delegates
for (TaskDelegate* cmd : tasks_vector) {
cmd->Run();
cmd->Dispose();
}
}

void TaskInterface::AddTask(TaskDelegate * cmd)
void TaskInterface::AddTask(TaskDelegate* cmd)
{
s_taskQueueLock.Enter();
s_tasks.push(cmd);
Expand All @@ -41,7 +49,7 @@ void TaskInterface::AddTask(TaskDelegate * cmd)

void Hooks_Threads_Init(void)
{

}

// 691ACD40B8430FBDA081477DEB2A9948ACC235F1+11F
Expand Down