simpleperf: accept different perf_attr sizes.

[android-x86/system-extras.git] / simpleperf / record_file.h

diff --git a/simpleperf/record_file.h b/simpleperf/record_file.h
index 4cc1757..c0f53b1 100644 (file)
--- a/simpleperf/record_file.h
+++ b/simpleperf/record_file.h
@@ -18,12 +18,14 @@
 #define SIMPLE_PERF_RECORD_FILE_H_
 
 #include <stdio.h>
+
+#include <functional>
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "perf_event.h"
 #include "record.h"
@@ -48,9 +50,6 @@ class RecordFileWriter {
     return WriteData(data.data(), data.size());
   }
 
-  // Read data section that has been written, for further processing.
-  bool ReadDataSection(std::vector<std::unique_ptr<Record>>* records);
-
   bool WriteFeatureHeader(size_t feature_count);
   bool WriteBuildIdFeature(const std::vector<BuildIdRecord>& build_id_records);
   bool WriteFeatureString(int feature, const std::string& s);
@@ -96,31 +95,42 @@ class RecordFileReader {
 
   ~RecordFileReader();
 
-  const PerfFileFormat::FileHeader* FileHeader();
-  std::vector<const PerfFileFormat::FileAttr*> AttrSection();
-  std::vector<uint64_t> IdsForAttr(const PerfFileFormat::FileAttr* attr);
-  std::vector<std::unique_ptr<Record>> DataSection();
-  const std::map<int, PerfFileFormat::SectionDesc>& FeatureSectionDescriptors();
-  const char* DataAtOffset(uint64_t offset) {
-    return mmap_addr_ + offset;
+  const PerfFileFormat::FileHeader& FileHeader() const {
+    return header_;
+  }
+
+  const std::vector<PerfFileFormat::FileAttr>& AttrSection() const {
+    return file_attrs_;
+  }
+
+  const std::map<int, PerfFileFormat::SectionDesc>& FeatureSectionDescriptors() const {
+    return feature_section_descriptors_;
   }
+
+  bool ReadIdsForAttr(const PerfFileFormat::FileAttr& attr, std::vector<uint64_t>* ids);
+  // If sorted is true, sort records before passing them to callback function.
+  bool ReadDataSection(std::function<bool(std::unique_ptr<Record>)> callback, bool sorted = true);
   std::vector<std::string> ReadCmdlineFeature();
   std::vector<BuildIdRecord> ReadBuildIdFeature();
   std::string ReadFeatureString(int feature);
   bool Close();
 
+  // For testing only.
+  std::vector<std::unique_ptr<Record>> DataSection();
+
  private:
-  RecordFileReader(const std::string& filename, int fd);
-  bool MmapFile();
-  bool GetFeatureSection(int feature, const char** pstart, const char** pend);
+  RecordFileReader(const std::string& filename, FILE* fp);
+  bool ReadHeader();
+  bool ReadAttrSection();
+  bool ReadFeatureSectionDescriptors();
+  bool ReadFeatureSection(int feature, std::vector<char>* data);
 
   const std::string filename_;
-  int record_fd_;
-
-  const char* mmap_addr_;
-  size_t mmap_len_;
+  FILE* record_fp_;
 
-  std::map<int, PerfFileFormat::SectionDesc> feature_sections_;
+  PerfFileFormat::FileHeader header_;
+  std::vector<PerfFileFormat::FileAttr> file_attrs_;
+  std::map<int, PerfFileFormat::SectionDesc> feature_section_descriptors_;
 
   DISALLOW_COPY_AND_ASSIGN(RecordFileReader);
 };