From b668f5c78726c6994ddcaf1cf328e17f8bb15298 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 11 Aug 2021 11:55:49 +0800 Subject: [PATCH] osdc: build without "using namespace std" * add "std::" prefix in headers * add "using" declarations in .cc files. so we don't rely on "using namespace std" in one or more included headers. Signed-off-by: Kefu Chai --- src/osdc/Journaler.cc | 1 + src/osdc/Journaler.h | 10 +++++----- src/osdc/Objecter.cc | 3 +++ src/osdc/Objecter.h | 31 ++++++++++++++++--------------- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc index 6e1cbd930ac2c..8084a661d7d34 100644 --- a/src/osdc/Journaler.cc +++ b/src/osdc/Journaler.cc @@ -26,6 +26,7 @@ #define dout_prefix *_dout << objecter->messenger->get_myname() \ << ".journaler." << name << (readonly ? "(ro) ":"(rw) ") +using namespace std; using std::chrono::seconds; diff --git a/src/osdc/Journaler.h b/src/osdc/Journaler.h index 3e8f0f6650b8f..2dcc1197e6111 100644 --- a/src/osdc/Journaler.h +++ b/src/osdc/Journaler.h @@ -135,7 +135,7 @@ public: uint64_t expire_pos; uint64_t unused_field; uint64_t write_pos; - string magic; + std::string magic; file_layout_t layout; //< The mapping from byte stream offsets // to RADOS objects stream_format_t stream_format; //< The encoding of LogEvents @@ -186,7 +186,7 @@ public: f->close_section(); // journal_header } - static void generate_test_instances(list &ls) + static void generate_test_instances(std::list &ls) { ls.push_back(new Header()); @@ -269,7 +269,7 @@ private: void _reread_head(Context *onfinish); void _set_layout(file_layout_t const *l); - list waitfor_recover; + std::list waitfor_recover; void _read_head(Context *on_finish, bufferlist *bl); void _finish_read_head(int r, bufferlist& bl); void _finish_reread_head(int r, bufferlist& bl, Context *finish); @@ -311,7 +311,7 @@ private: uint64_t waiting_for_zero_pos; interval_set pending_zero; // non-contig bits we've zeroed - list waitfor_prezero; + std::list waitfor_prezero; std::map pending_safe; // flush_pos -> safe_pos // when safe through given offset @@ -330,7 +330,7 @@ private: // read buffer. unused_field + read_buf.length() == prefetch_pos. bufferlist read_buf; - map prefetch_buf; + std::map prefetch_buf; uint64_t fetch_len; // how much to read at a time uint64_t temp_fetch_len; diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 6bfebfcc95f88..9565f4326cac9 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -75,6 +75,9 @@ using ceph::encode; using ceph::Formatter; using std::defer_lock; +using std::scoped_lock; +using std::shared_lock; +using std::unique_lock; using ceph::real_time; using ceph::real_clock; diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index d349ef20670ae..cd7bd2ab59d5b 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -69,6 +69,7 @@ class MGetPoolStatsReply; class MStatfsReply; class MCommandReply; class MWatchNotify; +struct ObjectOperation; template struct EnumerationContext; template @@ -401,22 +402,22 @@ struct ObjectOperation { set_handler(CB_ObjectOperation_stat(psize, nullptr, nullptr, pts, prval, nullptr)); out_rval.back() = prval; } - void stat(uint64_t *psize, ceph::real_time *pmtime, nullptr_t) { + void stat(uint64_t *psize, ceph::real_time *pmtime, std::nullptr_t) { add_op(CEPH_OSD_OP_STAT); set_handler(CB_ObjectOperation_stat(psize, pmtime, nullptr, nullptr, nullptr, nullptr)); } - void stat(uint64_t *psize, time_t *ptime, nullptr_t) { + void stat(uint64_t *psize, time_t *ptime, std::nullptr_t) { add_op(CEPH_OSD_OP_STAT); set_handler(CB_ObjectOperation_stat(psize, nullptr, ptime, nullptr, nullptr, nullptr)); } - void stat(uint64_t *psize, struct timespec *pts, nullptr_t) { + void stat(uint64_t *psize, struct timespec *pts, std::nullptr_t) { add_op(CEPH_OSD_OP_STAT); set_handler(CB_ObjectOperation_stat(psize, nullptr, nullptr, pts, nullptr, nullptr)); } - void stat(uint64_t *psize, nullptr_t, nullptr_t) { + void stat(uint64_t *psize, std::nullptr_t, std::nullptr_t) { add_op(CEPH_OSD_OP_STAT); set_handler(CB_ObjectOperation_stat(psize, nullptr, nullptr, nullptr, nullptr, nullptr)); @@ -868,7 +869,7 @@ struct ObjectOperation { ceph::buffer::list bl; add_xattr(CEPH_OSD_OP_RMXATTR, name, bl); } - void setxattrs(map& attrs) { + void setxattrs(std::map& attrs) { using ceph::encode; ceph::buffer::list bl; encode(attrs, bl); @@ -996,7 +997,7 @@ struct ObjectOperation { out_ec.back() = ec; } - void omap_cmp(const std::map > &assertions, + void omap_cmp(const std::map > &assertions, int *prval) { using ceph::encode; OSDOp &op = add_op(CEPH_OSD_OP_OMAP_CMP); @@ -1012,7 +1013,7 @@ struct ObjectOperation { } void omap_cmp(const boost::container::flat_map< - std::string, pair>& assertions, + std::string, std::pair>& assertions, boost::system::error_code *ec) { OSDOp &op = add_op(CEPH_OSD_OP_OMAP_CMP); ceph::buffer::list bl; @@ -1293,13 +1294,13 @@ struct ObjectOperation { out_ec.back() = ec; } - void omap_set(const map &map) { + void omap_set(const std::map &map) { ceph::buffer::list bl; encode(map, bl); add_data(CEPH_OSD_OP_OMAPSETVALS, 0, bl.length(), bl); } - void omap_set(const boost::container::flat_map& map) { + void omap_set(const boost::container::flat_map& map) { ceph::buffer::list bl; encode(map, bl); add_data(CEPH_OSD_OP_OMAPSETVALS, 0, bl.length(), bl); @@ -1405,7 +1406,7 @@ struct ObjectOperation { out_rval.back() = prval; } } - void list_watchers(vector* out, + void list_watchers(std::vector* out, boost::system::error_code* ec) { add_op(CEPH_OSD_OP_LIST_WATCHERS); set_handler(CB_ObjectOperation_decodewatchersneo(out, nullptr, ec)); @@ -2224,7 +2225,7 @@ public: CommandOp( int target_osd, - std::vector&& cmd, + std::vector&& cmd, ceph::buffer::list&& inbl, decltype(onfinish)&& onfinish) : cmd(std::move(cmd)), @@ -2234,7 +2235,7 @@ public: CommandOp( pg_t pgid, - std::vector&& cmd, + std::vector&& cmd, ceph::buffer::list&& inbl, decltype(onfinish)&& onfinish) : cmd(std::move(cmd)), @@ -2305,7 +2306,7 @@ public: watch_pending_async.push_back(ceph::coarse_mono_clock::now()); } void finished_async() { - unique_lock l(watch_lock); + std::unique_lock l(watch_lock); ceph_assert(!watch_pending_async.empty()); watch_pending_async.pop_front(); } @@ -2598,7 +2599,7 @@ private: template decltype(auto) with_osdmap(Callback&& cb, Args&&... args) { - shared_lock l(rwlock); + std::shared_lock l(rwlock); return std::forward(cb)(*osdmap, std::forward(args)...); } @@ -2661,7 +2662,7 @@ private: template auto wait_for_osd_map(CompletionToken&& token) { boost::asio::async_completion init(token); - unique_lock l(rwlock); + std::unique_lock l(rwlock); if (osdmap->get_epoch()) { l.unlock(); boost::asio::post(std::move(init.completion_handler)); -- 2.39.5