Updated to new storage system namespace

Author: Dr15Jones

GeneratorInterface/LHEInterface/src/LHEReader.cc

@@ -47,6 +47,7 @@ namespace lhef {
   class LHEReader::FileSource : public LHEReader::Source {
   public:
     FileSource(const std::string &fileURL) {
+      using namespace edm::storage;
       auto storage = StorageFactory::get()->open(fileURL, IOFlags::OpenRead);
 
       if (!storage)

GeneratorInterface/LHEInterface/src/XMLUtils.cc

@@ -20,6 +20,7 @@
 
 XERCES_CPP_NAMESPACE_USE
 
+using namespace edm::storage;
 namespace lhef {
 
   StorageWrap::StorageWrap(std::unique_ptr<Storage> storage) : storage(std::move(storage)) {}

GeneratorInterface/LHEInterface/src/XMLUtils.h

@@ -16,12 +16,16 @@
 #include <xercesc/sax2/SAX2XMLReader.hpp>
 #include <lzma.h>
 
-class Storage;
+namespace edm::storage {
+  class Storage;
+}
 
 namespace lhef {
 
   class StorageWrap {
   public:
+    using Storage = edm::storage::Storage;
+
     StorageWrap(std::unique_ptr<Storage> storage);
     ~StorageWrap();
 

IORawData/SiPixelInputSources/interface/PixelSLinkDataInputSource.h

@@ -49,7 +49,7 @@ class PixelSLinkDataInputSource : public edm::ProducerSourceFromFiles {
 
   int m_fedid;
   uint32_t m_fileindex;
-  std::unique_ptr<Storage> storage;
+  std::unique_ptr<edm::storage::Storage> storage;
   int m_runnumber;
   uint64_t m_data;
   uint32_t m_currenteventnumber;

IORawData/SiPixelInputSources/src/PixelSLinkDataInputSource.cc

@@ -209,6 +209,7 @@ PixelSLinkDataInputSource::PixelSLinkDataInputSource(const edm::ParameterSet &ps
   edm::LogInfo("") << "now examining file " << currentfilename;
   m_fileindex++;
   // reading both castor and other ('normal'/dcap) files.
+  using namespace edm::storage;
   IOOffset size = -1;
   StorageFactory::getToModify()->enableAccounting(true);
 
@@ -253,7 +254,7 @@ PixelSLinkDataInputSource::~PixelSLinkDataInputSource() {}
 bool PixelSLinkDataInputSource::setRunAndEventInfo(edm::EventID &id,
                                                    edm::TimeValue_t &time,
                                                    edm::EventAuxiliary::ExperimentType &) {
-  Storage &m_file = *storage;
+  edm::storage::Storage &m_file = *storage;
 
   // create product (raw data)
   buffers = std::make_unique<FEDRawDataCollection>();

Utilities/DavixAdaptor/interface/DavixFile.h

@@ -5,40 +5,41 @@
 #include "Utilities/StorageFactory/interface/Storage.h"
 #include <davix.hpp>
 
-class DavixFile : public Storage {
-public:
-  DavixFile(void);
-  DavixFile(const char *name, int flags = IOFlags::OpenRead, int perms = 0666);
-  DavixFile(const std::string &name, int flags = IOFlags::OpenRead, int perms = 0666);
-  ~DavixFile(void) override;
-  static void configureDavixLogLevel();
-
-  virtual void create(const char *name, bool exclusive = false, int perms = 0666);
-  virtual void create(const std::string &name, bool exclusive = false, int perms = 0666);
-  virtual void open(const char *name, int flags = IOFlags::OpenRead, int perms = 0666);
-  virtual void open(const std::string &name, int flags = IOFlags::OpenRead, int perms = 0666);
-
-  using Storage::position;
-  using Storage::read;
-  using Storage::write;
-
-  IOSize read(void *into, IOSize n) override;
-  IOSize readv(IOBuffer *into, IOSize buffers) override;
-  IOSize readv(IOPosBuffer *into, IOSize buffers) override;
-  IOSize write(const void *from, IOSize n) override;
-  IOOffset position(IOOffset offset, Relative whence = SET) override;
-  void resize(IOOffset size) override;
-
-  void close(void) override;
-  virtual void abort(void);
-
-private:
-  // Cannot use as C++ smart pointer for Davix_fd
-  // Because Davix_fd is not available in C++ header files and
-  // sizeof cannot with incomplete types
-  Davix_fd *m_fd;
-  std::unique_ptr<Davix::DavPosix> m_davixPosix;
-  std::string m_name;
-};
-
+namespace edm::storage {
+  class DavixFile : public Storage {
+  public:
+    DavixFile(void);
+    DavixFile(const char *name, int flags = IOFlags::OpenRead, int perms = 0666);
+    DavixFile(const std::string &name, int flags = IOFlags::OpenRead, int perms = 0666);
+    ~DavixFile(void) override;
+    static void configureDavixLogLevel();
+
+    virtual void create(const char *name, bool exclusive = false, int perms = 0666);
+    virtual void create(const std::string &name, bool exclusive = false, int perms = 0666);
+    virtual void open(const char *name, int flags = IOFlags::OpenRead, int perms = 0666);
+    virtual void open(const std::string &name, int flags = IOFlags::OpenRead, int perms = 0666);
+
+    using Storage::position;
+    using Storage::read;
+    using Storage::write;
+
+    IOSize read(void *into, IOSize n) override;
+    IOSize readv(IOBuffer *into, IOSize buffers) override;
+    IOSize readv(IOPosBuffer *into, IOSize buffers) override;
+    IOSize write(const void *from, IOSize n) override;
+    IOOffset position(IOOffset offset, Relative whence = SET) override;
+    void resize(IOOffset size) override;
+
+    void close(void) override;
+    virtual void abort(void);
+
+  private:
+    // Cannot use as C++ smart pointer for Davix_fd
+    // Because Davix_fd is not available in C++ header files and
+    // sizeof cannot with incomplete types
+    Davix_fd *m_fd;
+    std::unique_ptr<Davix::DavPosix> m_davixPosix;
+    std::string m_name;
+  };
+}  // namespace edm::storage
 #endif  // DAVIX_ADAPTOR_DAVIX_FILE_H

Utilities/DavixAdaptor/plugins/DavixStorageMaker.cc

@@ -6,44 +6,47 @@
 #include <davix.hpp>
 #include <unistd.h>
 
-class DavixStorageMaker : public StorageMaker {
-public:
-  /** Open a storage object for the given URL (protocol + path), using the
+namespace edm::storage {
+  class DavixStorageMaker : public StorageMaker {
+  public:
+    /** Open a storage object for the given URL (protocol + path), using the
       @a mode bits.  No temporary files are downloaded.  */
-  std::unique_ptr<Storage> open(const std::string &proto,
-                                const std::string &path,
-                                int mode,
-                                AuxSettings const &aux) const override {
-    const StorageFactory *f = StorageFactory::get();
-    std::string newurl((proto == "web" ? "http" : proto) + ":" + path);
-    auto file = std::make_unique<DavixFile>(newurl, mode);
-    return f->wrapNonLocalFile(std::move(file), proto, std::string(), mode);
-  }
-
-  bool check(const std::string &proto,
-             const std::string &path,
-             const AuxSettings &aux,
-             IOOffset *size = nullptr) const override {
-    std::string newurl((proto == "web" ? "http" : proto) + ":" + path);
-    Davix::DavixError *err = nullptr;
-    Davix::Context c;
-    Davix::DavPosix davixPosix(&c);
-    Davix::StatInfo info;
-    davixPosix.stat64(nullptr, newurl, &info, &err);
-    if (err) {
-      std::unique_ptr<Davix::DavixError> davixErrManaged(err);
-      cms::Exception ex("FileCheckError");
-      ex << "Check failed with error " << err->getErrMsg().c_str() << " and error code" << err->getStatus();
-      ex.addContext("Calling DavixFile::check()");
-      throw ex;
+    std::unique_ptr<Storage> open(const std::string &proto,
+                                  const std::string &path,
+                                  int mode,
+                                  AuxSettings const &aux) const override {
+      const StorageFactory *f = StorageFactory::get();
+      std::string newurl((proto == "web" ? "http" : proto) + ":" + path);
+      auto file = std::make_unique<DavixFile>(newurl, mode);
+      return f->wrapNonLocalFile(std::move(file), proto, std::string(), mode);
     }
-    if (size) {
-      *size = info.size;
+
+    bool check(const std::string &proto,
+               const std::string &path,
+               const AuxSettings &aux,
+               IOOffset *size = nullptr) const override {
+      std::string newurl((proto == "web" ? "http" : proto) + ":" + path);
+      Davix::DavixError *err = nullptr;
+      Davix::Context c;
+      Davix::DavPosix davixPosix(&c);
+      Davix::StatInfo info;
+      davixPosix.stat64(nullptr, newurl, &info, &err);
+      if (err) {
+        std::unique_ptr<Davix::DavixError> davixErrManaged(err);
+        cms::Exception ex("FileCheckError");
+        ex << "Check failed with error " << err->getErrMsg().c_str() << " and error code" << err->getStatus();
+        ex.addContext("Calling DavixFile::check()");
+        throw ex;
+      }
+      if (size) {
+        *size = info.size;
+      }
+      return true;
     }
-    return true;
-  }
-};
+  };
+}  // namespace edm::storage
 
+using namespace edm::storage;
 DEFINE_EDM_PLUGIN(StorageMakerFactory, DavixStorageMaker, "http");
 DEFINE_EDM_PLUGIN(StorageMakerFactory, DavixStorageMaker, "https");
 DEFINE_EDM_PLUGIN(StorageMakerFactory, DavixStorageMaker, "web");

Utilities/DavixAdaptor/src/DavixFile.cc

@@ -14,6 +14,7 @@
 static std::once_flag davixDebugInit;
 
 using namespace Davix;
+using namespace edm::storage;
 
 DavixFile::DavixFile(void) {}
 

Utilities/DavixAdaptor/test/davixcheck.cpp

@@ -4,6 +4,7 @@
 int main(int, char ** /*argv*/) try {
   initTest();
 
+  using namespace edm::storage;
   IOOffset size = -1;
   bool exists = StorageFactory::get()->check(
       "http://opendata.cern.ch/eos/opendata"

Utilities/DavixAdaptor/test/davixread.cpp

@@ -6,6 +6,7 @@
 int main(int, char ** /*argv*/) try {
   initTest();
 
+  using namespace edm::storage;
   IOSize n;
   IOSize size = 1024;
   char buf[size];