Merge branch 'master' into on-demand-loading

Conflicts:
	trace_snappyfile.hpp

diff --combined trace_file.hpp
index fed30a0a8835f64a72c0d61f903279ae3f49b785,5a98f606ce32bb5f0204d4c614adae21cbe1c050..e3d797d3b20d3228f06711cfc9b3d31eef86c7a5
--- 1/trace_file.hpp
--- 2/trace_file.hpp
+++ b/trace_file.hpp
@@@ -29,7 -29,6 +29,7 @@@
  
  #include <string>
  #include <fstream>
 +#include <stdint.h>
  
  namespace Trace {
  
@@@ -39,15 -38,6 +39,15 @@@ public
          Read,
          Write
      };
 +    struct Offset {
 +        Offset()
 +            : chunk(0),
 +              offsetInChunk(0)
 +        {}
 +        uint64_t chunk;
 +        uint32_t offsetInChunk;
 +    };
 +
  public:
      static bool isZLibCompressed(const std::string &filename);
      static bool isSnappyCompressed(const std::string &filename);
@@@ -68,9 -58,6 +68,9 @@@ public
      void flush(void);
      int getc();
  
 +    virtual bool supportsOffsets() const = 0;
 +    virtual File::Offset currentOffset();
 +    virtual void setCurrentOffset(const File::Offset &offset);
  protected:
      virtual bool rawOpen(const std::string &filename, File::Mode mode) = 0;
      virtual bool rawWrite(const void *buffer, int length) = 0;
@@@ -143,7 -130,7 +143,7 @@@ inline void File::flush(void
  inline int File::getc()
  {
      if (!m_isOpened || m_mode != File::Read) {
-         return 0;
+         return -1;
      }
      return rawGetc();
  }
@@@ -154,8 -141,6 +154,8 @@@ public
               File::Mode mode = File::Read);
      virtual ~ZLibFile();
  
 +
 +    virtual bool supportsOffsets() const;
  protected:
      virtual bool rawOpen(const std::string &filename, File::Mode mode);
      virtual bool rawWrite(const void *buffer, int length);

diff --combined trace_snappyfile.hpp
index 6c0c9add1f8fbe72e33703baccaf0075b57fea4f,c8c415bf57b47dacf0ee47e4138fdd6f25063ab0..2ee95bee8e94499e416267297ef774809056cc8d
--- 1/trace_snappyfile.hpp
--- 2/trace_snappyfile.hpp
+++ b/trace_snappyfile.hpp
@@@ -52,9 -52,6 +52,9 @@@ public
                 File::Mode mode = File::Read);
      virtual ~SnappyFile();
  
 +    virtual bool supportsOffsets() const;
 +    virtual File::Offset currentOffset();
 +    virtual void setCurrentOffset(const File::Offset &offset);
  protected:
      virtual bool rawOpen(const std::string &filename, File::Mode mode);
      virtual bool rawWrite(const void *buffer, int length);
@@@ -75,7 -72,6 +75,6 @@@ private
      {
          return m_stream.eof() && freeCacheSize() == 0;
      }
- 
      void flushCache();
      void createCache(size_t size);
      void writeCompressedLength(uint32_t  num);
@@@ -87,8 -83,6 +86,8 @@@ private
      size_t m_cacheSize;
  
      char *m_compressedCache;
 +
 +    File::Offset m_currentOffset;
  };
  
  }