RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-25 03:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: Update OpRequest to work without using namespace

Browse Source 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
This commit is contained in:
Adam C. Emerson 2019-03-28 20:33:05 -04:00
parent 75014ceb14
commit b7746d84a0
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osd/OpRequest.cc
View File

@ -23,6 +23,13 @@
#define tracepoint(...)
#endif
using std::ostream;
using std::set;
using std::string;
using std::stringstream;
using ceph::Formatter;
OpRequest::OpRequest(Message *req, OpTracker *tracker) :
TrackedOp(tracker, req->get_recv_stamp()),
rmw_flags(0), request(req),

14
src/osd/OpRequest.h
View File

@ -71,7 +71,7 @@ struct OpRequest : public TrackedOp {
return classes_;
}
void _dump(Formatter *f) const override;
void _dump(ceph::Formatter *f) const override;
bool has_feature(uint64_t f) const {
return request->get_connection()->has_feature(f);
@ -96,9 +96,9 @@ private:
OpRequest(Message *req, OpTracker *tracker);
protected:
void _dump_op_descriptor_unlocked(ostream& stream) const override;
void _dump_op_descriptor_unlocked(std::ostream& stream) const override;
void _unregistered() override;
bool filter_out(const set<string>& filters) override;
bool filter_out(const std::set<std::string>& filters) override;
public:
~OpRequest() override {
@ -140,13 +140,13 @@ public:
void mark_reached_pg() {
mark_flag_point(flag_reached_pg, "reached_pg");
}
void mark_delayed(const string& s) {
void mark_delayed(const std::string& s) {
mark_flag_point_string(flag_delayed, s);
}
void mark_started() {
mark_flag_point(flag_started, "started");
}
void mark_sub_op_sent(const string& s) {
void mark_sub_op_sent(const std::string& s) {
mark_flag_point_string(flag_sub_op_sent, s);
}
void mark_commit_sent() {
@ -169,11 +169,11 @@ public:
private:
void set_rmw_flags(int flags);
void mark_flag_point(uint8_t flag, const char *s);
void mark_flag_point_string(uint8_t flag, const string& s);
void mark_flag_point_string(uint8_t flag, const std::string& s);
};
typedef OpRequest::Ref OpRequestRef;
ostream& operator<<(ostream& out, const OpRequest::ClassInfo& i);
std::ostream& operator<<(std::ostream& out, const OpRequest::ClassInfo& i);
#endif /* OPREQUEST_H_ */