erasure-code: Update isa to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/erasure-code/isa/ErasureCodeIsa.cc b/src/erasure-code/isa/ErasureCodeIsa.cc
index 6f2f181f5f81d44d3f65587ed394a7095495055b..58aff4b0e0dd66fa4edb43558d05f70b5540ddcd 100644 (file)
--- a/src/erasure-code/isa/ErasureCodeIsa.cc
+++ b/src/erasure-code/isa/ErasureCodeIsa.cc
@@ -14,13 +14,14 @@
 
 // -----------------------------------------------------------------------------
 #include <algorithm>
-#include <errno.h>
+#include <cerrno>
 // -----------------------------------------------------------------------------
 #include "common/debug.h"
 #include "ErasureCodeIsa.h"
 #include "xor_op.h"
 #include "include/ceph_assert.h"
 using namespace std;
+using namespace ceph;
 
 // -----------------------------------------------------------------------------
 extern "C" {

diff --git a/src/erasure-code/isa/ErasureCodeIsa.h b/src/erasure-code/isa/ErasureCodeIsa.h
index d67b918f79ea8cfda71bc9a58df49edf540c2da1..705a1723aa65de27cd3c520eab76478300fdd5ac 100644 (file)
--- a/src/erasure-code/isa/ErasureCodeIsa.h
+++ b/src/erasure-code/isa/ErasureCodeIsa.h
@@ -30,7 +30,7 @@
 #include "ErasureCodeIsaTableCache.h"
 // -----------------------------------------------------------------------------
 
-class ErasureCodeIsa : public ErasureCode {
+class ErasureCodeIsa : public ceph::ErasureCode {
 public:
 
   enum eMatrix {
@@ -74,13 +74,13 @@ public:
   unsigned int get_chunk_size(unsigned int object_size) const override;
 
   int encode_chunks(const std::set<int> &want_to_encode,
-                            std::map<int, bufferlist> *encoded) override;
+                    std::map<int, ceph::buffer::list> *encoded) override;
 
   int decode_chunks(const std::set<int> &want_to_read,
-                            const std::map<int, bufferlist> &chunks,
-                            std::map<int, bufferlist> *decoded) override;
+                            const std::map<int, ceph::buffer::list> &chunks,
+                            std::map<int, ceph::buffer::list> *decoded) override;
 
-  int init(ErasureCodeProfile &profile, std::ostream *ss) override;
+  int init(ceph::ErasureCodeProfile &profile, std::ostream *ss) override;
 
   virtual void isa_encode(char **data,
                           char **coding,
@@ -97,7 +97,7 @@ public:
   virtual void prepare() = 0;
 
  private:
-  virtual int parse(ErasureCodeProfile &profile,
+  virtual int parse(ceph::ErasureCodeProfile &profile,
                     std::ostream *ss) = 0;
 };
 
@@ -146,8 +146,8 @@ public:
   void prepare() override;
 
  private:
-  int parse(ErasureCodeProfile &profile,
-                    std::ostream *ss) override;
+  int parse(ceph::ErasureCodeProfile &profile,
+            std::ostream *ss) override;
 };
 
 #endif

diff --git a/src/erasure-code/isa/ErasureCodeIsaTableCache.cc b/src/erasure-code/isa/ErasureCodeIsaTableCache.cc
index 7b176de81fbe36d9db8430708ceb4e17d22e40ac..bc34a8f961f31816baf2aa01a511ab0f8b26b913 100644 (file)
--- a/src/erasure-code/isa/ErasureCodeIsaTableCache.cc
+++ b/src/erasure-code/isa/ErasureCodeIsaTableCache.cc
@@ -37,7 +37,7 @@
 
 // -----------------------------------------------------------------------------
 
-static ostream&
+static std::ostream&
 _tc_prefix(std::ostream* _dout)
 {
   return *_dout << "ErasureCodeIsaTableCache: ";
@@ -284,7 +284,7 @@ ErasureCodeIsaTableCache::putDecodingTableToCache(std::string &signature,
 
   // we store a new table to the cache
 
-  bufferptr cachetable;
+  ceph::buffer::ptr cachetable;
 
   Mutex::Locker lock(codec_tables_guard);
 
@@ -302,7 +302,7 @@ ErasureCodeIsaTableCache::putDecodingTableToCache(std::string &signature,
 
     if ((int) cachetable.length() != (k * (m + k)*32)) {
       // we need to replace this with a different size buffer
-      cachetable = buffer::create(k * (m + k)*32);
+      cachetable = ceph::buffer::create(k * (m + k)*32);
     }
 
     // remove from map
@@ -316,7 +316,7 @@ ErasureCodeIsaTableCache::putDecodingTableToCache(std::string &signature,
   } else {
     dout(12) << "[ store table  ] = " << signature << dendl;
     // allocate a new buffer
-    cachetable = buffer::create(k * (m + k)*32);
+    cachetable = ceph::buffer::create(k * (m + k)*32);
     decode_tbls_lru->push_front(signature);
     (*decode_tbls_map)[signature] = std::make_pair(decode_tbls_lru->begin(), cachetable);
     dout(12) << "[ cache size   ] = " << decode_tbls_lru->size() << dendl;

diff --git a/src/erasure-code/isa/ErasureCodeIsaTableCache.h b/src/erasure-code/isa/ErasureCodeIsaTableCache.h
index 64aaae752af87ecd784311c08600e3687daf4ea6..c9ba7b2301a4fc8fa7c276725dcc4ae9691149a3 100644 (file)
--- a/src/erasure-code/isa/ErasureCodeIsaTableCache.h
+++ b/src/erasure-code/isa/ErasureCodeIsaTableCache.h
@@ -47,7 +47,7 @@ public:
 
   static const int decoding_tables_lru_length = 2516;
 
-  typedef std::pair<std::list<std::string>::iterator, bufferptr> lru_entry_t;
+  typedef std::pair<std::list<std::string>::iterator, ceph::buffer::ptr> lru_entry_t;
   typedef std::map< int, unsigned char** > codec_table_t;
   typedef std::map< int, codec_table_t > codec_tables_t;
   typedef std::map< int, codec_tables_t > codec_technique_tables_t;

diff --git a/src/erasure-code/isa/ErasureCodePluginIsa.cc b/src/erasure-code/isa/ErasureCodePluginIsa.cc
index 5eda591bac59a7442d8f6320961e1c89d30ef106..ba54feb64e33627728a9f4a97d4a298ff521fb73 100644 (file)
--- a/src/erasure-code/isa/ErasureCodePluginIsa.cc
+++ b/src/erasure-code/isa/ErasureCodePluginIsa.cc
@@ -31,11 +31,11 @@
 // -----------------------------------------------------------------------------
 
 int ErasureCodePluginIsa::factory(const std::string &directory,
-                     ErasureCodeProfile &profile,
-                      ErasureCodeInterfaceRef *erasure_code,
-                      std::ostream *ss)
+                                  ceph::ErasureCodeProfile &profile,
+                                  ceph::ErasureCodeInterfaceRef *erasure_code,
+                                  std::ostream *ss)
 {
-    ErasureCodeIsa *interface;
+  ErasureCodeIsa *interface;
     std::string t;
     if (profile.find("technique") == profile.end())
       profile["technique"] = "reed_sol_van";
@@ -61,7 +61,7 @@ int ErasureCodePluginIsa::factory(const std::string &directory,
       delete interface;
       return r;
     }
-    *erasure_code = ErasureCodeInterfaceRef(interface);
+    *erasure_code = ceph::ErasureCodeInterfaceRef(interface);
     return 0;
 }
 
@@ -76,7 +76,7 @@ const char *__erasure_code_version()
 
 int __erasure_code_init(char *plugin_name, char *directory)
 {
-  ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
+  auto& instance = ceph::ErasureCodePluginRegistry::instance();
 
   return instance.add(plugin_name, new ErasureCodePluginIsa());
 }

diff --git a/src/erasure-code/isa/ErasureCodePluginIsa.h b/src/erasure-code/isa/ErasureCodePluginIsa.h
index fc52e10bf3cd4aab1a7a3f680f94dcd998fd30a8..117e17a44026466341333ebc7169f7531f559a52 100644 (file)
--- a/src/erasure-code/isa/ErasureCodePluginIsa.h
+++ b/src/erasure-code/isa/ErasureCodePluginIsa.h
@@ -21,14 +21,14 @@
 #include "erasure-code/ErasureCodePlugin.h"
 #include "ErasureCodeIsaTableCache.h"
 
-class ErasureCodePluginIsa : public ErasureCodePlugin {
+class ErasureCodePluginIsa : public ceph::ErasureCodePlugin {
 public:
   ErasureCodeIsaTableCache tcache;
 
   int factory(const std::string &directory,
-                     ErasureCodeProfile &profile,
-                     ErasureCodeInterfaceRef *erasure_code,
-                     std::ostream *ss) override;
+             ceph::ErasureCodeProfile &profile,
+             ceph::ErasureCodeInterfaceRef *erasure_code,
+             std::ostream *ss) override;
 };
 
 #endif