mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[coding] buffered file writer review fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-08-12 18:01:55 +03:00 • committed by mpimenov
parent a75b603c0f
commit 0b3cc1f2f3
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
coding/buffered_file_writer.cpp
View file

@ -2,18 +2,20 @@
#include "coding/internal/file_data.hpp"
#include "base/assert.hpp"
BufferedFileWriter::BufferedFileWriter(std::string const & fileName,
Op operation /* = OP_WRITE_TRUNCATE */,
size_t bufferSize /* = 4096 */)
: FileWriter(fileName, operation)
{
CHECK_GREATER(bufferSize, 0, ());
m_buf.reserve(bufferSize);
}
BufferedFileWriter::~BufferedFileWriter()
{
DropBuffer();
GetFileData().Flush();
}
void BufferedFileWriter::Seek(uint64_t pos)
@ -44,8 +46,7 @@ void BufferedFileWriter::Write(void const * p, size_t size)
{
auto const copyCount = m_buf.capacity() - m_buf.size();
std::copy(src, src + copyCount, std::back_inserter(m_buf));
FileWriter::Write(m_buf.data(), m_buf.size());
m_buf.clear();
DropBuffer();
src += copyCount;
size -= copyCount;
}
@ -70,6 +71,6 @@ void BufferedFileWriter::DropBuffer()
if (m_buf.empty())
return;
GetFileData().Write(m_buf.data(), m_buf.size());
FileWriter::Write(m_buf.data(), m_buf.size());
m_buf.clear();
}

3
coding/file_writer.cpp
View file

@ -12,7 +12,8 @@ FileWriter::FileWriter(string const & fileName, FileWriter::Op op)
FileWriter::~FileWriter()
{
m_pFileData->Flush();
// Note: FileWriter::Flush will be called (like non virtual method).
Flush();
}
uint64_t FileWriter::Pos() const