DPL: hotfix for resource manager (#6215)

ktf · web-flow · commit 9db6dbdbbd82 · 2021-05-20T13:23:25.000+02:00
* Demote some messages to debug.
* Properly handle more than one reader.
diff --git a/Framework/Core/src/ArrowSupport.cxx b/Framework/Core/src/ArrowSupport.cxx
@@ -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;
                          }
diff --git a/Framework/Core/src/DeviceController.cxx b/Framework/Core/src/DeviceController.cxx
@@ -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);
diff --git a/Framework/GUISupport/src/FrameworkGUIDeviceInspector.cxx b/Framework/GUISupport/src/FrameworkGUIDeviceInspector.cxx
@@ -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"));
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec()`
`227`	`227`	`if (availableSharedMemory < 1000) {`
`228`	`228`	`break;`
`229`	`229`	`}`
`230`		`- size_t candidate = (lastDeviceOffered + di) % specs.size();`
	`230`	`+ size_t candidate = (lastDeviceOffered + 1 + di) % specs.size();`
`231`	`231`	`if (specs[candidate].name != "internal-dpl-aod-reader") {`
`232`	`232`	`continue;`
`233`	`233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,15 @@ DeviceController::DeviceController(WSDPLHandler* handler)`
`25`	`25`
`26`	`26`	`void DeviceController::hello()`
`27`	`27`	`{`
`28`		`- LOG(INFO) << "Saying hello";`
	`28`	`+ LOG(debug) << "Saying hello";`
`29`	`29`	`std::vector<uv_buf_t> outputs;`
`30`	`30`	`encode_websocket_frames(outputs, "hello", strlen("hello"), WebSocketOpCode::Binary, 0);`
`31`	`31`	`mHandler->write(outputs);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`void DeviceController::write(char const* message, size_t s)`
`35`	`35`	`{`
`36`		`- LOGP(INFO, "Saying {} to device", message);`
	`36`	`+ LOGP(debug, "Saying {} to device", message);`
`37`	`37`	`std::vector<uv_buf_t> outputs;`
`38`	`38`	`encode_websocket_frames(outputs, message, s, WebSocketOpCode::Binary, 0);`
`39`	`39`	`mHandler->write(outputs);`
Original file line number	Diff line number	Diff line change
`@@ -248,8 +248,8 @@ void displayDeviceInspector(DeviceSpec const& spec,`
`248`	`248`	`}`
`249`	`249`	`#endif`
`250`	`250`	`if (control.controller) {`
`251`		`- if (ImGui::Button("Offer resources")) {`
`252`		`- control.controller->write("/shm-mem 1000", strlen("/shm-mem 1000"));`
	`251`	`+ if (ImGui::Button("Offer SHM")) {`
	`252`	`+ control.controller->write("/shm-offer 1000", strlen("/shm-offer 1000"));`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`