os/bluestore: function collect_metadata, use 'const string&' to reduce copy

Signed-off-by: mychoxin <mychoxin@gmail.com>

diff --git a/src/os/bluestore/BlockDevice.h b/src/os/bluestore/BlockDevice.h
index 0014c686320050f390e03b4889ba2ee152858a59..a90cedeb8543da5ca0a8f3d4e419fb98447d833a 100644 (file)
--- a/src/os/bluestore/BlockDevice.h
+++ b/src/os/bluestore/BlockDevice.h
@@ -115,7 +115,7 @@ public:
   uint64_t get_size() const { return size; }
   uint64_t get_block_size() const { return block_size; }
 
-  virtual int collect_metadata(std::string prefix, std::map<std::string,std::string> *pm) const = 0;
+  virtual int collect_metadata(const std::string& prefix, std::map<std::string,std::string> *pm) const = 0;
 
   virtual int read(
     uint64_t off,

diff --git a/src/os/bluestore/KernelDevice.cc b/src/os/bluestore/KernelDevice.cc
index b0a4cde589cc62d4393817f715d3d67d9e325743..1ed767333e7cb5d87c8411242f8ca0539d44e7aa 100644 (file)
--- a/src/os/bluestore/KernelDevice.cc
+++ b/src/os/bluestore/KernelDevice.cc
@@ -198,7 +198,7 @@ static string get_dev_property(const char *dev, const char *property)
   return val;
 }
 
-int KernelDevice::collect_metadata(string prefix, map<string,string> *pm) const
+int KernelDevice::collect_metadata(const string& prefix, map<string,string> *pm) const
 {
   (*pm)[prefix + "rotational"] = stringify((int)(bool)rotational);
   (*pm)[prefix + "size"] = stringify(get_size());

diff --git a/src/os/bluestore/KernelDevice.h b/src/os/bluestore/KernelDevice.h
index 26e9c9a051923ec4578220bea464aef22d9f718b..e5a21a10a2e34580f008cd0e9f75f6964c20fe5b 100644 (file)
--- a/src/os/bluestore/KernelDevice.h
+++ b/src/os/bluestore/KernelDevice.h
@@ -75,7 +75,7 @@ public:
 
   void aio_submit(IOContext *ioc) override;
 
-  int collect_metadata(std::string prefix, map<std::string,std::string> *pm) const override;
+  int collect_metadata(const std::string& prefix, map<std::string,std::string> *pm) const override;
 
   int read(uint64_t off, uint64_t len, bufferlist *pbl,
           IOContext *ioc,

diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index 6c791dbf9973565918f8be98f613897b2ddf4f70..2ff5dac335757410d596fe4f80caa0989cb86b9f 100644 (file)
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -929,7 +929,7 @@ void NVMEDevice::close()
   dout(1) << __func__ << " end" << dendl;
 }
 
-int NVMEDevice::collect_metadata(string prefix, map<string,string> *pm) const
+int NVMEDevice::collect_metadata(const string& prefix, map<string,string> *pm) const
 {
   (*pm)[prefix + "rotational"] = "0";
   (*pm)[prefix + "size"] = stringify(get_size());

diff --git a/src/os/bluestore/NVMEDevice.h b/src/os/bluestore/NVMEDevice.h
index 4ce6b7ec57787bc84f73f78ad2ec26ab824d3111..21ce0d91535fdf043d9e2925a535e75505625ecd 100644 (file)
--- a/src/os/bluestore/NVMEDevice.h
+++ b/src/os/bluestore/NVMEDevice.h
@@ -227,7 +227,7 @@ class NVMEDevice : public BlockDevice {
   int invalidate_cache(uint64_t off, uint64_t len) override;
   int open(const string& path) override;
   void close() override;
-  int collect_metadata(string prefix, map<string,string> *pm) const override;
+  int collect_metadata(const string& prefix, map<string,string> *pm) const override;
 };
 
 #endif

diff --git a/src/os/bluestore/PMEMDevice.cc b/src/os/bluestore/PMEMDevice.cc
index 517870162a61fc64baf89e9b2aadbd47c46ad765..8b0494a64a9cb99839c3d04bff35af5755a704ab 100644 (file)
--- a/src/os/bluestore/PMEMDevice.cc
+++ b/src/os/bluestore/PMEMDevice.cc
@@ -146,7 +146,7 @@ static string get_dev_property(const char *dev, const char *property)
   return val;
 }
 
-int PMEMDevice::collect_metadata(string prefix, map<string,string> *pm) const
+int PMEMDevice::collect_metadata(const string& prefix, map<string,string> *pm) const
 {
   (*pm)[prefix + "rotational"] = stringify((int)(bool)rotational);
   (*pm)[prefix + "size"] = stringify(get_size());

diff --git a/src/os/bluestore/PMEMDevice.h b/src/os/bluestore/PMEMDevice.h
index ab3507192c88b5a61ec823db3bf15e18c7dc5b79..d7dd248402cc35a106fd36bb440e926e8086454a 100644 (file)
--- a/src/os/bluestore/PMEMDevice.h
+++ b/src/os/bluestore/PMEMDevice.h
@@ -41,7 +41,7 @@ public:
 
   void aio_submit(IOContext *ioc) override;
 
-  int collect_metadata(std::string prefix, map<std::string,std::string> *pm) const override;
+  int collect_metadata(const std::string& prefix, map<std::string,std::string> *pm) const override;
 
   int read(uint64_t off, uint64_t len, bufferlist *pbl,
           IOContext *ioc,