Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to new DDS API, bump required version

Browse Source
This commit is contained in:
Alexey Rybalchenko
2019-12-04 12:48:50 +01:00
parent 5607d47664
commit f31be6d7a1
4 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fairmq/sdk/DDSSession.cxx
View File

@@ -183,7 +183,8 @@ auto DDSSession::SubmitAgents(Quantity agents) -> void
SSubmitRequestData submitInfo;
submitInfo.m_rms = tools::ToString(GetRMSPlugin());
submitInfo.m_instances = agents;
submitInfo.m_instances = 1;
submitInfo.m_slots = agents; // TODO new api: get slots from agents
submitInfo.m_config = GetRMSConfig().string();
tools::SharedSemaphore blocker;
@@ -210,9 +211,9 @@ auto DDSSession::RequestAgentCount() -> AgentCount
fImpl->fSession->syncSendRequest<SAgentCountRequest>(SAgentCountRequest::request_t(), res);
AgentCount count;
count.active = res.m_activeAgentsCount;
count.idle = res.m_idleAgentsCount;
count.executing = res.m_executingAgentsCount;
count.active = res.m_activeSlotsCount;
count.idle = res.m_idleSlotsCount;
count.executing = res.m_executingSlotsCount;
return count;
}
@@ -231,13 +232,11 @@ auto DDSSession::RequestAgentInfo() -> std::vector<DDSAgent>
*this,
a.m_agentID,
a.m_agentPid,
a.m_agentState,
a.m_DDSPath,
a.m_host,
a.m_lobbyLeader,
a.m_startUpTime,
a.m_taskID,
a.m_username
// a.m_nSlots
);
}
@@ -254,7 +253,8 @@ auto DDSSession::RequestTaskInfo() -> std::vector<DDSTask>
std::vector<DDSTask> taskInfo;
taskInfo.reserve(res.size());
for (auto& a : res) {
taskInfo.emplace_back(a.m_taskID, 0);
//taskInfo.emplace_back(a.m_taskID, 0);
taskInfo.emplace_back(0, 0);
}
return taskInfo;