Merge branch 'AliceO2Group:dev' into new-detector4

Author: pkurash

CCDB/include/CCDB/CCDBDownloader.h

@@ -41,7 +41,7 @@ namespace o2::ccdb
 #if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__ROOTCLING__) && !defined(__CLING__)
 struct HeaderObjectPair_t {
   std::multimap<std::string, std::string> header;
-  o2::pmr::vector<char>* object = nullptr;
+  std::pmr::vector<char>* object = nullptr;
   int counter = 0;
 };
 

CCDB/include/CCDB/CcdbApi.h

@@ -355,7 +355,7 @@ class CcdbApi //: public DatabaseInterface
 
 #if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__ROOTCLING__) && !defined(__CLING__)
   typedef struct RequestContext {
-    o2::pmr::vector<char>& dest;
+    std::pmr::vector<char>& dest;
     std::string path;
     std::map<std::string, std::string> const& metadata;
     long timestamp;
@@ -365,7 +365,7 @@ class CcdbApi //: public DatabaseInterface
     std::string createdNotBefore;
     bool considerSnapshot;
 
-    RequestContext(o2::pmr::vector<char>& d,
+    RequestContext(std::pmr::vector<char>& d,
                    std::map<std::string, std::string> const& m,
                    std::map<std::string, std::string>& h)
       : dest(d), metadata(m), headers(h) {}
@@ -379,7 +379,7 @@ class CcdbApi //: public DatabaseInterface
 
   void getFromSnapshot(bool createSnapshot, std::string const& path,
                        long timestamp, std::map<std::string, std::string>& headers,
-                       std::string& snapshotpath, o2::pmr::vector<char>& dest, int& fromSnapshot, std::string const& etag) const;
+                       std::string& snapshotpath, std::pmr::vector<char>& dest, int& fromSnapshot, std::string const& etag) const;
   void releaseNamedSemaphore(boost::interprocess::named_semaphore* sem, std::string const& path) const;
   boost::interprocess::named_semaphore* createNamedSemaphore(std::string const& path) const;
   static std::string determineSemaphoreName(std::string const& basedir, std::string const& objectpath);
@@ -388,22 +388,22 @@ class CcdbApi //: public DatabaseInterface
   static bool removeSemaphore(std::string const& name, bool remove = false);
   static void removeLeakingSemaphores(std::string const& basedir, bool remove = false);
 
-  void loadFileToMemory(o2::pmr::vector<char>& dest, const std::string& path, std::map<std::string, std::string>* localHeaders = nullptr, bool fetchLocalMetaData = true) const;
-  void loadFileToMemory(o2::pmr::vector<char>& dest, std::string const& path,
+  void loadFileToMemory(std::pmr::vector<char>& dest, const std::string& path, std::map<std::string, std::string>* localHeaders = nullptr, bool fetchLocalMetaData = true) const;
+  void loadFileToMemory(std::pmr::vector<char>& dest, std::string const& path,
                         std::map<std::string, std::string> const& metadata, long timestamp,
                         std::map<std::string, std::string>* headers, std::string const& etag,
                         const std::string& createdNotAfter, const std::string& createdNotBefore, bool considerSnapshot = true) const;
 
   // Loads files from alien and cvmfs into given destination.
-  bool loadLocalContentToMemory(o2::pmr::vector<char>& dest, std::string& url) const;
+  bool loadLocalContentToMemory(std::pmr::vector<char>& dest, std::string& url) const;
 
   // add annotated flattened headers in the end of the blob
-  static void appendFlatHeader(o2::pmr::vector<char>& dest, const std::map<std::string, std::string>& headers);
+  static void appendFlatHeader(std::pmr::vector<char>& dest, const std::map<std::string, std::string>& headers);
 
   // the failure to load the file to memory is signaled by 0 size and non-0 capacity
-  static bool isMemoryFileInvalid(const o2::pmr::vector<char>& v) { return v.size() == 0 && v.capacity() > 0; }
+  static bool isMemoryFileInvalid(const std::pmr::vector<char>& v) { return v.size() == 0 && v.capacity() > 0; }
   template <typename T>
-  static T* extractFromMemoryBlob(o2::pmr::vector<char>& blob)
+  static T* extractFromMemoryBlob(std::pmr::vector<char>& blob)
   {
     auto obj = static_cast<T*>(interpretAsTMemFileAndExtract(blob.data(), blob.size(), typeid(T)));
     if constexpr (std::is_base_of<o2::conf::ConfigurableParam, T>::value) {
@@ -576,9 +576,6 @@ class CcdbApi //: public DatabaseInterface
   // convert type_info to TClass, throw on failure
   static TClass* tinfo2TClass(std::type_info const& tinfo);
 
-  // split string on delimiters and return tokens as vector
-  std::vector<std::string> splitString(const std::string& str, const char* delimiters);
-
   typedef size_t (*CurlWriteCallback)(void*, size_t, size_t, void*);
 
   void initCurlOptionsForRetrieve(CURL* curlHandle, void* pointer, CurlWriteCallback writeCallback, bool followRedirect = true) const;

CCDB/src/CcdbApi.cxx

@@ -24,6 +24,7 @@
 #include "Framework/DataTakingContext.h"
 #include <chrono>
 #include <memory>
+#include <ranges>
 #include <sstream>
 #include <TFile.h>
 #include <TGrid.h>
@@ -843,7 +844,7 @@ bool CcdbApi::retrieveBlob(std::string const& path, std::string const& targetdir
     return false;
   }
 
-  o2::pmr::vector<char> buff;
+  std::pmr::vector<char> buff;
   std::map<std::string, std::string> headers;
   // avoid creating snapshot via loadFileToMemory itself
   loadFileToMemory(buff, path, metadata, timestamp, &headers, "", createdNotAfter, createdNotBefore, false);
@@ -1665,22 +1666,13 @@ int CcdbApi::updateMetadata(std::string const& path, std::map<std::string, std::
   return ret;
 }
 
-std::vector<std::string> CcdbApi::splitString(const std::string& str, const char* delimiters)
-{
-  std::vector<std::string> tokens;
-  char stringForStrTok[str.length() + 1];
-  strcpy(stringForStrTok, str.c_str());
-  char* token = strtok(stringForStrTok, delimiters);
-  while (token != nullptr) {
-    tokens.emplace_back(token);
-    token = strtok(nullptr, delimiters);
-  }
-  return tokens;
-}
-
 void CcdbApi::initHostsPool(std::string hosts)
 {
-  hostsPool = splitString(hosts, ",;");
+  hostsPool.clear();
+  auto splitted = hosts | std::views::transform([](char c) { return (c == ';') ? ',' : c; }) | std::views::split(',');
+  for (auto&& part : splitted) {
+    hostsPool.emplace_back(part.begin(), part.end());
+  }
 }
 
 std::string CcdbApi::getHostUrl(int hostIndex) const
@@ -1838,7 +1830,7 @@ void CcdbApi::removeLeakingSemaphores(std::string const& snapshotdir, bool remov
 
 void CcdbApi::getFromSnapshot(bool createSnapshot, std::string const& path,
                               long timestamp, std::map<std::string, std::string>& headers,
-                              std::string& snapshotpath, o2::pmr::vector<char>& dest, int& fromSnapshot, std::string const& etag) const
+                              std::string& snapshotpath, std::pmr::vector<char>& dest, int& fromSnapshot, std::string const& etag) const
 {
   if (createSnapshot) { // create named semaphore
     std::string logfile = mSnapshotCachePath + "/log";
@@ -1892,7 +1884,7 @@ void CcdbApi::loadFileToMemory(std::vector<char>& dest, std::string const& path,
                                std::map<std::string, std::string>* headers, std::string const& etag,
                                const std::string& createdNotAfter, const std::string& createdNotBefore, bool considerSnapshot) const
 {
-  o2::pmr::vector<char> destP;
+  std::pmr::vector<char> destP;
   destP.reserve(dest.size());
   loadFileToMemory(destP, path, metadata, timestamp, headers, etag, createdNotAfter, createdNotBefore, considerSnapshot);
   dest.clear();
@@ -1902,7 +1894,7 @@ void CcdbApi::loadFileToMemory(std::vector<char>& dest, std::string const& path,
   }
 }
 
-void CcdbApi::loadFileToMemory(o2::pmr::vector<char>& dest, std::string const& path,
+void CcdbApi::loadFileToMemory(std::pmr::vector<char>& dest, std::string const& path,
                                std::map<std::string, std::string> const& metadata, long timestamp,
                                std::map<std::string, std::string>* headers, std::string const& etag,
                                const std::string& createdNotAfter, const std::string& createdNotBefore, bool considerSnapshot) const
@@ -1920,7 +1912,7 @@ void CcdbApi::loadFileToMemory(o2::pmr::vector<char>& dest, std::string const& p
   vectoredLoadFileToMemory(contexts);
 }
 
-void CcdbApi::appendFlatHeader(o2::pmr::vector<char>& dest, const std::map<std::string, std::string>& headers)
+void CcdbApi::appendFlatHeader(std::pmr::vector<char>& dest, const std::map<std::string, std::string>& headers)
 {
   size_t hsize = getFlatHeaderSize(headers), cnt = dest.size();
   dest.resize(cnt + hsize);
@@ -1985,7 +1977,7 @@ void CcdbApi::vectoredLoadFileToMemory(std::vector<RequestContext>& requestConte
   }
 }
 
-bool CcdbApi::loadLocalContentToMemory(o2::pmr::vector<char>& dest, std::string& url) const
+bool CcdbApi::loadLocalContentToMemory(std::pmr::vector<char>& dest, std::string& url) const
 {
   if (url.find("alien:/", 0) != std::string::npos) {
     std::map<std::string, std::string> localHeaders;
@@ -2013,7 +2005,7 @@ bool CcdbApi::loadLocalContentToMemory(o2::pmr::vector<char>& dest, std::string&
   return false;
 }
 
-void CcdbApi::loadFileToMemory(o2::pmr::vector<char>& dest, const std::string& path, std::map<std::string, std::string>* localHeaders, bool fetchLocalMetaData) const
+void CcdbApi::loadFileToMemory(std::pmr::vector<char>& dest, const std::string& path, std::map<std::string, std::string>* localHeaders, bool fetchLocalMetaData) const
 {
   // Read file to memory as vector. For special case of the locally cached file retriev metadata stored directly in the file
   constexpr size_t MaxCopySize = 0x1L << 25;

CCDB/test/testCcdbApi.cxx

@@ -560,7 +560,7 @@ BOOST_AUTO_TEST_CASE(multi_host_test)
   api.init("http://bogus-host.cern.ch,http://ccdb-test.cern.ch:8080");
   std::map<std::string, std::string> metadata;
   std::map<std::string, std::string> headers;
-  o2::pmr::vector<char> dst;
+  std::pmr::vector<char> dst;
   std::string url = "Analysis/ALICE3/Centrality";
   api.loadFileToMemory(dst, url, metadata, 1645780010602, &headers, "", "", "", true);
   BOOST_CHECK(dst.size() != 0);
@@ -572,7 +572,7 @@ BOOST_AUTO_TEST_CASE(vectored)
   api.init("http://ccdb-test.cern.ch:8080");
 
   int TEST_SAMPLE_SIZE = 5;
-  std::vector<o2::pmr::vector<char>> dests(TEST_SAMPLE_SIZE);
+  std::vector<std::pmr::vector<char>> dests(TEST_SAMPLE_SIZE);
   std::vector<std::map<std::string, std::string>> metadatas(TEST_SAMPLE_SIZE);
   std::vector<std::map<std::string, std::string>> headers(TEST_SAMPLE_SIZE);
 

CCDB/test/testCcdbApiDownloader.cxx

@@ -116,12 +116,12 @@ size_t writeCallbackNoLambda(void* contents, size_t size, size_t nmemb, void* ch
   return realsize;
 }
 
-std::vector<CURL*> prepareAsyncHandles(size_t num, std::vector<o2::pmr::vector<char>*>& dests)
+std::vector<CURL*> prepareAsyncHandles(size_t num, std::vector<std::pmr::vector<char>*>& dests)
 {
   std::vector<CURL*> handles;
 
   for (int i = 0; i < num; i++) {
-    auto dest = new o2::pmr::vector<char>();
+    auto dest = new std::pmr::vector<char>();
     dests.push_back(dest);
     CURL* curl_handle = curl_easy_init();
     handles.push_back(curl_handle);
@@ -154,7 +154,7 @@ BOOST_AUTO_TEST_CASE(asynch_schedule_test)
   }
 
   CCDBDownloader downloader;
-  std::vector<o2::pmr::vector<char>*> dests;
+  std::vector<std::pmr::vector<char>*> dests;
   auto handles = prepareAsyncHandles(TRANSFERS, dests);
   size_t transfersLeft = 0;
 

DataFormats/Headers/include/Headers/Stack.h

@@ -11,9 +11,10 @@
 #ifndef O2_HEADERS_STACK_H
 #define O2_HEADERS_STACK_H
 
-#include "MemoryResources/MemoryResources.h"
 #include "Headers/DataHeader.h"
 
+#include <memory_resource>
+
 namespace o2::header
 {
 //__________________________________________________________________________________________________
@@ -32,7 +33,7 @@ namespace o2::header
 ///   - returns a Stack ready to be shipped.
 struct Stack {
 
-  using memory_resource = o2::pmr::memory_resource;
+  using memory_resource = std::pmr::memory_resource;
 
  private:
   struct freeobj {
@@ -42,7 +43,7 @@ struct Stack {
   };
 
  public:
-  using allocator_type = fair::mq::pmr::polymorphic_allocator<std::byte>;
+  using allocator_type = std::pmr::polymorphic_allocator<std::byte>;
   using value_type = std::byte;
   using BufferType = std::unique_ptr<value_type[], freeobj>; // this gives us proper default move semantics for free
 
@@ -87,9 +88,9 @@ struct Stack {
   /// all headers must derive from BaseHeader, in addition also other stacks can be passed to ctor.
   template <typename FirstArgType, typename... Headers,
             typename std::enable_if_t<
-              !std::is_convertible<FirstArgType, fair::mq::pmr::polymorphic_allocator<std::byte>>::value, int> = 0>
+              !std::is_convertible<FirstArgType, std::pmr::polymorphic_allocator<std::byte>>::value, int> = 0>
   Stack(FirstArgType&& firstHeader, Headers&&... headers)
-    : Stack(fair::mq::pmr::new_delete_resource(), std::forward<FirstArgType>(firstHeader),
+    : Stack(std::pmr::new_delete_resource(), std::forward<FirstArgType>(firstHeader),
             std::forward<Headers>(headers)...)
   {
   }
@@ -140,7 +141,7 @@ struct Stack {
   constexpr static size_t calculateSize() { return 0; }
 
  private:
-  allocator_type allocator{fair::mq::pmr::new_delete_resource()};
+  allocator_type allocator{std::pmr::new_delete_resource()};
   size_t bufferSize{0};
   BufferType buffer{nullptr, freeobj{allocator.resource()}};
 

DataFormats/Headers/test/testDataHeader.cxx

@@ -314,8 +314,7 @@ BOOST_AUTO_TEST_CASE(headerStack_test)
   BOOST_CHECK(h3->secret == 42);
 
   // test constructing from a buffer and an additional header
-  using namespace fair::mq::pmr;
-  Stack s5(new_delete_resource(), s1.data(), Stack{}, meta);
+  Stack s5(std::pmr::new_delete_resource(), s1.data(), Stack{}, meta);
   BOOST_CHECK(s5.size() == s1.size() + sizeof(meta));
   // check if we can find the header even though there was an empty stack in the middle
   h3 = get<test::MetaHeader*>(s5.data());
@@ -329,7 +328,7 @@ BOOST_AUTO_TEST_CASE(headerStack_test)
   BOOST_CHECK(h4 == h3);
 
   // let's assume we have some stack that is missing the required DataHeader at the beginning:
-  Stack s6{new_delete_resource(), DataHeader{}, s1.data()};
+  Stack s6{std::pmr::new_delete_resource(), DataHeader{}, s1.data()};
   BOOST_CHECK(s6.size() == sizeof(DataHeader) + s1.size());
 }
 

DataFormats/MemoryResources/include/MemoryResources/MemoryResources.h

@@ -28,9 +28,6 @@
 #ifndef ALICEO2_MEMORY_RESOURCES_
 #define ALICEO2_MEMORY_RESOURCES_
 
-#include <boost/container/pmr/memory_resource.hpp>
-#include <boost/container/pmr/monotonic_buffer_resource.hpp>
-#include <boost/container/pmr/polymorphic_allocator.hpp>
 #include <cstring>
 #include <string>
 #include <type_traits>
@@ -45,12 +42,8 @@
 namespace o2::pmr
 {
 
-using FairMQMemoryResource = fair::mq::MemoryResource;
-using ChannelResource = fair::mq::ChannelResource;
-using namespace fair::mq::pmr;
-
 template <typename ContainerT>
-fair::mq::MessagePtr getMessage(ContainerT&& container, FairMQMemoryResource* targetResource = nullptr)
+fair::mq::MessagePtr getMessage(ContainerT&& container, fair::mq::MemoryResource* targetResource = nullptr)
 {
   return fair::mq::getMessage(std::forward<ContainerT>(container), targetResource);
 }
@@ -60,7 +53,7 @@ fair::mq::MessagePtr getMessage(ContainerT&& container, FairMQMemoryResource* ta
 /// Ownership of hte message is taken. Meant to be used for transparent data adoption in containers.
 /// In combination with the SpectatorAllocator this is an alternative to using span, as raw memory
 /// (e.g. an existing buffer message) will be accessible with appropriate container.
-class MessageResource : public FairMQMemoryResource
+class MessageResource : public fair::mq::MemoryResource
 {
 
  public:
@@ -82,7 +75,7 @@ class MessageResource : public FairMQMemoryResource
   size_t getNumberOfMessages() const noexcept override { return mMessageData ? 1 : 0; }
 
  protected:
-  FairMQMemoryResource* mUpstream{nullptr};
+  fair::mq::MemoryResource* mUpstream{nullptr};
   size_t mMessageSize{0};
   void* mMessageData{nullptr};
   bool initialImport{true};
@@ -113,14 +106,14 @@ class MessageResource : public FairMQMemoryResource
 
 // The NoConstructAllocator behaves like the normal pmr vector but does not call constructors / destructors
 template <typename T>
-class NoConstructAllocator : public fair::mq::pmr::polymorphic_allocator<T>
+class NoConstructAllocator : public std::pmr::polymorphic_allocator<T>
 {
  public:
-  using fair::mq::pmr::polymorphic_allocator<T>::polymorphic_allocator;
+  using std::pmr::polymorphic_allocator<T>::polymorphic_allocator;
   using propagate_on_container_move_assignment = std::true_type;
 
   template <typename... Args>
-  NoConstructAllocator(Args&&... args) : fair::mq::pmr::polymorphic_allocator<T>(std::forward<Args>(args)...)
+  NoConstructAllocator(Args&&... args) : std::pmr::polymorphic_allocator<T>(std::forward<Args>(args)...)
   {
   }
 
@@ -145,13 +138,13 @@ class NoConstructAllocator : public fair::mq::pmr::polymorphic_allocator<T>
 //__________________________________________________________________________________________________
 //__________________________________________________________________________________________________
 
-using BytePmrAllocator = fair::mq::pmr::polymorphic_allocator<std::byte>;
+using BytePmrAllocator = std::pmr::polymorphic_allocator<std::byte>;
 template <class T>
-using vector = std::vector<T, fair::mq::pmr::polymorphic_allocator<T>>;
+using vector = std::vector<T, std::pmr::polymorphic_allocator<T>>;
 
 //__________________________________________________________________________________________________
 /// Get the allocator associated to a transport factory
-inline static FairMQMemoryResource* getTransportAllocator(fair::mq::TransportFactory* factory)
+inline static fair::mq::MemoryResource* getTransportAllocator(fair::mq::TransportFactory* factory)
 {
   return *factory;
 }