Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53ca76f2 authored by Alex Vakulenko's avatar Alex Vakulenko
Browse files

metrics: Switch to use Binder interface to weaved 

Now that weaved provides a binder interface for its IPC, switch
to using it instead.

BUG: 23782171
Change-Id: Ic3c485f99580fe41e287eaf238f033149787f181
parent a649a7df

metricsd/metrics_collector.cc

+41 −33
Original line number Diff line number Diff line
@@ -234,23 +234,15 @@ int MetricsCollector::OnInit() { 
  bus_->AssertOnDBusThread();

  CHECK(bus_->SetUpAsyncOperations());



  device_ = weaved::Device::CreateInstance(

      bus_,

      base::Bind(&MetricsCollector::UpdateWeaveState, base::Unretained(this)));

  device_->AddComponent(kWeaveComponent, {"_metrics"});

  device_->AddCommandHandler(

      kWeaveComponent,

      "_metrics.enableAnalyticsReporting",

      base::Bind(&MetricsCollector::OnEnableMetrics, base::Unretained(this)));

  device_->AddCommandHandler(

      kWeaveComponent,

      "_metrics.disableAnalyticsReporting",

      base::Bind(&MetricsCollector::OnDisableMetrics, base::Unretained(this)));

  weave_service_subscription_ = weaved::Service::Connect(

      brillo::MessageLoop::current(),

      base::Bind(&MetricsCollector::OnWeaveServiceConnected,

                 weak_ptr_factory_.GetWeakPtr()));



  latest_cpu_use_microseconds_ = cpu_usage_collector_->GetCumulativeCpuUse();

  base::MessageLoop::current()->PostDelayedTask(FROM_HERE,

      base::Bind(&MetricsCollector::HandleUpdateStatsTimeout,

                 base::Unretained(this)),

                 weak_ptr_factory_.GetWeakPtr()),

      base::TimeDelta::FromMilliseconds(kUpdateStatsIntervalMs));



  return EX_OK;
@@ -260,12 +252,30 @@ void MetricsCollector::OnShutdown(int* return_code) { 
  brillo::DBusDaemon::OnShutdown(return_code);

}



void MetricsCollector::OnEnableMetrics(

    const std::weak_ptr<weaved::Command>& cmd) {

  auto command = cmd.lock();

  if (!command)

void MetricsCollector::OnWeaveServiceConnected(

    const std::weak_ptr<weaved::Service>& service) {

  service_ = service;

  auto weave_service = service_.lock();

  if (!weave_service)

    return;



  weave_service->AddComponent(kWeaveComponent, {"_metrics"}, nullptr);

  weave_service->AddCommandHandler(

      kWeaveComponent,

      "_metrics.enableAnalyticsReporting",

      base::Bind(&MetricsCollector::OnEnableMetrics,

                 weak_ptr_factory_.GetWeakPtr()));

  weave_service->AddCommandHandler(

      kWeaveComponent,

      "_metrics.disableAnalyticsReporting",

      base::Bind(&MetricsCollector::OnDisableMetrics,

                 weak_ptr_factory_.GetWeakPtr()));



  UpdateWeaveState();

}



void MetricsCollector::OnEnableMetrics(

    std::unique_ptr<weaved::Command> command) {

  if (base::WriteFile(

          shared_metrics_directory_.Append(metrics::kConsentFileName), "", 0) !=

      0) {
@@ -280,11 +290,7 @@ void MetricsCollector::OnEnableMetrics( 
}



void MetricsCollector::OnDisableMetrics(

    const std::weak_ptr<weaved::Command>& cmd) {

  auto command = cmd.lock();

  if (!command)

    return;



    std::unique_ptr<weaved::Command> command) {

  if (!base::DeleteFile(

          shared_metrics_directory_.Append(metrics::kConsentFileName), false)) {

    PLOG(ERROR) << "Could not delete the consent file.";
@@ -298,13 +304,14 @@ void MetricsCollector::OnDisableMetrics( 
}



void MetricsCollector::UpdateWeaveState() {

  if (!device_)

  auto weave_service = service_.lock();

  if (!weave_service)

    return;



  std::string enabled =

      metrics_lib_->AreMetricsEnabled() ? "enabled" : "disabled";



  if (!device_->SetStateProperty(kWeaveComponent,

  if (!weave_service->SetStateProperty(kWeaveComponent,

                                       "_metrics.analyticsReportingState",

                                       enabled,

                                       nullptr)) {
@@ -381,8 +388,8 @@ void MetricsCollector::ScheduleMeminfoCallback(int wait) { 
  }

  base::TimeDelta waitDelta = base::TimeDelta::FromSeconds(wait);

  base::MessageLoop::current()->PostDelayedTask(FROM_HERE,

      base::Bind(&MetricsCollector::MeminfoCallback, base::Unretained(this),

                 waitDelta),

      base::Bind(&MetricsCollector::MeminfoCallback,

                 weak_ptr_factory_.GetWeakPtr(), waitDelta),

      waitDelta);

}
@@ -396,8 +403,8 @@ void MetricsCollector::MeminfoCallback(base::TimeDelta wait) { 
  // Make both calls even if the first one fails.

  if (ProcessMeminfo(meminfo_raw)) {

    base::MessageLoop::current()->PostDelayedTask(FROM_HERE,

        base::Bind(&MetricsCollector::MeminfoCallback, base::Unretained(this),

                   wait),

        base::Bind(&MetricsCollector::MeminfoCallback,

                   weak_ptr_factory_.GetWeakPtr(), wait),

        wait);

  }

}
@@ -564,7 +571,8 @@ void MetricsCollector::ScheduleMemuseCallback(double interval) { 
    return;

  }

  base::MessageLoop::current()->PostDelayedTask(FROM_HERE,

      base::Bind(&MetricsCollector::MemuseCallback, base::Unretained(this)),

      base::Bind(&MetricsCollector::MemuseCallback,

                 weak_ptr_factory_.GetWeakPtr()),

      base::TimeDelta::FromSeconds(interval));

}
@@ -750,6 +758,6 @@ void MetricsCollector::HandleUpdateStatsTimeout() { 
  UpdateStats(TimeTicks::Now(), Time::Now());

  base::MessageLoop::current()->PostDelayedTask(FROM_HERE,

      base::Bind(&MetricsCollector::HandleUpdateStatsTimeout,

                 base::Unretained(this)),

                 weak_ptr_factory_.GetWeakPtr()),

      base::TimeDelta::FromMilliseconds(kUpdateStatsIntervalMs));

}

metricsd/metrics_collector.h

+13 −4
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ 
#include <vector>



#include <base/files/file_path.h>

#include <base/memory/weak_ptr.h>

#include <base/time/time.h>

#include <brillo/binder_watcher.h>

#include <brillo/daemons/dbus_daemon.h>

#include <libweaved/command.h>

#include <libweaved/device.h>

#include <libweaved/service.h>

#include <gtest/gtest_prod.h>  // for FRIEND_TEST



#include "collectors/averaged_statistics_collector.h"
@@ -114,10 +116,10 @@ class MetricsCollector : public brillo::DBusDaemon { 
  };



  // Enables metrics reporting.

  void OnEnableMetrics(const std::weak_ptr<weaved::Command>& cmd);

  void OnEnableMetrics(std::unique_ptr<weaved::Command> command);



  // Disables metrics reporting.

  void OnDisableMetrics(const std::weak_ptr<weaved::Command>& cmd);

  void OnDisableMetrics(std::unique_ptr<weaved::Command> command);



  // Updates the weave device state.

  void UpdateWeaveState();
@@ -216,6 +218,10 @@ class MetricsCollector : public brillo::DBusDaemon { 
  // Reads a string from a file and converts it to uint64_t.

  static bool ReadFileToUint64(const base::FilePath& path, uint64_t* value);



  // Callback invoked when a connection to weaved's service is established

  // over Binder interface.

  void OnWeaveServiceConnected(const std::weak_ptr<weaved::Service>& service);



  // VARIABLES



  // Test mode.
@@ -272,7 +278,10 @@ class MetricsCollector : public brillo::DBusDaemon { 
  unique_ptr<DiskUsageCollector> disk_usage_collector_;

  unique_ptr<AveragedStatisticsCollector> averaged_stats_collector_;



  std::unique_ptr<weaved::Device> device_;

  unique_ptr<weaved::Service::Subscription> weave_service_subscription_;

  std::weak_ptr<weaved::Service> service_;



  base::WeakPtrFactory<MetricsCollector> weak_ptr_factory_{this};

};



#endif  // METRICS_METRICS_COLLECTOR_H_