Actually save the edited calls.

[apitrace] / trace_loader.cpp

diff --git a/trace_loader.cpp b/trace_loader.cpp
index f91e09b00ef5ffe8a9575314c4848690ee7158a3..c14d815382b4680b5b13eac008df33c828e6d8a7 100644 (file)
--- a/trace_loader.cpp
+++ b/trace_loader.cpp
@@ -1,6 +1,5 @@
 #include "trace_loader.hpp"
 
-#include "trace_snappyfile.hpp"
 
 using namespace Trace;
 
@@ -26,16 +25,16 @@ void Loader::setFrameMarker(Loader::FrameMarker marker)
 
 int Loader::numberOfFrames() const
 {
-    return m_frameOffsets.size();
+    return m_frameBookmarks.size();
 }
 
 int Loader::numberOfCallsInFrame(int frameIdx) const
 {
-    if (frameIdx > m_frameOffsets.size()) {
+    if (frameIdx > m_frameBookmarks.size()) {
         return 0;
     }
-    FrameOffsets::const_iterator itr =
-        m_frameOffsets.find(frameIdx);
+    FrameBookmarks::const_iterator itr =
+        m_frameBookmarks.find(frameIdx);
     return itr->second.numberOfCalls;
 }
 
@@ -52,25 +51,21 @@ bool Loader::open(const char *filename)
     }
 
     Trace::Call *call;
-    File::Offset startOffset;
+    ParseBookmark startBookmark;
     int numOfFrames = 0;
     int numOfCalls = 0;
-    unsigned callNum = 0;
     int lastPercentReport = 0;
 
-    startOffset = m_parser.currentOffset();
-    callNum = m_parser.currentCallNumber();
+    m_parser.getBookmark(startBookmark);
 
     while ((call = m_parser.scan_call())) {
         ++numOfCalls;
 
         if (isCallAFrameMarker(call)) {
-            File::Offset endOffset = m_parser.currentOffset();
-            FrameOffset frameOffset(startOffset);
-            frameOffset.numberOfCalls = numOfCalls;
-            frameOffset.callNumber = callNum;
+            FrameBookmark frameBookmark(startBookmark);
+            frameBookmark.numberOfCalls = numOfCalls;
 
-            m_frameOffsets[numOfFrames] = frameOffset;
+            m_frameBookmarks[numOfFrames] = frameBookmark;
             ++numOfFrames;
 
             if (m_parser.percentRead() - lastPercentReport >= 5) {
@@ -79,8 +74,8 @@ bool Loader::open(const char *filename)
                           << "..."<<std::endl;
                 lastPercentReport = m_parser.percentRead();
             }
-            startOffset = endOffset;
-            callNum = m_parser.currentCallNumber();
+            
+            m_parser.getBookmark(startBookmark);
             numOfCalls = 0;
         }
         //call->dump(std::cout, color);
@@ -121,10 +116,9 @@ std::vector<Trace::Call *> Loader::frame(int idx)
 {
     int numOfCalls = numberOfCallsInFrame(idx);
     if (numOfCalls) {
-        const FrameOffset &frameOffset = m_frameOffsets[idx];
+        const FrameBookmark &frameBookmark = m_frameBookmarks[idx];
         std::vector<Trace::Call*> calls(numOfCalls);
-        m_parser.setCurrentOffset(frameOffset.start);
-        m_parser.setCurrentCallNumber(frameOffset.callNumber);
+        m_parser.setBookmark(frameBookmark.start);
 
         Trace::Call *call;
         int parsedCalls = 0;