Refactor Metrics

chrome/browser/performance_monitor/database.cc

 // 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.
 
 #include "chrome/browser/performance_monitor/database.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/json/json_reader.h"
@@ skipping 257 matching lines @@
     }
     scoped_ptr<Event> event =
         Event::FromValue(scoped_ptr<base::DictionaryValue>(dict));
     if (!event.get())
       continue;
     events.push_back(linked_ptr<Event>(event.release()));
   }
   return events;
 }
 
-Database::EventTypeSet Database::GetEventTypes(const base::Time& start,
+std::set<EventType> Database::GetEventTypes(const base::Time& start,
                                                const base::Time& end) {
   CHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  EventTypeSet results;
+  std::set<EventType> results;
   std::string start_key = CreateEventKey(start, EVENT_UNDEFINED);
   std::string end_key = CreateEventKey(end, EVENT_NUMBER_OF_EVENTS);
   scoped_ptr<leveldb::Iterator> it(event_db_->NewIterator(read_options_));
   for (it->Seek(start_key);
        it->Valid() && it->key().ToString() <= end_key;
        it->Next()) {
     EventType key_type = EventKeyToEventType(it->key().ToString());
     results.insert(key_type);
   }
   return results;
@@ skipping 12 matching lines @@
   if (old_it != recent_map_.end())
     recent_db_->Delete(write_options_, old_it->second);
   recent_map_[recent_map_key] = recent_key;
   leveldb::Status recent_status =
       recent_db_->Put(write_options_, recent_key, value);
   leveldb::Status metric_status =
       metric_db_->Put(write_options_, metric_key, value);
   return recent_status.ok() && metric_status.ok();
 }
 
-std::vector<const MetricDetails*> Database::GetActiveMetrics(
+std::set<MetricType> Database::GetActiveMetrics(

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

typedef std::set<MetricType> MetricTypeSet;

     const base::Time& start, const base::Time& end) {
   CHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  std::vector<const MetricDetails*> results;
   std::string recent_start_key = CreateRecentKey(
       start, static_cast<MetricType>(0), std::string());
   std::string recent_end_key = CreateRecentKey(
       end, METRIC_NUMBER_OF_METRICS, std::string());
   std::string recent_end_of_time_key = CreateRecentKey(
       clock_->GetTime(), METRIC_NUMBER_OF_METRICS, std::string());
 
   std::set<MetricType> active_metrics;
   // Get all the guaranteed metrics.
   scoped_ptr<leveldb::Iterator> recent_it(
@@ skipping 23 matching lines @@
     std::string metric_start_key = CreateMetricKey(start, *possible_it,
                                                    std::string());
     std::string metric_end_key = CreateMetricKey(end, *possible_it,
                                                  std::string());
     metric_it->Seek(metric_start_key);
     // Stats in the timerange from any activity makes the metric active.
     if (metric_it->Valid() && metric_it->key().ToString() <= metric_end_key) {
       active_metrics.insert(*possible_it);
     }
   }
-  std::set<MetricType>::iterator it;
-  for (it = active_metrics.begin(); it != active_metrics.end(); ++it)
-    results.push_back(GetMetricDetails(*it));
 
-  return results;
+  return active_metrics;
 }
 
-std::vector<std::string> Database::GetActiveActivities(
-    MetricType metric_type, const base::Time& start) {
+std::set<std::string> Database::GetActiveActivities(MetricType metric_type,
+                                                    const base::Time& start) {
   CHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  std::vector<std::string> results;
+  std::set<std::string> results;
   std::string start_key = CreateRecentKey(
       start, static_cast<MetricType>(0), std::string());
   scoped_ptr<leveldb::Iterator> it(recent_db_->NewIterator(read_options_));
   for (it->Seek(start_key); it->Valid(); it->Next()) {
     RecentKey split_key = SplitRecentKey(it->key().ToString());
     if (split_key.type == metric_type)
-      results.push_back(split_key.activity);
+      results.insert(split_key.activity);
   }
   return results;
 }
 
 bool Database::GetRecentStatsForActivityAndMetric(
     const std::string& activity,
     MetricType metric,
-    MetricInfo* info) {
+    Metric* info) {
   CHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   std::string recent_map_key = CreateRecentMapKey(metric, activity);
   if (!ContainsKey(recent_map_, recent_map_key))
     return false;
   std::string recent_key = recent_map_[recent_map_key];
 
   std::string result;
   leveldb::Status status = recent_db_->Get(read_options_, recent_key, &result);
   if (status.ok())
-    *info = MetricInfo(SplitRecentKey(recent_key).time, result);
+    *info = Metric(SplitRecentKey(recent_key).time, result);
   return status.ok();
 }
 
-Database::MetricInfoVector Database::GetStatsForActivityAndMetric(
+std::vector<Metric> Database::GetStatsForActivityAndMetric(
     const std::string& activity, MetricType metric_type,
     const base::Time& start, const base::Time& end) {
   CHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  MetricInfoVector results;
+  std::vector<Metric> results;
   std::string start_key = CreateMetricKey(start, metric_type, activity);
   std::string end_key = CreateMetricKey(end, metric_type, activity);
   scoped_ptr<leveldb::Iterator> it(metric_db_->NewIterator(read_options_));
   for (it->Seek(start_key);
        it->Valid() && it->key().ToString() <= end_key;
        it->Next()) {
     MetricKey split_key = SplitMetricKey(it->key().ToString());
     if (split_key.activity == activity)
-      results.push_back(MetricInfo(split_key.time, it->value().ToString()));
+      results.push_back(Metric(split_key.time, it->value().ToString()));
   }
   return results;
 }
 
 Database::MetricVectorMap Database::GetStatsForMetricByActivity(
     MetricType metric_type, const base::Time& start, const base::Time& end) {
   CHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   MetricVectorMap results;
   std::string start_key = CreateMetricKey(start, metric_type, std::string());
   std::string end_key = CreateMetricKey(end, metric_type, std::string());
   scoped_ptr<leveldb::Iterator> it(metric_db_->NewIterator(read_options_));
   for (it->Seek(start_key);
        it->Valid() && it->key().ToString() <= end_key;
        it->Next()) {
     MetricKey split_key = SplitMetricKey(it->key().ToString());
     if (!results[split_key.activity].get()) {
       results[split_key.activity] =
-          linked_ptr<MetricInfoVector>(new MetricInfoVector());
+          linked_ptr<std::vector<Metric> >(new std::vector<Metric>());
     }
     results[split_key.activity]->push_back(
-        MetricInfo(split_key.time, it->value().ToString()));
+        Metric(split_key.time, it->value().ToString()));
   }
   return results;
 }
 
 Database::Database(const FilePath& path)
     : path_(path),
       read_options_(leveldb::ReadOptions()),
       write_options_(leveldb::WriteOptions()) {
   InitDBs();
   LoadRecents();
@@ skipping 78 matching lines @@
     start_time_key_ = CreateActiveIntervalKey(current_time);
     end_time = start_time_key_;
   } else {
     end_time = CreateActiveIntervalKey(clock_->GetTime());
   }
   last_update_time_ = current_time;
   active_interval_db_->Put(write_options_, start_time_key_, end_time);
 }
 
 }  // namespace performance_monitor