Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00
Code Activity

Fixed ability to cancel downloads

Browse source
This commit is contained in:
Brian Fiete 2019-09-04 10:27:37 -07:00
parent 43c82515fe
commit d26e2957b0
7 changed files with 82 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
BeefySysLib/util/ThreadPool.cpp
View file

@ -8,6 +8,7 @@ static BF_TLS_DECLSPEC ThreadPool* gPoolParent;
ThreadPool::Thread::Thread()
{
mCurJobThreadId = -1;
mActiveJob = NULL;
}
ThreadPool::Thread::~Thread()
@ -34,9 +35,10 @@ void ThreadPool::Thread::Proc()
{
job = mThreadPool->mJobs[0];
job->mProcessing = true;
mThreadPool->mJobs.RemoveAt(0);
mThreadPool->mJobs.RemoveAt(0);
}
mActiveJob = job;
if (job == NULL)
mCurJobThreadId = -1;
else
@ -76,6 +78,7 @@ void ThreadPool::Thread::Proc()
// Run dtor synchronized
AutoCrit autoCrit(mThreadPool->mCritSect);
mActiveJob = NULL;
delete job;
}
}
@ -176,4 +179,14 @@ void ThreadPool::AddJob(BfpThreadStartProc proc, void* param, int maxWorkersPerP
bool ThreadPool::IsInJob()
{
return gPoolParent == this;
}
void ThreadPool::CancelAll()
{
AutoCrit autoCrit(mCritSect);
for (auto job : mJobs)
job->Cancel();
for (auto thread : mThreads)
if (thread->mActiveJob != NULL)
thread->mActiveJob->Cancel();
}

4
BeefySysLib/util/ThreadPool.h
View file

@ -9,12 +9,15 @@ NS_BF_BEGIN
class ThreadPool
{
public:
class Job;
class Thread
{
public:
ThreadPool* mThreadPool;
BfpThread* mBfpThread;
BfpThreadId mCurJobThreadId;
Job* mActiveJob;
public:
Thread();
@ -85,6 +88,7 @@ public:
void AddJob(Job* job, int maxWorkersPerProviderThread = 0x7FFFFFFF);
void AddJob(BfpThreadStartProc proc, void* param, int maxWorkersPerProviderThread = 0x7FFFFFFF);
bool IsInJob();
void CancelAll();
};
NS_BF_END