Update deprecated methods

This commit is contained in:
Alexey Rybalchenko 2019-02-08 14:43:10 +01:00 committed by Dennis Klein
parent ec519cb318
commit b7125b746e
7 changed files with 13 additions and 8 deletions

View File

@ -41,7 +41,7 @@ void Sampler::Run()
{ {
FairMQPollerPtr poller(NewPoller("data", "broadcast")); FairMQPollerPtr poller(NewPoller("data", "broadcast"));
while (CheckCurrentState(RUNNING)) while (!NewStatePending())
{ {
poller->Poll(100); poller->Poll(100);

View File

@ -60,7 +60,7 @@ void Sampler1::ListenForAcks()
{ {
uint64_t numAcks = 0; uint64_t numAcks = 0;
while (CheckCurrentState(RUNNING)) while (!NewStatePending())
{ {
FairMQMessagePtr ack(NewMessageFor("ack", 0)); FairMQMessagePtr ack(NewMessageFor("ack", 0));
if (Receive(ack, "ack") < 0) if (Receive(ack, "ack") < 0)

View File

@ -35,7 +35,7 @@ void Sink::Run()
{ {
FairMQChannel& dataInChannel = fChannels.at("data").at(0); FairMQChannel& dataInChannel = fChannels.at("data").at(0);
while (CheckCurrentState(RUNNING)) while (!NewStatePending())
{ {
FairMQMessagePtr msg(dataInChannel.Transport()->CreateMessage()); FairMQMessagePtr msg(dataInChannel.Transport()->CreateMessage());
dataInChannel.Receive(msg); dataInChannel.Receive(msg);

View File

@ -54,7 +54,7 @@ void FairMQBenchmarkSampler::Run()
fair::mq::tools::RateLimiter rateLimiter(fMsgRate); fair::mq::tools::RateLimiter rateLimiter(fMsgRate);
while (CheckCurrentState(RUNNING)) while (!NewStatePending())
{ {
if (fMultipart) if (fMultipart)
{ {

View File

@ -60,7 +60,7 @@ void FairMQMerger::Run()
if (fMultipart) if (fMultipart)
{ {
while (CheckCurrentState(RUNNING)) while (!NewStatePending())
{ {
poller->Poll(100); poller->Poll(100);
@ -91,7 +91,7 @@ void FairMQMerger::Run()
} }
else else
{ {
while (CheckCurrentState(RUNNING)) while (!NewStatePending())
{ {
poller->Poll(100); poller->Poll(100);

View File

@ -41,7 +41,7 @@ void FairMQProxy::Run()
{ {
if (fMultipart) if (fMultipart)
{ {
while (CheckCurrentState(RUNNING)) while (!NewStatePending())
{ {
FairMQParts payload; FairMQParts payload;
if (Receive(payload, fInChannelName) >= 0) if (Receive(payload, fInChannelName) >= 0)
@ -61,7 +61,7 @@ void FairMQProxy::Run()
} }
else else
{ {
while (CheckCurrentState(RUNNING)) while (!NewStatePending())
{ {
unique_ptr<FairMQMessage> payload(fTransportFactory->CreateMessage()); unique_ptr<FairMQMessage> payload(fTransportFactory->CreateMessage());
if (Receive(payload, fInChannelName) >= 0) if (Receive(payload, fInChannelName) >= 0)

View File

@ -134,6 +134,11 @@ struct info : pmix_info_t
throw runtime_error("pmix::info ctor failed: rc=" + std::to_string(rc)); throw runtime_error("pmix::info ctor failed: rc=" + std::to_string(rc));
} }
} }
friend std::ostream& operator<<(std::ostream& os, const info& p)
{
return os << "key=" << p.key << ",value='" << p.value.data.string << "'";
}
}; };
struct pdata : pmix_pdata_t struct pdata : pmix_pdata_t