crimson: move read_file() into common/buffer_io

so it can be reused by other components in crimson

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/crimson/auth/KeyRing.cc b/src/crimson/auth/KeyRing.cc
index 7fe4f5edf78cc0832182fe1562f43fa2c442b4be..436e29c1bdd0014b33ca2d513521100458522b11 100644 (file)
--- a/src/crimson/auth/KeyRing.cc
+++ b/src/crimson/auth/KeyRing.cc
@@ -13,21 +13,11 @@
 #include "common/buffer_seastar.h"
 #include "auth/KeyRing.h"
 #include "include/denc.h"
+#include "crimson/common/buffer_io.h"
 #include "crimson/common/config_proxy.h"
 
 namespace crimson::auth {
 
-seastar::future<seastar::temporary_buffer<char>> read_file(const std::string& path)
-{
-  return seastar::open_file_dma(path, seastar::open_flags::ro).then([] (seastar::file f) {
-    return f.size().then([f = std::move(f)](size_t s) {
-      return seastar::do_with(seastar::make_file_input_stream(f), [s](seastar::input_stream<char>& in) {
-        return in.read_exactly(s);
-      });
-    });
-  });
-}
-
 seastar::future<KeyRing*> load_from_keyring(KeyRing* keyring)
 {
   std::vector<std::string> paths;

diff --git a/src/crimson/common/buffer_io.cc b/src/crimson/common/buffer_io.cc
index 68355684559e7cb41f55ed9de614e51e39df1182..0e436d98b59a0a37867034adaef2092793fcfeb5 100644 (file)
--- a/src/crimson/common/buffer_io.cc
+++ b/src/crimson/common/buffer_io.cc
@@ -37,4 +37,18 @@ seastar::future<> write_file(ceph::buffer::list&& bl,
   });
 }
 
+seastar::future<seastar::temporary_buffer<char>>
+read_file(const seastar::sstring fn)
+{
+  return seastar::open_file_dma(fn, seastar::open_flags::ro).then(
+    [] (seastar::file f) {
+    return f.size().then([f = std::move(f)](size_t s) {
+      return seastar::do_with(seastar::make_file_input_stream(f),
+                             [s](seastar::input_stream<char>& in) {
+        return in.read_exactly(s);
+      });
+    });
+  });
+}
+
 }

diff --git a/src/crimson/common/buffer_io.h b/src/crimson/common/buffer_io.h
index 0a98ec58fc207765389c7ea2dee21e027c76bfe0..c5ece4a6fba7790da68356270380cc4c5581548b 100644 (file)
--- a/src/crimson/common/buffer_io.h
+++ b/src/crimson/common/buffer_io.h
@@ -16,4 +16,6 @@ namespace crimson {
                                   seastar::file_permissions::user_write |
                                   seastar::file_permissions::group_read |
                                   seastar::file_permissions::others_read));
+  seastar::future<seastar::temporary_buffer<char>>
+  read_file(const seastar::sstring fn);
 }