erasure-code: Reformat file with google conventions.

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

diff --git a/src/erasure-code/ErasureCode.h b/src/erasure-code/ErasureCode.h
index 4810db4c5ed4969773a4eda09093731b7d03aee3..469bcf6019b6f9c52fa9aed2bf3e8a4ffcf2ec18 100644 (file)
--- a/src/erasure-code/ErasureCode.h
+++ b/src/erasure-code/ErasureCode.h
@@ -28,7 +28,7 @@
 namespace ceph {
 
 class ErasureCode : public ErasureCodeInterface {
-public:
+ public:
   static const unsigned SIMD_ALIGN;
 
   std::vector<int> chunk_mapping;
@@ -41,7 +41,8 @@ public:
   int rule_osds_per_failure_domain = -1;
   int rule_num_failure_domains = -1;
 
-  ~ErasureCode() override {}
+  ~ErasureCode() override {
+  }
 
   int init(ceph::ErasureCodeProfile &profile, std::ostream *ss) override;
 
@@ -50,8 +51,8 @@ public:
   }
 
   int create_rule(const std::string &name,
-                 CrushWrapper &crush,
-                 std::ostream *ss) const override;
+                  CrushWrapper &crush,
+                  std::ostream *ss) const override;
 
   int sanity_check_k_m(int k, int m, std::ostream *ss);
 
@@ -64,77 +65,76 @@ public:
   }
 
   virtual int _minimum_to_decode(const std::set<int> &want_to_read,
-                                const std::set<int> &available_chunks,
-                                std::set<int> *minimum);
+                                 const std::set<int> &available_chunks,
+                                 std::set<int> *minimum);
 
   int minimum_to_decode(const std::set<int> &want_to_read,
-                       const std::set<int> &available,
-                       std::map<int, std::vector<std::pair<int, int>>> *minimum) override;
+                        const std::set<int> &available,
+                        std::map<int,
+                                 std::vector<std::pair<int,
+                                                       int>>> *minimum) override;
 
   int minimum_to_decode_with_cost(const std::set<int> &want_to_read,
-                                          const std::map<int, int> &available,
-                                          std::set<int> *minimum) override;
+                                  const std::map<int, int> &available,
+                                  std::set<int> *minimum) override;
 
   int encode_prepare(const bufferlist &raw,
                      std::map<int, bufferlist> &encoded) const;
 
   int encode(const std::set<int> &want_to_encode,
-                     const bufferlist &in,
-                     std::map<int, bufferlist> *encoded) override;
+             const bufferlist &in,
+             std::map<int, bufferlist> *encoded) override;
 
   int decode(const std::set<int> &want_to_read,
-              const std::map<int, bufferlist> &chunks,
-              std::map<int, bufferlist> *decoded, int chunk_size) override;
+             const std::map<int, bufferlist> &chunks,
+             std::map<int, bufferlist> *decoded,
+             int chunk_size) override;
 
   virtual int _decode(const std::set<int> &want_to_read,
-                     const std::map<int, bufferlist> &chunks,
-                     std::map<int, bufferlist> *decoded);
+                      const std::map<int, bufferlist> &chunks,
+                      std::map<int, bufferlist> *decoded);
 
   const std::vector<int> &get_chunk_mapping() const override;
 
-  int to_mapping(const ErasureCodeProfile &profile,
-                std::ostream *ss);
+  int to_mapping(const ErasureCodeProfile &profile, std::ostream *ss);
 
   static int to_int(const std::string &name,
-                   ErasureCodeProfile &profile,
-                   int *value,
-                   const std::string &default_value,
-                   std::ostream *ss);
+                    ErasureCodeProfile &profile,
+                    int *value,
+                    const std::string &default_value,
+                    std::ostream *ss);
 
   static int to_bool(const std::string &name,
-                    ErasureCodeProfile &profile,
-                    bool *value,
-                    const std::string &default_value,
-                    std::ostream *ss);
+                     ErasureCodeProfile &profile,
+                     bool *value,
+                     const std::string &default_value,
+                     std::ostream *ss);
 
   static int to_string(const std::string &name,
-                      ErasureCodeProfile &profile,
-                      std::string *value,
-                      const std::string &default_value,
-                      std::ostream *ss);
-
-  int decode_concat(const std::set<int>& want_to_read,
-                   const std::map<int, bufferlist> &chunks,
-                   bufferlist *decoded) override;
+                       ErasureCodeProfile &profile,
+                       std::string *value,
+                       const std::string &default_value,
+                       std::ostream *ss);
+
+  int decode_concat(const std::set<int> &want_to_read,
+                    const std::map<int, bufferlist> &chunks,
+                    bufferlist *decoded) override;
   int decode_concat(const std::map<int, bufferlist> &chunks,
-                   bufferlist *decoded) override;
+                    bufferlist *decoded) override;
 
   void encode_delta(const bufferptr &old_data,
-                                 const bufferptr &new_data,
-                                 bufferptr *delta_maybe_in_place) override
-  {
+                    const bufferptr &new_data,
+                    bufferptr *delta_maybe_in_place) override {
     ceph_abort("Not yet supported by this plugin");
   }
 
-  void apply_delta(const shard_id_map<bufferptr> &in,
-                 shard_id_map<bufferptr> &out) override
-  {
+  void apply_delta(const shard_id_map< bufferptr> &in,
+                   shard_id_map< bufferptr> &out) override {
     ceph_abort("Not yet supported by this plugin");
   }
 
  protected:
-  int parse(const ErasureCodeProfile &profile,
-           std::ostream *ss);
+  int parse(const ErasureCodeProfile &profile, std::ostream *ss);
 
  private:
   int chunk_index(unsigned int i) const;

diff --git a/src/erasure-code/isa/ErasureCodeIsa.cc b/src/erasure-code/isa/ErasureCodeIsa.cc
index 0d18bcb8b290cdc552396d9a5d4e984f0df42669..b2bbff572a0cbc510b1fe559de7c004cf15898ab 100644 (file)
--- a/src/erasure-code/isa/ErasureCodeIsa.cc
+++ b/src/erasure-code/isa/ErasureCodeIsa.cc
@@ -185,15 +185,15 @@ ErasureCodeIsaDefault::erasure_contains(int *erasures, int i)
 void
 ErasureCodeIsaDefault::encode_delta(const bufferptr &old_data,
                                   const bufferptr &new_data,
-                                  bufferptr *delta)
+                                  bufferptr *delta_maybe_in_place)
 {
   constexpr int data_vectors = 2;
   char * data[data_vectors];
   data[0] = const_cast<char*>(old_data.c_str());
   data[1] = const_cast<char*>(new_data.c_str());
-  char * coding = delta->c_str();
+  char * coding = delta_maybe_in_place->c_str();
 
-  isa_xor(data, coding, delta->length(), data_vectors);
+  isa_xor(data, coding, delta_maybe_in_place->length(), data_vectors);
 }
 
 // -----------------------------------------------------------------------------

diff --git a/src/erasure-code/isa/ErasureCodeIsa.h b/src/erasure-code/isa/ErasureCodeIsa.h
index 4e1fe24e323cd212abe5b5dbeada35871a29be88..eb39b1d3ed05a199f0699241f3f7ede45299da04 100644 (file)
--- a/src/erasure-code/isa/ErasureCodeIsa.h
+++ b/src/erasure-code/isa/ErasureCodeIsa.h
@@ -160,7 +160,7 @@ public:
 
   void encode_delta(const ceph::bufferptr &old_data,
                     const ceph::bufferptr &new_data,
-                    ceph::bufferptr *delta) override;
+                    ceph::bufferptr *delta_maybe_in_place) override;
 
   void apply_delta(const shard_id_map<ceph::bufferptr> &in,
                    shard_id_map<ceph::bufferptr> &out);