X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=trace_loader.hpp;h=9f74a9bde8e967d6de3e08a740bed1ce366a688b;hb=851d0b0452234ace66a511327bd8e6f9d68fe9e9;hp=7b746b951ffdd849e23ff6bc2f667a3131d2fe72;hpb=c9385be0ae27a206be571f342f299c8762627b56;p=apitrace

diff --git a/trace_loader.hpp b/trace_loader.hpp
index 7b746b9..9f74a9b 100644
--- a/trace_loader.hpp
+++ b/trace_loader.hpp
@@ -30,7 +30,7 @@ public:
     void setFrameMarker(Loader::FrameMarker marker);
 
     int numberOfFrames() const;
-    int numberOfCallsInFrame(int frameIdx);
+    int numberOfCallsInFrame(int frameIdx) const;
 
     bool open(const char *filename);
     void close();
@@ -38,19 +38,16 @@ public:
     std::vector<Trace::Call*> frame(int idx);
 
 private:
-    struct FrameOffset {
-        FrameOffset()
+    struct FrameBookmark {
+        FrameBookmark()
             : numberOfCalls(0)
         {}
-        FrameOffset(const File::Offset &s,
-                    const File::Offset &e)
+        FrameBookmark(const ParseBookmark &s)
             : start(s),
-              end(e),
               numberOfCalls(0)
         {}
 
-        File::Offset start;
-        File::Offset end;
+        ParseBookmark start;
         int numberOfCalls;
     };
     bool isCallAFrameMarker(const Trace::Call *call) const;
@@ -59,12 +56,8 @@ private:
     Trace::Parser m_parser;
     FrameMarker m_frameMarker;
 
-    std::map<int, Trace::Frame*> m_frameCache;
-    std::queue<Trace::Frame*> m_loadedFrames;
-
-    std::map<int, FrameOffset> m_frameOffsets;
-
-    Trace::File *file;
+    typedef std::map<int, FrameBookmark> FrameBookmarks;
+    FrameBookmarks m_frameBookmarks;
 };
 
 }