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

Automatically call Finish() in FileContainerW's destructor.

Browse source
This commit is contained in:
Yury Melnichek 2011-01-04 16:22:58 +01:00 • committed by Alex Zolotarev
parent 1b54e1794c
commit 507694e4c1
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
coding/file_container.cpp
View file

@ -58,7 +58,7 @@ FileReader FilesContainerR::GetReader(Tag const & tag) const
/////////////////////////////////////////////////////////////////////////////
FilesContainerW::FilesContainerW(string const & fName, FileWriter::Op op)
: m_name(fName)
: m_name(fName), m_bFinished(false)
{
if (op == FileWriter::OP_APPEND)
{
@ -76,8 +76,15 @@ FilesContainerW::FilesContainerW(string const & fName, FileWriter::Op op)
}
}
FilesContainerW::~FilesContainerW()
{
if (!m_bFinished)
Finish();
}
uint64_t FilesContainerW::SaveCurrentSize()
{
ASSERT(!m_bFinished, ());
uint64_t const curr = FileReader(m_name).Size();
if (!m_info.empty())
m_info.back().m_size = curr - m_info.back().m_offset;
@ -86,6 +93,7 @@ uint64_t FilesContainerW::SaveCurrentSize()
FileWriter FilesContainerW::GetWriter(Tag const & tag)
{
ASSERT(!m_bFinished, ());
if (m_needRewrite)
{
m_needRewrite = false;
@ -108,6 +116,7 @@ FileWriter FilesContainerW::GetWriter(Tag const & tag)
void FilesContainerW::Append(string const & fName, Tag const & tag)
{
ASSERT(!m_bFinished, ());
uint64_t const bufferSize = 4*1024;
char buffer[bufferSize];
@ -129,12 +138,14 @@ void FilesContainerW::Append(string const & fName, Tag const & tag)
void FilesContainerW::Append(vector<char> const & buffer, Tag const & tag)
{
ASSERT(!m_bFinished, ());
if (!buffer.empty())
GetWriter(tag).Write(&buffer[0], buffer.size());
}
void FilesContainerW::Finish()
{
ASSERT(!m_bFinished, ());
{
uint64_t const curr = SaveCurrentSize();
FileWriter writer(m_name, FileWriter::OP_WRITE_EXISTING);
@ -158,4 +169,6 @@ void FilesContainerW::Finish()
WriteVarUint(writer, m_info[i].m_offset);
WriteVarUint(writer, m_info[i].m_size);
}
m_bFinished = true;
}

2
coding/file_container.hpp
View file

@ -72,10 +72,12 @@ class FilesContainerW : public FilesContainerBase
uint64_t SaveCurrentSize();
bool m_needRewrite;
bool m_bFinished;
public:
FilesContainerW(string const & fName,
FileWriter::Op op = FileWriter::OP_WRITE_TRUNCATE);
~FilesContainerW();
FileWriter GetWriter(Tag const & tag);