Merge branch 'master' into compression

[apitrace] / trace_file.hpp

diff --git a/trace_file.hpp b/trace_file.hpp
index 9ea6bb8dd893b067754af82070f29cb1047787bd..fb61b985d8c2e98862a95af05d37a897a1988c66 100644 (file)
--- a/trace_file.hpp
+++ b/trace_file.hpp
@@ -2,6 +2,7 @@
 #define TRACE_FILE_HPP
 
 #include <string>
+#include <fstream>
 
 namespace Trace {
 
@@ -11,6 +12,13 @@ public:
         Read,
         Write
     };
+    enum FlushType {
+        FlushShallow,
+        FlushDeep
+    };
+public:
+    static bool isZLibCompressed(const std::string &filename);
+    static bool isSnappyCompressed(const std::string &filename);
 public:
     File(const std::string &filename = std::string(),
          File::Mode mode = File::Read);
@@ -24,16 +32,16 @@ public:
     bool write(const void *buffer, int length);
     bool read(void *buffer, int length);
     void close();
-    void flush();
-    char getc();
+    void flush(FlushType type = FlushShallow);
+    int getc();
 
 protected:
     virtual bool rawOpen(const std::string &filename, File::Mode mode) = 0;
     virtual bool rawWrite(const void *buffer, int length) = 0;
     virtual bool rawRead(void *buffer, int length) = 0;
-    virtual char rawGetc() = 0;
+    virtual int rawGetc() = 0;
     virtual void rawClose() = 0;
-    virtual void rawFlush() = 0;
+    virtual void rawFlush(FlushType type) = 0;
 
 protected:
     std::string m_filename;
@@ -51,13 +59,52 @@ protected:
     virtual bool rawOpen(const std::string &filename, File::Mode mode);
     virtual bool rawWrite(const void *buffer, int length);
     virtual bool rawRead(void *buffer, int length);
-    virtual char rawGetc();
+    virtual int rawGetc();
     virtual void rawClose();
-    virtual void rawFlush();
+    virtual void rawFlush(FlushType type);
 private:
     void *m_gzFile;
 };
 
+namespace snappy {
+    class File;
+}
+
+#define SNAPPY_CHUNK_SIZE (1 * 1024 * 1024)
+class SnappyFile : public File {
+public:
+    SnappyFile(const std::string &filename = std::string(),
+               File::Mode mode = File::Read);
+    virtual ~SnappyFile();
+
+protected:
+    virtual bool rawOpen(const std::string &filename, File::Mode mode);
+    virtual bool rawWrite(const void *buffer, int length);
+    virtual bool rawRead(void *buffer, int length);
+    virtual int rawGetc();
+    virtual void rawClose();
+    virtual void rawFlush(FlushType type);
+
+private:
+    inline int freeCacheSize() const
+    {
+        if (m_cacheSize > 0)
+            return m_cacheSize - (m_cachePtr - m_cache);
+        else
+            return 0;
+    }
+    void flushCache();
+    void createCache(size_t size);
+private:
+    std::fstream m_stream;
+    char *m_cache;
+    char *m_cachePtr;
+    size_t m_cacheSize;
+
+    char *m_compressedCache;
+};
+
+
 }
 
 #endif