Skip to content

DPL: hotfix for resource manager #6215

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
May 20, 2021
Merged

DPL: hotfix for resource manager #6215

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Framework/Core/src/ArrowSupport.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec()
if (availableSharedMemory < 1000) {
break;
}
size_t candidate = (lastDeviceOffered + di) % specs.size();
size_t candidate = (lastDeviceOffered + 1 + di) % specs.size();
if (specs[candidate].name != "internal-dpl-aod-reader") {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions Framework/Core/src/DeviceController.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ DeviceController::DeviceController(WSDPLHandler* handler)

void DeviceController::hello()
{
LOG(INFO) << "Saying hello";
LOG(debug) << "Saying hello";
std::vector<uv_buf_t> outputs;
encode_websocket_frames(outputs, "hello", strlen("hello"), WebSocketOpCode::Binary, 0);
mHandler->write(outputs);
}

void DeviceController::write(char const* message, size_t s)
{
LOGP(INFO, "Saying {} to device", message);
LOGP(debug, "Saying {} to device", message);
std::vector<uv_buf_t> outputs;
encode_websocket_frames(outputs, message, s, WebSocketOpCode::Binary, 0);
mHandler->write(outputs);
Expand Down
4 changes: 2 additions & 2 deletions Framework/GUISupport/src/FrameworkGUIDeviceInspector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ void displayDeviceInspector(DeviceSpec const& spec,
}
#endif
if (control.controller) {
if (ImGui::Button("Offer resources")) {
control.controller->write("/shm-mem 1000", strlen("/shm-mem 1000"));
if (ImGui::Button("Offer SHM")) {
control.controller->write("/shm-offer 1000", strlen("/shm-offer 1000"));
}
}

Expand Down