christoph/fail
1
Fork 0
Code Releases Activity

bugfix: racecondition removed

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1921 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hellwig
2012-11-12 11:46:26 +00:00
parent 464bc9390b
commit 6f98d64613
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/cpn/JobServer.cc
View File

@ -27,6 +27,7 @@ void JobServer::addParam(ExperimentData* exp)
{
#ifndef __puma
m_undoneJobs.Enqueue(exp);
m_inOutCounter.increment();
#endif
}
@ -34,24 +35,28 @@ void JobServer::addParam(ExperimentData* exp)
volatile unsigned JobServer::m_DoneCount = 0;
#endif
#ifndef __puma
boost::mutex CommThread::m_CommMutex;
#endif
ExperimentData *JobServer::getDone()
{
// FIXME race condition, need to synchronize with
// sendPendingExperimentData() and receiveExperimentResults()
#ifndef __puma
boost::unique_lock<boost::mutex> lock(CommThread::m_CommMutex);
if (m_undoneJobs.Size() == 0
&& noMoreExperiments()
&& m_runningJobs.Size() == 0
&& m_doneJobs.Size() == 0) {
// FRICKEL workaround
sleep(1);
ExperimentData *exp = NULL;
if (m_doneJobs.Dequeue_nb(exp)) {
return exp;
}
&& m_doneJobs.Size() == 0
&& m_inOutCounter.getValue() == 0) {
return 0;
}
return m_doneJobs.Dequeue();
ExperimentData *exp = NULL;
exp = m_doneJobs.Dequeue();
m_inOutCounter.decrement();
return exp;
#endif
}
@ -232,10 +237,6 @@ void CommThread::operator()()
close(m_sock);
}
#ifndef __puma
boost::mutex CommThread::m_CommMutex;
#endif // __puma
void CommThread::sendPendingExperimentData(Minion& minion)
{
FailControlMessage ctrlmsg;
@ -297,10 +298,6 @@ void CommThread::sendPendingExperimentData(Minion& minion)
void CommThread::receiveExperimentResults(Minion& minion, uint32_t workloadID)
{
#ifndef __puma
boost::unique_lock<boost::mutex> lock(m_CommMutex);
#endif
ExperimentData* exp = NULL; // Get exp* from running jobs
//cout << "<<[Server] Received result for workload id [" << workloadID << "]" << endl;
cout << "<<[" << workloadID << "] " << flush;

7
src/core/cpn/JobServer.hpp
View File

@ -55,6 +55,7 @@ private:
boost::thread* m_measureThread; //! the performance measurement thread
#endif
#endif
SynchronizedCounter m_inOutCounter;
//! Atomic counter for Workload IDs.
SynchronizedCounter m_counter;
//! Map of running jobs (referenced by Workload ID
@ -139,9 +140,6 @@ class CommThread {
private:
int m_sock; //! Socket descriptor of the connection
JobServer& m_js; //! Calling jobserver
#ifndef __puma
static boost::mutex m_CommMutex; //! to synchronise the communication
#endif // __puma
// FIXME: Concerns are not really separated yet ;)
/**
@ -160,6 +158,9 @@ private:
*/
void receiveExperimentResults(Minion& minion, uint32_t workloadID);
public:
#ifndef __puma
static boost::mutex m_CommMutex; //! to synchronise the communication
#endif // __puma
CommThread(int sockfd, JobServer& p)
: m_sock(sockfd), m_js(p) { }
/**