Skip to content

[QC-450] Allow for output proxy channels which aren't "downstream" #4631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Oct 20, 2020
Merged

[QC-450] Allow for output proxy channels which aren't "downstream" #4631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Framework/Core/src/ExternalFairMQDeviceProxy.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,10 +397,10 @@ DataProcessorSpec specifyExternalFairMQDeviceProxy(char const* name,

namespace
{
// Decide where to sent the output. Everything to "downstream" for now
std::string decideChannel(InputSpec const&)
// Decide where to sent the output. Everything to "downstream" if there is such a channel.
std::string decideChannel(InputSpec const& input, const std::unordered_map<std::string, std::vector<FairMQChannel>>& channels)
{
return "downstream";
return channels.count("downstream") ? "downstream" : input.binding;
}
} // namespace

Expand All @@ -420,7 +420,7 @@ DataProcessorSpec specifyFairMQDeviceOutputProxy(char const* name,
auto channelConfigurationChecker = [inputSpecs = std::move(inputSpecs), device]() {
LOG(INFO) << "checking channel configuration";
for (auto const& spec : inputSpecs) {
auto channel = decideChannel(spec);
auto channel = decideChannel(spec, device->fChannels);
if (device->fChannels.count(channel) == 0) {
throw std::runtime_error("no corresponding output channel found for input '" + channel + "'");
}
Expand Down Expand Up @@ -453,7 +453,7 @@ DataProcessorSpec specifyFairMQDeviceOutputProxy(char const* name,
}
size_t payloadMsgSize = dh->payloadSize;

auto channel = decideChannel(*first.spec);
auto channel = decideChannel(*first.spec, device.fChannels);
auto headerMessage = device.NewMessageFor(channel, index, headerMsgSize);
memcpy(headerMessage->GetData(), part.header, headerMsgSize);
auto payloadMessage = device.NewMessageFor(channel, index, payloadMsgSize);
Expand Down