shill: LinkMonitor: Apply readability-review comments
Modify LinkMonitor and those affected by it to add
changes suggested during readability review.
BUG=chromium-os:32600
TEST=Unit tests
Change-Id: Ie48ac6d6ea1727207042fe5bf1519875b0673501
Reviewed-on: https://gerrit.chromium.org/gerrit/33047
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Ready: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
diff --git a/link_monitor.cc b/link_monitor.cc
index 6bf1208..8bc7912 100644
--- a/link_monitor.cc
+++ b/link_monitor.cc
@@ -4,6 +4,7 @@
#include "shill/link_monitor.h"
+#include <string>
#include <vector>
#include <base/bind.h>
@@ -27,10 +28,10 @@
namespace shill {
-const unsigned int LinkMonitor::kTestPeriodMilliseconds = 5000;
+const int LinkMonitor::kTestPeriodMilliseconds = 5000;
const char LinkMonitor::kDefaultLinkMonitorTechnologies[] = "wifi";
-const unsigned int LinkMonitor::kFailureThreshold = 5;
-const unsigned int LinkMonitor::kMaxResponseSampleFilterDepth = 5;
+const int LinkMonitor::kFailureThreshold = 5;
+const int LinkMonitor::kMaxResponseSampleFilterDepth = 5;
LinkMonitor::LinkMonitor(const ConnectionRefPtr &connection,
EventDispatcher *dispatcher,
@@ -47,7 +48,8 @@
is_unicast_(false),
response_sample_count_(0),
response_sample_bucket_(0),
- time_(Time::GetInstance()) {}
+ time_(Time::GetInstance()) {
+}
LinkMonitor::~LinkMonitor() {
Stop();
@@ -57,7 +59,7 @@
Stop();
if (!device_info_->GetMACAddress(
- connection_->interface_index(), &local_mac_address_)) {
+ connection_->interface_index(), &local_mac_address_)) {
LOG(ERROR) << "Could not get local MAC address.";
metrics_->NotifyLinkMonitorFailure(
connection_->technology(),
@@ -68,7 +70,7 @@
}
gateway_mac_address_ = ByteString(local_mac_address_.GetLength());
send_request_callback_.Reset(
- Bind(&LinkMonitor::SendRequestTask, Unretained(this)));
+ Bind(base::IgnoreResult(&LinkMonitor::SendRequest), Unretained(this)));
time_->GetTimeMonotonic(&started_monitoring_at_);
return SendRequest();
}
@@ -89,13 +91,12 @@
timerclear(&sent_request_at_);
}
-unsigned int LinkMonitor::GetResponseTimeMilliseconds() const {
+int LinkMonitor::GetResponseTimeMilliseconds() const {
return response_sample_count_ ?
response_sample_bucket_ / response_sample_count_ : 0;
}
-void LinkMonitor::AddResponseTimeSample(
- unsigned int response_time_milliseconds) {
+void LinkMonitor::AddResponseTimeSample(int response_time_milliseconds) {
SLOG(Link, 2) << "In " << __func__ << " with sample "
<< response_time_milliseconds << ".";
metrics_->NotifyLinkMonitorResponseTimeSampleAdded(
@@ -287,8 +288,4 @@
return true;
}
-void LinkMonitor::SendRequestTask() {
- SendRequest();
-}
-
} // namespace shill