Skip to content

Commit

Permalink
common/TrackedOp: remove unused 'now' in _dump()
Browse files Browse the repository at this point in the history
Greg pointed this out in PR ceph#11985

Signed-off-by: John Spray <john.spray@redhat.com>
  • Loading branch information
John Spray committed Nov 15, 2016
1 parent 82f5750 commit af720cc
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/common/TrackedOp.cc
Expand Up @@ -369,7 +369,7 @@ void TrackedOp::dump(utime_t now, Formatter *f) const
f->dump_float("duration", get_duration());
{
f->open_array_section("type_data");
_dump(now, f);
_dump(f);
f->close_section();
}
}
2 changes: 1 addition & 1 deletion src/common/TrackedOp.h
Expand Up @@ -150,7 +150,7 @@ class TrackedOp {
{ }

/// output any type-specific data you want to get when dump() is called
virtual void _dump(utime_t now, Formatter *f) const {}
virtual void _dump(Formatter *f) const {}
/// if you want something else to happen when events are marked, implement
virtual void _event_marked() {}
/// return a unique descriptor of the Op; eg the message it's attached to
Expand Down
4 changes: 2 additions & 2 deletions src/mds/Mutation.cc
Expand Up @@ -315,10 +315,10 @@ void MDRequestImpl::print(ostream &out) const

void MDRequestImpl::dump(Formatter *f) const
{
_dump(ceph_clock_now(g_ceph_context), f);
_dump(f);
}

void MDRequestImpl::_dump(utime_t now, Formatter *f) const
void MDRequestImpl::_dump(Formatter *f) const
{
f->dump_string("flag_point", state_string());
f->dump_stream("reqid") << reqid;
Expand Down
2 changes: 1 addition & 1 deletion src/mds/Mutation.h
Expand Up @@ -333,7 +333,7 @@ struct MDRequestImpl : public MutationImpl, public TrackedOp {
// TrackedOp stuff
typedef ceph::shared_ptr<MDRequestImpl> Ref;
protected:
void _dump(utime_t now, Formatter *f) const;
void _dump(Formatter *f) const;
void _dump_op_descriptor_unlocked(ostream& stream) const;
};

Expand Down
2 changes: 1 addition & 1 deletion src/osd/OpRequest.cc
Expand Up @@ -46,7 +46,7 @@ OpRequest::OpRequest(Message *req, OpTracker *tracker) :
tracker->mark_event(this, "dispatched", request->get_dispatch_stamp());
}

void OpRequest::_dump(utime_t now, Formatter *f) const
void OpRequest::_dump(Formatter *f) const
{
Message *m = request;
f->dump_string("flag_point", state_string());
Expand Down
2 changes: 1 addition & 1 deletion src/osd/OpRequest.h
Expand Up @@ -99,7 +99,7 @@ struct OpRequest : public TrackedOp {
return classes_;
}

void _dump(utime_t now, Formatter *f) const;
void _dump(Formatter *f) const;

bool has_feature(uint64_t f) const {
return request->get_connection()->has_feature(f);
Expand Down

0 comments on commit af720cc

Please sign in to comment.