Chrome Performance Monitor: MetricDetails refactor.

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>
@@ skipping 123 matching lines @@
     return GetEvents(EVENT_UNDEFINED, base::Time(), clock_->GetTime());
   }
 
   EventTypeSet GetEventTypes(const base::Time& start, const base::Time& end);
 
   EventTypeSet GetEventTypes() {
     return GetEventTypes(base::Time(), clock_->GetTime());
   }
 
   // Add a metric instance to the database.
-  bool AddMetric(const std::string& activity, const std::string& metric,
+  bool AddMetric(const std::string& activity,
+                 MetricType metric_type,
                  const std::string& value);
 
-  bool AddMetric(const std::string& metric, const std::string& value) {
-    return AddMetric(kProcessChromeAggregate, metric, value);
+  bool AddMetric(MetricType metric_type, const std::string& value) {
+    return AddMetric(kProcessChromeAggregate, metric_type, value);
   }
 
-  void AddMetricDetails(const MetricDetails& details);
-
   // Get the metrics that are active for the given process between |start|
   // (inclusive) and |end| (exclusive).
-  std::vector<MetricDetails> GetActiveMetrics(const base::Time& start,
-                                              const base::Time& end);
+  std::vector<const MetricDetails*> 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(const std::string& metric,
+  std::vector<std::string> GetActiveActivities(MetricType metric_type,
                                                const base::Time& start);
 
-  // Query given metric and activity.
+  // Query given |metric_type| and |activity|.
   MetricInfoVector GetStatsForActivityAndMetric(const std::string& activity,
-                                                const std::string& metric,
+                                                MetricType metric_type,
                                                 const base::Time& start,
                                                 const base::Time& end);
 
-  MetricInfoVector GetStatsForActivityAndMetric(const std::string& metric,
+  MetricInfoVector GetStatsForActivityAndMetric(MetricType metric_type,
                                                 const base::Time& start,
                                                 const base::Time& end) {
-    return GetStatsForActivityAndMetric(kProcessChromeAggregate, metric,
+    return GetStatsForActivityAndMetric(kProcessChromeAggregate, metric_type,
                                         start, end);
   }
 
   MetricInfoVector GetStatsForActivityAndMetric(const std::string& activity,
-                                                const std::string& metric) {
-    return GetStatsForActivityAndMetric(activity, metric, base::Time(),
+                                                MetricType metric_type) {
+    return GetStatsForActivityAndMetric(activity, metric_type, base::Time(),
                                         clock_->GetTime());
   }
 
-  MetricInfoVector GetStatsForActivityAndMetric(const std::string& metric) {
-    return GetStatsForActivityAndMetric(kProcessChromeAggregate, metric,
+  MetricInfoVector GetStatsForActivityAndMetric(MetricType metric_type) {
+    return GetStatsForActivityAndMetric(kProcessChromeAggregate, metric_type,
                                         base::Time(), clock_->GetTime());
   }
 
-  // Query given metric. The returned map is keyed by activity.
-  MetricVectorMap GetStatsForMetricByActivity(const std::string& metric,
+  // 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(const std::string& metric) {
-    return GetStatsForMetricByActivity(metric, base::Time(), clock_->GetTime());
+  MetricVectorMap GetStatsForMetricByActivity(MetricType metric_type) {
+    return GetStatsForMetricByActivity(
+        metric_type, base::Time(), clock_->GetTime());
   }
 
   // Returns the active time intervals that overlap with the time interval
   // defined by |start| and |end|.
   std::vector<TimeRange> GetActiveIntervals(const base::Time& start,
                                             const base::Time& end);
 
   FilePath path() const { return path_; }
 
   void set_clock(scoped_ptr<Clock> clock) {
     clock_ = clock.Pass();
   }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(PerformanceMonitorDatabaseSetupTest, OpenClose);
   FRIEND_TEST_ALL_PREFIXES(PerformanceMonitorDatabaseSetupTest, ActiveInterval);
 
   typedef std::map<std::string, std::string> RecentMap;
-  typedef std::map<std::string, MetricDetails> MetricDetailsMap;
 
   // By default, the database uses a clock that simply returns the current time.
   class SystemClock : public Clock {
    public:
     SystemClock() {}
     virtual ~SystemClock() {}
     virtual base::Time GetTime() OVERRIDE;
   };
 
   explicit Database(const FilePath& path);
 
   void InitDBs();
 
-  void InitMetricDetails();
-
   bool Close();
 
   // Load recent info from the db into recent_map_.
   void LoadRecents();
 
   // Mark the database as being active for the current time.
   void UpdateActiveInterval();
 
   // A mapping of id,metric to the last inserted key for those parameters
   // is maintained to prevent having to search through the recent db every
   // insert.
   RecentMap recent_map_;
 
-  // A mapping of a metric key to details about that metric. New metrics should
-  // modify InitMetricDetails to add an entry in this map.
-  MetricDetailsMap metric_details_map_;
-
   // The directory where all the databases will reside.
   FilePath path_;
 
   // The key for the beginning of the active interval.
   std::string start_time_key_;
 
   // The last time the database had a transaction.
   base::Time last_update_time_;
 
   scoped_ptr<Clock> clock_;
@@ skipping 10 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_