Fix and cleanup state lookups on frames.

[apitrace] / trace_file.hpp

diff --git a/trace_file.hpp b/trace_file.hpp
index 487121187fdd9dad368fe631445b3ffea218a80e..4b1b70ddad6f6bd886ac7aa51c28f5604b281faf 100644 (file)
--- a/trace_file.hpp
+++ b/trace_file.hpp
@@ -40,9 +40,9 @@ public:
         Write
     };
     struct Offset {
-        Offset()
-            : chunk(0),
-              offsetInChunk(0)
+        Offset(uint64_t _chunk = 0, uint32_t _offsetInChunk = 0)
+            : chunk(_chunk),
+              offsetInChunk(_offsetInChunk)
         {}
         uint64_t chunk;
         uint32_t offsetInChunk;
@@ -59,18 +59,17 @@ public:
     bool isOpened() const;
     File::Mode mode() const;
 
-    std::string filename() const;
-
     bool open(const std::string &filename, File::Mode mode);
     bool write(const void *buffer, size_t length);
     bool read(void *buffer, size_t length);
     void close();
     void flush(void);
     int getc();
-    bool skip(unsigned length);
+    bool skip(size_t length);
+    int percentRead();
 
     virtual bool supportsOffsets() const = 0;
-    virtual File::Offset currentOffset();
+    virtual File::Offset currentOffset() = 0;
     virtual void setCurrentOffset(const File::Offset &offset);
 protected:
     virtual bool rawOpen(const std::string &filename, File::Mode mode) = 0;
@@ -79,10 +78,10 @@ protected:
     virtual int rawGetc() = 0;
     virtual void rawClose() = 0;
     virtual void rawFlush() = 0;
-    virtual bool rawSkip(unsigned length) = 0;
+    virtual bool rawSkip(size_t length) = 0;
+    virtual int rawPercentRead() = 0;
 
 protected:
-    std::string m_filename;
     File::Mode m_mode;
     bool m_isOpened;
 };
@@ -97,11 +96,6 @@ inline File::Mode File::mode() const
     return m_mode;
 }
 
-inline std::string File::filename() const
-{
-    return m_filename;
-}
-
 inline bool File::open(const std::string &filename, File::Mode mode)
 {
     if (m_isOpened) {
@@ -129,6 +123,14 @@ inline bool File::read(void *buffer, size_t length)
     return rawRead(buffer, length);
 }
 
+inline int File::percentRead()
+{
+    if (!m_isOpened || m_mode != File::Read) {
+        return 0;
+    }
+    return rawPercentRead();
+}
+
 inline void File::close()
 {
     if (m_isOpened) {
@@ -139,7 +141,9 @@ inline void File::close()
 
 inline void File::flush(void)
 {
-    rawFlush();
+    if (m_mode == File::Write) {
+        rawFlush();
+    }
 }
 
 inline int File::getc()
@@ -150,7 +154,7 @@ inline int File::getc()
     return rawGetc();
 }
 
-inline bool File::skip(unsigned length)
+inline bool File::skip(size_t length)
 {
     if (!m_isOpened || m_mode != File::Read) {
         return false;
@@ -166,6 +170,7 @@ public:
 
 
     virtual bool supportsOffsets() const;
+    virtual File::Offset currentOffset();
 protected:
     virtual bool rawOpen(const std::string &filename, File::Mode mode);
     virtual bool rawWrite(const void *buffer, size_t length);
@@ -173,9 +178,11 @@ protected:
     virtual int rawGetc();
     virtual void rawClose();
     virtual void rawFlush();
-    virtual bool rawSkip(unsigned length);
+    virtual bool rawSkip(size_t length);
+    virtual int  rawPercentRead();
 private:
     void *m_gzFile;
+    double m_endOffset;
 };
 
 inline bool