christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Bugfix for server-client communication

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1965 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hellwig
2012-11-30 18:13:13 +00:00
parent c689c159fb
commit fc1d21fe53
2 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,12 +255,16 @@ void CommThread::sendPendingExperimentData(Minion& minion)
temp_exp->setWorkloadID(workloadID); // store ID for identification when receiving result temp_exp->setWorkloadID(workloadID); // store ID for identification when receiving result
ctrlmsg.add_workloadid(workloadID); ctrlmsg.add_workloadid(workloadID);
exp.push_back(temp_exp); exp.push_back(temp_exp);
} else {
break;
} }
if (!m_js.m_runningJobs.insert(workloadID, temp_exp)) { if (!m_js.m_runningJobs.insert(workloadID, temp_exp)) {
cout << "!![Server]could not insert workload id: [" << workloadID << "] double entry?" << endl; cout << "!![Server]could not insert workload id: [" << workloadID << "] double entry?" << endl;
sleep(10);
} }
} }
if (exp.size() != 0) {
ctrlmsg.set_job_size(exp.size()); ctrlmsg.set_job_size(exp.size());
cout << " >>["; cout << " >>[";
@ -281,6 +285,7 @@ void CommThread::sendPendingExperimentData(Minion& minion)
} }
return; return;
} }
}
#ifndef __puma #ifndef __puma
// Prevent receiveExperimentResults from modifying (or indirectly, via // Prevent receiveExperimentResults from modifying (or indirectly, via

2
src/core/efw/JobClient.cc
View File

@ -148,6 +148,7 @@ FailControlMessage_Command JobClient::tryToGetExperimentData(ExperimentData& exp
} }
close(m_sockfd); close(m_sockfd);
if (m_parameters.size() != 0) {
//Take front from m_parameters and copy to exp. //Take front from m_parameters and copy to exp.
exp.getMessage().CopyFrom(m_parameters.front()->getMessage()); exp.getMessage().CopyFrom(m_parameters.front()->getMessage());
exp.setWorkloadID(m_parameters.front()->getWorkloadID()); exp.setWorkloadID(m_parameters.front()->getWorkloadID());
@ -157,6 +158,7 @@ FailControlMessage_Command JobClient::tryToGetExperimentData(ExperimentData& exp
m_parameters.erase(m_parameters.begin()); m_parameters.erase(m_parameters.begin());
//start time measurement for throughput calculation //start time measurement for throughput calculation
m_job_runtime.startTimer(); m_job_runtime.startTimer();
}
return ctrlmsg.command(); return ctrlmsg.command();
} }