summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Tools/AnvilStats/Processor.cpp24
-rw-r--r--Tools/AnvilStats/Processor.h10
2 files changed, 24 insertions, 10 deletions
diff --git a/Tools/AnvilStats/Processor.cpp b/Tools/AnvilStats/Processor.cpp
index a16f78c18..6c4bb0ad5 100644
--- a/Tools/AnvilStats/Processor.cpp
+++ b/Tools/AnvilStats/Processor.cpp
@@ -28,6 +28,7 @@ cProcessor::cThread::cThread(cCallback & a_Callback, cProcessor & a_ParentProces
m_Callback(a_Callback),
m_ParentProcessor(a_ParentProcessor)
{
+ LOG("Created a new thread: %p", this);
super::Start();
}
@@ -35,11 +36,20 @@ cProcessor::cThread::cThread(cCallback & a_Callback, cProcessor & a_ParentProces
+void cProcessor::cThread::WaitForStart(void)
+{
+ m_HasStarted.Wait();
+}
+
+
+
+
+
void cProcessor::cThread::Execute(void)
{
- LOG("Started a new thread: %d", cIsThread::GetCurrentID());
+ LOG("Started a new thread: %p, ID %d", this, cIsThread::GetCurrentID());
- m_ParentProcessor.m_ThreadsHaveStarted.Set();
+ m_HasStarted.Set();
for (;;)
{
@@ -52,7 +62,7 @@ void cProcessor::cThread::Execute(void)
ProcessFile(FileName);
} // for-ever
- LOG("Thread %d terminated", cIsThread::GetCurrentID());
+ LOG("Thread %p (ID %d) terminated", this, cIsThread::GetCurrentID());
}
@@ -522,20 +532,18 @@ void cProcessor::ProcessWorld(const AString & a_WorldFolder, cCallbackFactory &
#endif // _DEBUG
//*/
+ // Start all the threads:
for (int i = 0; i < NumThreads; i++)
{
cCallback * Callback = a_CallbackFactory.GetNewCallback();
m_Threads.push_back(new cThread(*Callback, *this));
}
- // Wait for the first thread to start processing:
- m_ThreadsHaveStarted.Wait();
-
- // Wait for all threads to finish
- // simply by calling each thread's destructor sequentially
+ // Wait for all threads to finish:
LOG("Waiting for threads to finish");
for (cThreads::iterator itr = m_Threads.begin(), end = m_Threads.end(); itr != end; ++itr)
{
+ (*itr)->WaitForStart();
delete *itr;
} // for itr - m_Threads[]
LOG("Processor finished");
diff --git a/Tools/AnvilStats/Processor.h b/Tools/AnvilStats/Processor.h
index 72fea3081..db50ec619 100644
--- a/Tools/AnvilStats/Processor.h
+++ b/Tools/AnvilStats/Processor.h
@@ -30,6 +30,7 @@ class cProcessor
cCallback & m_Callback;
cProcessor & m_ParentProcessor;
+ cEvent m_HasStarted;
// cIsThread override:
virtual void Execute(void) override;
@@ -48,6 +49,9 @@ class cProcessor
public:
cThread(cCallback & a_Callback, cProcessor & a_ParentProcessor);
+
+ /** Waits until the thread starts processing the callback code. */
+ void WaitForStart(void);
} ;
typedef std::vector<cThread *> cThreads;
@@ -65,10 +69,12 @@ protected:
AStringList m_FileQueue;
cThreads m_Threads;
- cEvent m_ThreadsHaveStarted; // This is signalled by each thread to notify the parent thread that it can start waiting for those threads
-
+
+
+ /** Populates m_FileQueue with Anvil files from the specified folder. */
void PopulateFileQueue(const AString & a_WorldFolder);
+ /** Returns one filename from m_FileQueue, and removes the name from the queue. */
AString GetOneFileName(void);
} ;