DPL: improve services to support multiple DP running on the same device

ktf · ktf · commit 5c453328cc29 · 2022-11-09T00:07:00.000+01:00
diff --git a/Framework/Core/include/Framework/ServiceHandle.h b/Framework/Core/include/Framework/ServiceHandle.h
@@ -19,11 +19,17 @@ namespace o2::framework
 /// The kind of service we are asking for
 enum struct ServiceKind {
   /// A Service which is not thread safe, therefore all accesses to it must be mutexed.
-  Serial,
+  DeviceSerial,
   /// A Service which is thread safe and therefore can be used by many threads the same time without risk
-  Global,
+  DeviceGlobal,
   /// A Service which is specific to a given thread in a thread pool
-  Stream
+  DeviceStream,
+  DataProcessorSerial,
+  DataProcessorGlobal,
+  DataProcessorStream,
+  Serial = DataProcessorSerial,
+  Global = DataProcessorGlobal,
+  Stream = DataProcessorStream
 };
 
 struct ServiceTypeHash {
diff --git a/Framework/Core/src/ServiceRegistry.cxx b/Framework/Core/src/ServiceRegistry.cxx
@@ -289,10 +289,18 @@ void* ServiceRegistry::get(ServiceTypeHash typeHash, Salt salt, ServiceKind kind
     O2_BUILTIN_UNREACHABLE();
   }
 
-  if (pos != -1 && mServicesMeta[pos].kind == ServiceKind::Stream && salt.context.streamId <= 0) {
+  bool isStream = mServicesMeta[pos].kind == ServiceKind::DataProcessorStream || mServicesMeta[pos].kind == ServiceKind::DeviceStream;
+  bool isDataProcessor = mServicesMeta[pos].kind == ServiceKind::DataProcessorStream || mServicesMeta[pos].kind == ServiceKind::DataProcessorGlobal || mServicesMeta[pos].kind == ServiceKind::DataProcessorSerial;
+
+  if (pos != -1 && isStream && salt.context.streamId <= 0) {
     throwError(runtime_error_f("A stream service cannot be retrieved from a non stream salt %d", salt.context.streamId));
     O2_BUILTIN_UNREACHABLE();
   }
+  
+  if (pos != -1 && isDataProcessor && salt.context.dataProcessorId < 0) {
+    throwError(runtime_error_f("A data processor service cannot be retrieved from a non dataprocessor context %d", salt.context.dataProcessorId));
+    O2_BUILTIN_UNREACHABLE();
+  }
 
   if (pos != -1) {
     mServicesKey[pos].load();
