Fix writing/reading compressed length of the chunks.

[apitrace] / trace_file.cpp

diff --git a/trace_file.cpp b/trace_file.cpp
index 11499783a71ab03e34c9382a6e0b21686cf19ba3..c7227c68c84a27ef68f1b3a4fd264234376627cf 100644 (file)
--- a/trace_file.cpp
+++ b/trace_file.cpp
@@ -1,9 +1,19 @@
 #include "trace_file.hpp"
 
+#include "trace_snappyfile.hpp"
+
+#include <assert.h>
+#include <string.h>
+
 #include <zlib.h>
 
+#include "os.hpp"
+
+#include <iostream>
+
 using namespace Trace;
 
+
 File::File(const std::string &filename,
            File::Mode mode)
     : m_filename(filename),
@@ -20,66 +30,37 @@ File::~File()
     close();
 }
 
-bool File::isOpened() const
+bool File::isZLibCompressed(const std::string &filename)
 {
-    return m_isOpened;
-}
+    std::fstream stream(filename.c_str(),
+                        std::fstream::binary | std::fstream::in);
+    if (!stream.is_open())
+        return false;
 
-File::Mode File::mode() const
-{
-    return m_mode;
-}
+    unsigned char byte1, byte2;
+    stream >> byte1;
+    stream >> byte2;
+    stream.close();
 
-std::string File::filename() const
-{
-    return m_filename;
+    return (byte1 == 0x1f && byte2 == 0x8b);
 }
 
-bool File::open(const std::string &filename, File::Mode mode)
-{
-    if (m_isOpened) {
-        close();
-    }
-    m_isOpened = rawOpen(filename, mode);
-    return m_isOpened;
-}
 
-bool File::write(const void *buffer, int length)
+bool File::isSnappyCompressed(const std::string &filename)
 {
-    if (!m_isOpened || m_mode != File::Write) {
+    std::fstream stream(filename.c_str(),
+                        std::fstream::binary | std::fstream::in);
+    if (!stream.is_open())
         return false;
-    }
-    return rawWrite(buffer, length);
-}
 
-bool File::read(void *buffer, int length)
-{
-    if (!m_isOpened || m_mode != File::Read) {
-        return false;
-    }
-    return rawRead(buffer, length);
-}
+    unsigned char byte1, byte2;
+    stream >> byte1;
+    stream >> byte2;
+    stream.close();
 
-void File::close()
-{
-    if (m_isOpened) {
-        rawClose();
-        m_isOpened = false;
-    }
+    return (byte1 == SNAPPY_BYTE1 && byte2 == SNAPPY_BYTE2);
 }
 
-void File::flush()
-{
-    rawFlush();
-}
-
-char File::getc()
-{
-    if (!m_isOpened || m_mode != File::Read) {
-        return 0;
-    }
-    return rawGetc();
-}
 
 ZLibFile::ZLibFile(const std::string &filename,
                    File::Mode mode)
@@ -101,15 +82,15 @@ bool ZLibFile::rawOpen(const std::string &filename, File::Mode mode)
 
 bool ZLibFile::rawWrite(const void *buffer, int length)
 {
-    return gzwrite(m_gzFile, buffer, length);
+    return gzwrite(m_gzFile, buffer, length) != -1;
 }
 
 bool ZLibFile::rawRead(void *buffer, int length)
 {
-    return gzread(m_gzFile, buffer, length);
+    return gzread(m_gzFile, buffer, length) != -1;
 }
 
-char ZLibFile::rawGetc()
+int ZLibFile::rawGetc()
 {
     return gzgetc(m_gzFile);
 }
@@ -122,7 +103,7 @@ void ZLibFile::rawClose()
     }
 }
 
-void ZLibFile::rawFlush()
+void ZLibFile::rawFlush(FlushType type)
 {
     gzflush(m_gzFile, Z_SYNC_FLUSH);
 }