Skip to content

DPL: refactor how we process control messages #5282

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
Jan 25, 2021
Merged

DPL: refactor how we process control messages #5282

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
57 changes: 30 additions & 27 deletions Framework/Core/src/runDataProcessing.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,35 @@ struct LogProcessingState {
bool hasNewMetric = false;
};

void processCommand(DeviceInfos& infos, short pid, std::string const& command, std::string const& arg)
{
auto doToMatchingPid = [](std::vector<DeviceInfo>& infos, int pid, auto lambda) {
for (auto& deviceInfo : infos) {
if (deviceInfo.pid == pid) {
lambda(deviceInfo);
break;
}
}
};
LOGP(debug, "Found control command {} from pid {} with argument {}.", command, pid, arg);
if (command == "QUIT" && arg == "ALL") {
for (auto& deviceInfo : infos) {
deviceInfo.readyToQuit = true;
}
} else if (command == "QUIT" && arg == "ME") {
doToMatchingPid(infos, pid, [](DeviceInfo& info) { info.readyToQuit = true; });
} else if (command == "NOTIFY_STREAMING_STATE" && arg == "IDLE") {
// FIXME: this should really be a policy...
doToMatchingPid(infos, pid, [](DeviceInfo& info) { info.readyToQuit = true; info.streamingState = StreamingState::Idle; });
} else if (command == "NOTIFY_STREAMING_STATE" && arg == "STREAMING") {
// FIXME: this should really be a policy...
doToMatchingPid(infos, pid, [](DeviceInfo& info) { info.streamingState = StreamingState::Streaming; });
} else if (command == "NOTIFY_STREAMING_STATE" && arg == "EOS") {
// FIXME: this should really be a policy...
doToMatchingPid(infos, pid, [](DeviceInfo& info) { info.streamingState = StreamingState::EndOfStreaming; });
}
};

LogProcessingState processChildrenOutput(DriverInfo& driverInfo,
DeviceInfos& infos,
DeviceSpecs const& specs,
Expand Down Expand Up @@ -627,14 +656,6 @@ LogProcessingState processChildrenOutput(DriverInfo& driverInfo,
hasNewMetric = true;
};

auto doToMatchingPid = [&infos](int pid, auto lambda) {
for (auto& deviceInfo : infos) {
if (deviceInfo.pid == pid) {
lambda(deviceInfo);
break;
}
}
};

while ((pos = s.find(delimiter)) != std::string::npos) {
std::string token{s.substr(0, pos)};
Expand All @@ -651,25 +672,7 @@ LogProcessingState processChildrenOutput(DriverInfo& driverInfo,
DeviceMetricsHelper::processMetric(metricMatch, metrics, newMetricCallback);
result.didProcessMetric = true;
} else if (logLevel == LogParsingHelpers::LogLevel::Info && parseControl(token, match)) {
auto command = match[1];
auto arg = match[2];
LOGP(debug, "Found control command {} from pid {} with argument {}.", command, info.pid, arg);
if (command == "QUIT" && arg == "ALL") {
for (auto& deviceInfo : infos) {
deviceInfo.readyToQuit = true;
}
} else if (command == "QUIT" && arg == "ME") {
doToMatchingPid(info.pid, [](DeviceInfo& info) { info.readyToQuit = true; });
} else if (command == "NOTIFY_STREAMING_STATE" && arg == "IDLE") {
// FIXME: this should really be a policy...
doToMatchingPid(info.pid, [](DeviceInfo& info) { info.readyToQuit = true; info.streamingState = StreamingState::Idle; });
} else if (command == "NOTIFY_STREAMING_STATE" && arg == "STREAMING") {
// FIXME: this should really be a policy...
doToMatchingPid(info.pid, [](DeviceInfo& info) { info.streamingState = StreamingState::Streaming; });
} else if (command == "NOTIFY_STREAMING_STATE" && arg == "EOS") {
// FIXME: this should really be a policy...
doToMatchingPid(info.pid, [](DeviceInfo& info) { info.streamingState = StreamingState::EndOfStreaming; });
}
processCommand(infos, info.pid, match[1].str(), match[2].str());
result.didProcessControl = true;
} else if (logLevel == LogParsingHelpers::LogLevel::Info && DeviceConfigHelper::parseConfig(token, configMatch)) {
DeviceConfigHelper::processConfig(configMatch, info);
Expand Down