Refactor Metrics

chrome/browser/performance_monitor/database.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_DATABASE_H_
 #define CHROME_BROWSER_PERFORMANCE_MONITOR_DATABASE_H_
 
 #include <vector>
 #include <set>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/performance_monitor/constants.h"
 #include "chrome/browser/performance_monitor/event.h"
-#include "chrome/browser/performance_monitor/metric_info.h"
-#include "chrome/browser/performance_monitor/metric_details.h"
+#include "chrome/browser/performance_monitor/metric.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 
 namespace performance_monitor {
 
 struct TimeRange {
   TimeRange();
   TimeRange(base::Time start_time, base::Time end_time);
   ~TimeRange();
 
   base::Time start;
@@ skipping 51 matching lines @@
 //
 // Metric DB:
 // Stores the statistics for different metrics. Having the time before the
 // activity ensures that the search space can only be as large as the time
 // interval.
 // Key: Metric - Time - Activity
 // Value: Statistic
 class Database {
  public:
   typedef std::vector<linked_ptr<Event> > EventList;
-  typedef std::set<EventType> EventTypeSet;

[eaugusti, 2012/08/17 21:06:04]

I think EventTypeSet should stay alive.

-  typedef std::vector<MetricInfo> MetricInfoVector;
-  typedef std::map<std::string, linked_ptr<MetricInfoVector> > MetricVectorMap;
+  typedef std::map<std::string, linked_ptr<std::vector<Metric> > >
+     MetricVectorMap;
 
   static const char kDatabaseSequenceToken[];
 
   // The class that the database will use to infer time. Abstracting out the
   // time mechanism allows for easy testing and mock data insetion.
   class Clock {
    public:
     Clock() {}
     virtual ~Clock() {}
     virtual base::Time GetTime() = 0;
@@ skipping 22 matching lines @@
   }
 
   EventList GetEvents(EventType type) {
     return GetEvents(type, base::Time(), clock_->GetTime());
   }
 
   EventList GetEvents() {
     return GetEvents(EVENT_UNDEFINED, base::Time(), clock_->GetTime());
   }
 
-  EventTypeSet GetEventTypes(const base::Time& start, const base::Time& end);
+  std::set<EventType> GetEventTypes(const base::Time& start,
+                                    const base::Time& end);
 
-  EventTypeSet GetEventTypes() {
+  std::set<EventType> GetEventTypes() {
     return GetEventTypes(base::Time(), clock_->GetTime());
   }
 
   // Add a metric instance to the database.
   bool AddMetric(const std::string& activity,
                  MetricType metric_type,
                  const std::string& value);
 
   bool AddMetric(MetricType metric_type, const std::string& value) {
     return AddMetric(kProcessChromeAggregate, metric_type, value);
   }
 
   // Get the metrics that are active for the given process between |start|
   // (inclusive) and |end| (exclusive).
-  std::vector<const MetricDetails*> GetActiveMetrics(const base::Time& start,
-                                                     const base::Time& end);
+  std::set<MetricType> GetActiveMetrics(const base::Time& start,
+                                        const base::Time& end);
 
   // Get the activities that are active for the given metric after |start|.
-  std::vector<std::string> GetActiveActivities(MetricType metric_type,
-                                               const base::Time& start);
+  std::set<std::string> GetActiveActivities(MetricType metric_type,
+                                            const base::Time& start);
 
   // Populate info with the most recent activity. Return false if populate
   // was unsuccessful.
   bool GetRecentStatsForActivityAndMetric(const std::string& activity,
                                           MetricType metric,
-                                          MetricInfo* info);
+                                          Metric* info);
 
-  bool GetRecentStatsForActivityAndMetric(MetricType metric, MetricInfo* info) {
+  bool GetRecentStatsForActivityAndMetric(MetricType metric, Metric* info) {
     return GetRecentStatsForActivityAndMetric(kProcessChromeAggregate,
                                               metric,
                                               info);
   }
 
   // Query given |metric_type| and |activity|.
-  MetricInfoVector GetStatsForActivityAndMetric(const std::string& activity,
-                                                MetricType metric_type,
-                                                const base::Time& start,
-                                                const base::Time& end);
+  std::vector<Metric> GetStatsForActivityAndMetric(const std::string& activity,
+                                                   MetricType metric_type,
+                                                   const base::Time& start,
+                                                   const base::Time& end);
 
-  MetricInfoVector GetStatsForActivityAndMetric(MetricType metric_type,
-                                                const base::Time& start,
-                                                const base::Time& end) {
+  std::vector<Metric> GetStatsForActivityAndMetric(MetricType metric_type,
+                                                   const base::Time& start,
+                                                   const base::Time& end) {
     return GetStatsForActivityAndMetric(kProcessChromeAggregate, metric_type,
                                         start, end);
   }
 
-  MetricInfoVector GetStatsForActivityAndMetric(const std::string& activity,
-                                                MetricType metric_type) {
+  std::vector<Metric> GetStatsForActivityAndMetric(const std::string& activity,
+                                                   MetricType metric_type) {
     return GetStatsForActivityAndMetric(activity, metric_type, base::Time(),
                                         clock_->GetTime());
   }
 
-  MetricInfoVector GetStatsForActivityAndMetric(MetricType metric_type) {
+  std::vector<Metric> GetStatsForActivityAndMetric(MetricType metric_type) {
     return GetStatsForActivityAndMetric(kProcessChromeAggregate, metric_type,
                                         base::Time(), clock_->GetTime());
   }
 
   // Query given |metric_type|. The returned map is keyed by activity.
   MetricVectorMap GetStatsForMetricByActivity(MetricType metric_type,
                                               const base::Time& start,
                                               const base::Time& end);
 
   MetricVectorMap GetStatsForMetricByActivity(MetricType metric_type) {
@@ skipping 66 matching lines @@
 
   leveldb::ReadOptions read_options_;
   leveldb::WriteOptions write_options_;
 
   DISALLOW_COPY_AND_ASSIGN(Database);
 };
 
 }  // namespace performance_monitor
 
 #endif  // CHROME_BROWSER_PERFORMANCE_MONITOR_DATABASE_H_