+/**************************************************************************
+ *
+ * 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_snappyfile.hpp"
#include <snappy.h>
bool SnappyFile::rawRead(void *buffer, int length)
{
- if (m_stream.eof()) {
+ if (endOfData()) {
return false;
}
- if (freeCacheSize() > length) {
- memcpy(buffer, m_cachePtr, length);
- m_cachePtr += length;
- } else if (freeCacheSize() == length) {
+
+ if (freeCacheSize() >= length) {
memcpy(buffer, m_cachePtr, length);
m_cachePtr += length;
- flushCache();
} else {
int sizeToRead = length;
int offset = 0;
m_cachePtr = NULL;
}
-void SnappyFile::rawFlush(FlushType type)
+void SnappyFile::rawFlush()
{
- if (type == FlushDeep) {
- flushCache();
- }
+ flushCache();
m_stream.flush();
}
size_t compressedLength;
compressedLength = readCompressedLength();
m_stream.read((char*)m_compressedCache, compressedLength);
+ /*
+ * The reason we peek here is because the last read will
+ * read all the way until the last character, but that will not
+ * trigger m_stream.eof() to be set, so by calling peek
+ * we assure that if we in fact have read the entire stream
+ * then the m_stream.eof() is always set.
+ */
+ m_stream.peek();
::snappy::GetUncompressedLength(m_compressedCache, compressedLength,
&m_cacheSize);
if (m_cache)
void SnappyFile::writeCompressedLength(uint32_t value)
{
- m_stream.write((char*)&value, sizeof value);
+ m_stream.write((const char*)&value, sizeof value);
}
uint32_t SnappyFile::readCompressedLength()