kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Remove SharedMemReader.

Browse source
This commit is contained in:
Sergey Magidovich 2016-02-29 13:30:02 +03:00 • committed by Sergey Yershov
parent 4a3989ff23
commit fdbe11107f
3 changed files with 0 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
coding/coding_tests/reader_test.cpp
View file

@ -88,20 +88,6 @@ UNIT_TEST(FileReaderReadAsText)
FileWriter::DeleteFileX(fName);
}
UNIT_TEST(SharedMemReader)
{
SharedMemReader reader1(3);
TEST_EQUAL(reader1.Size(), 3, ());
memcpy(reader1.Data(), "123", 3);
SharedMemReader reader2(reader1);
TEST_EQUAL(reader2.Size(), 3, ());
string s1(3, '0'), s2(3, '0');
reader1.Read(0, &s1[0], 3);
reader2.Read(0, &s2[0], 3);
TEST_EQUAL(s1, "123", ());
TEST_EQUAL(s2, "123", ());
}
UNIT_TEST(ReaderStreamBuf)
{
string const name = "test.txt";

5
coding/reader.cpp
View file

@ -35,8 +35,3 @@ bool MemReader::AssertPosAndSize(uint64_t pos, uint64_t size) const
{
return AssertPosAndSizeImpl(pos, size, Size());
}
bool SharedMemReader::AssertPosAndSize(uint64_t pos, uint64_t size) const
{
return AssertPosAndSizeImpl(pos, size, Size());
}

39
coding/reader.hpp
View file

@ -72,45 +72,6 @@ private:
size_t m_size;
};
class SharedMemReader
{
bool AssertPosAndSize(uint64_t pos, uint64_t size) const;
public:
explicit SharedMemReader(size_t size) : m_data(new char[size]), m_offset(0), m_size(size) {}
inline char * Data() { return m_data.get() + m_offset; }
inline char const * Data() const { return m_data.get() + m_offset; }
inline uint64_t Size() const { return m_size; }
inline void Read(uint64_t pos, void * p, size_t size) const
{
ASSERT ( AssertPosAndSize(pos, size), () );
memcpy(p, Data() + pos, size);
}
inline SharedMemReader SubReader(uint64_t pos, uint64_t size) const
{
ASSERT ( AssertPosAndSize(pos, size), () );
return SharedMemReader(m_data, static_cast<size_t>(pos), static_cast<size_t>(size));
}
// TODO(mgsergio): return unique_ptr
inline SharedMemReader * CreateSubReader(uint64_t pos, uint64_t size) const
{
ASSERT ( AssertPosAndSize(pos, size), () );
return new SharedMemReader(m_data, static_cast<size_t>(pos), static_cast<size_t>(size));
}
private:
SharedMemReader(shared_array<char> const & data, size_t offset, size_t size)
: m_data(data), m_offset(offset), m_size(size) {}
shared_array<char> m_data;
size_t m_offset;
size_t m_size;
};
// Reader wrapper to hold the pointer to a polymorfic reader.
// Common use: ReaderSource<ReaderPtr<Reader> >.
// Note! It takes the ownership of Reader.