X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=trace_file.cpp;h=e20685812c5c6230c9e6f582f7ea2441bf5dfede;hb=0983c32931fa376ad96493a910d994b4fab27eb0;hp=4c6c8eba26adf1a5eba43e452699977556311eff;hpb=bb130e5395d472c8ce23012c8234b32ca38fa460;p=apitrace

diff --git a/trace_file.cpp b/trace_file.cpp
index 4c6c8eb..e206858 100644
--- a/trace_file.cpp
+++ b/trace_file.cpp
@@ -1,15 +1,45 @@
+/**************************************************************************
+ *
+ * Copyright 2011 Zack Rusin
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ **************************************************************************/
+
+
 #include "trace_file.hpp"
 
+#include "trace_snappyfile.hpp"
+
 #include <assert.h>
 #include <string.h>
 
 #include <zlib.h>
-#include <snappy.h>
+
+#include "os.hpp"
 
 #include <iostream>
 
 using namespace Trace;
 
+
 File::File(const std::string &filename,
            File::Mode mode)
     : m_filename(filename),
@@ -21,76 +51,42 @@ File::File(const std::string &filename,
     }
 }
 
-static size_t writtenRef = 0;
-
 File::~File()
 {
-    std::cerr << "written ref = "<<writtenRef << std::endl;
     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);
-    m_mode = 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;
-    }
-    writtenRef += length;
-    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();
-}
-
-int File::getc()
-{
-    if (!m_isOpened || m_mode != File::Read) {
-        return 0;
-    }
-    return rawGetc();
-}
 
 ZLibFile::ZLibFile(const std::string &filename,
                    File::Mode mode)
@@ -137,196 +133,3 @@ void ZLibFile::rawFlush()
 {
     gzflush(m_gzFile, Z_SYNC_FLUSH);
 }
-
-SnappyFile::SnappyFile(const std::string &filename,
-                              File::Mode mode)
-    : File(),
-      m_cache(0),
-      m_cachePtr(0),
-      m_cacheSize(0)
-{
-    m_compressedCache = new char[SNAPPY_CHUNK_SIZE];
-}
-
-SnappyFile::~SnappyFile()
-{
-    delete [] m_compressedCache;
-}
-
-static size_t written = 0;
-static size_t writtenComp = 0;
-
-bool SnappyFile::rawOpen(const std::string &filename, File::Mode mode)
-{
-    std::ios_base::openmode fmode = std::fstream::binary;
-    if (mode == File::Write) {
-        fmode |= (std::fstream::out | std::fstream::trunc);
-        createCache(SNAPPY_CHUNK_SIZE);
-    } else if (mode == File::Read) {
-        fmode |= std::fstream::in;
-    }
-
-    m_stream.open(filename.c_str(), fmode);
-
-    //read in the initial buffer if we're reading
-    if (m_stream.is_open() && mode == File::Read) {
-        flushCache();
-    }
-    return m_stream.is_open();
-}
-
-bool SnappyFile::rawWrite(const void *buffer, int length)
-{
-    static int bufWritten = 0;
-    if (bufWritten < 500) {
-        const char *cbuffer = (const char*)buffer;
-        for (int i = 0; i < length; ++i) {
-            std::cerr << "--- "<<bufWritten << ") "<< (int) cbuffer[i]
-                      << std::endl;
-            ++ bufWritten;
-        }
-    }
-    if (freeCacheSize() > length) {
-        memcpy(m_cachePtr, buffer, length);
-        m_cachePtr += length;
-    } else if (freeCacheSize() == length) {
-        memcpy(m_cachePtr, buffer, length);
-        m_cachePtr += length;
-        flushCache();
-    } else {
-        int sizeToWrite = length;
-
-        while (sizeToWrite >= freeCacheSize()) {
-            int endSize = freeCacheSize();
-            int offset = length - sizeToWrite;
-            memcpy(m_cachePtr, (char*)buffer + offset, endSize);
-            sizeToWrite -= endSize;
-            m_cachePtr += endSize;
-            flushCache();
-        }
-        if (sizeToWrite) {
-            int offset = length - sizeToWrite;
-            memcpy(m_cachePtr, (char*)buffer + offset, sizeToWrite);
-            m_cachePtr += sizeToWrite;
-        }
-    }
-
-    return true;
-}
-
-bool SnappyFile::rawRead(void *buffer, int length)
-{
-    std::cerr << "Reading byte = "<< (m_cachePtr - m_cache) << std::endl;
-    if (freeCacheSize() > length) {
-        memcpy(buffer, m_cachePtr, length);
-        m_cachePtr += length;
-    } else if (freeCacheSize() == length) {
-        memcpy(buffer, m_cachePtr, length);
-        m_cachePtr += length;
-        assert(0);
-        flushCache();
-    } else {
-        int sizeToRead = length;
-        int offset = 0;
-        assert(0);
-        while (sizeToRead) {
-            int chunkSize = std::min(freeCacheSize(), sizeToRead);
-            offset = length - sizeToRead;
-            memcpy((char*)buffer + offset, m_cachePtr, chunkSize);
-            m_cachePtr += chunkSize;
-            sizeToRead -= chunkSize;
-            if (sizeToRead > 0)
-                flushCache();
-        }
-    }
-
-    return true;
-}
-
-int SnappyFile::rawGetc()
-{
-    char c;
-    rawRead(&c, 1);
-    return c;
-}
-
-void SnappyFile::rawClose()
-{
-    flushCache();
-    std::cerr << "written = "<< written
-              <<", comp = "<< writtenComp
-              << std::endl;
-    m_stream.close();
-    delete [] m_cache;
-    m_cache = NULL;
-    m_cachePtr = NULL;
-}
-
-void SnappyFile::rawFlush()
-{
-    m_stream.flush();
-}
-
-void SnappyFile::flushCache()
-{
-    if (m_mode == File::Write) {
-        size_t compressedLength;
-
-        static bool first = true;
-        if (first) {
-            std::cerr << "Buffer = [";
-            for (int i = 0; i < 512; ++i) {
-                std::cerr << i << " ) "<< (int)m_cache[i] << std::endl;
-            }
-            std::cerr << "]"<<std::endl;
-            first = false;
-        }
-
-        ::snappy::RawCompress(m_cache, SNAPPY_CHUNK_SIZE - freeCacheSize(),
-                              m_compressedCache, &compressedLength);
-
-        m_stream << compressedLength;
-        m_stream.write(m_compressedCache, compressedLength);
-        std::cerr << "compressed length = "<<compressedLength
-                  <<" cache size = "<<(SNAPPY_CHUNK_SIZE - freeCacheSize())
-                  <<" (ref = " << SNAPPY_CHUNK_SIZE <<")"
-                  << std::endl;
-        written += SNAPPY_CHUNK_SIZE - freeCacheSize();
-        writtenComp += compressedLength;
-        m_cachePtr = m_cache;
-    } else if (m_mode == File::Read) {
-        if (m_stream.eof())
-            return;
-        //assert(m_cachePtr == m_cache + m_cacheSize);
-        size_t compressedLength;
-        m_stream >> compressedLength;
-        m_stream.read((char*)m_compressedCache, compressedLength);
-        ::snappy::GetUncompressedLength(m_compressedCache, compressedLength,
-                                        &m_cacheSize);
-        std::cerr << "compressed length = "<<compressedLength
-                  <<" cache size = "<<m_cacheSize
-                  <<" (ref = " << SNAPPY_CHUNK_SIZE <<")"
-                  << std::endl;
-        if (m_cache)
-            delete [] m_cache;
-        createCache(m_cacheSize);
-        ::snappy::RawUncompress(m_compressedCache, compressedLength,
-                                m_cache);
-        static bool first = true;
-        if (first) {
-            std::cerr << "Buffer = [";
-            for (int i = 0; i < 512; ++i) {
-                std::cerr << i << " ) "<< (int)m_cache[i] << std::endl;
-            }
-            std::cerr << "]"<<std::endl;
-            first = false;
-        }
-    }
-}
-
-void SnappyFile::createCache(size_t size)
-{
-    m_cache = new char[size];
-    m_cachePtr = m_cache;
-    m_cacheSize = size;
-}