X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=trace_loader.hpp;h=9f74a9bde8e967d6de3e08a740bed1ce366a688b;hb=c5b741c83e804f1e438caca83565a76e254d0b94;hp=26567000323f525baff7928fe5e4b552d429f43f;hpb=2257168033b52be3094efdbd7eadff8eb77a4c4e;p=apitrace

diff --git a/trace_loader.hpp b/trace_loader.hpp
index 2656700..9f74a9b 100644
--- a/trace_loader.hpp
+++ b/trace_loader.hpp
@@ -38,18 +38,17 @@ public:
     std::vector<Trace::Call*> frame(int idx);
 
 private:
-    struct FrameOffset {
-        FrameOffset()
+    struct FrameBookmark {
+        FrameBookmark()
             : numberOfCalls(0)
         {}
-        FrameOffset(const File::Offset &s)
+        FrameBookmark(const ParseBookmark &s)
             : start(s),
               numberOfCalls(0)
         {}
 
-        File::Offset start;
+        ParseBookmark start;
         int numberOfCalls;
-        unsigned callNumber;
     };
     bool isCallAFrameMarker(const Trace::Call *call) const;
 
@@ -57,13 +56,8 @@ private:
     Trace::Parser m_parser;
     FrameMarker m_frameMarker;
 
-    std::map<int, Trace::Frame*> m_frameCache;
-    std::queue<Trace::Frame*> m_loadedFrames;
-
-    typedef std::map<int, FrameOffset> FrameOffsets;
-    FrameOffsets m_frameOffsets;
-
-    Trace::File *file;
+    typedef std::map<int, FrameBookmark> FrameBookmarks;
+    FrameBookmarks m_frameBookmarks;
 };
 
 }