From: Adam C. Emerson Date: Fri, 29 Mar 2019 01:08:15 +0000 (-0400) Subject: erasure-code: Update isa to work without using namespace X-Git-Tag: v15.0.0~19^2~42 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4eb8026d4fcaac929bce125d48dcfdc9344d75d;p=ceph.git erasure-code: Update isa to work without using namespace Signed-off-by: Adam C. Emerson --- diff --git a/src/erasure-code/isa/ErasureCodeIsa.cc b/src/erasure-code/isa/ErasureCodeIsa.cc index 6f2f181f5f81..58aff4b0e0dd 100644 --- a/src/erasure-code/isa/ErasureCodeIsa.cc +++ b/src/erasure-code/isa/ErasureCodeIsa.cc @@ -14,13 +14,14 @@ // ----------------------------------------------------------------------------- #include -#include +#include // ----------------------------------------------------------------------------- #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 d67b918f79ea..705a1723aa65 100644 --- 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 &want_to_encode, - std::map *encoded) override; + std::map *encoded) override; int decode_chunks(const std::set &want_to_read, - const std::map &chunks, - std::map *decoded) override; + const std::map &chunks, + std::map *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 7b176de81fbe..bc34a8f961f3 100644 --- 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 64aaae752af8..c9ba7b2301a4 100644 --- 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::iterator, bufferptr> lru_entry_t; + typedef std::pair::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 5eda591bac59..ba54feb64e33 100644 --- 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 fc52e10bf3cd..117e17a44026 100644 --- 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