From 736d6080314db1a7021da64f506d38a1e1773821 Mon Sep 17 00:00:00 2001 From: rachytski Date: Mon, 10 Oct 2011 15:57:47 +0300 Subject: [PATCH] removed memory_mapped_file --- base/base.pro | 2 -- base/memory_mapped_file.cpp | 59 ------------------------------------- base/memory_mapped_file.hpp | 28 ------------------ 3 files changed, 89 deletions(-) delete mode 100644 base/memory_mapped_file.cpp delete mode 100644 base/memory_mapped_file.hpp diff --git a/base/base.pro b/base/base.pro index 3a3ec284ec..84fd50c4e4 100644 --- a/base/base.pro +++ b/base/base.pro @@ -16,7 +16,6 @@ SOURCES += \ string_utils.cpp \ commands_queue.cpp \ shared_buffer_manager.cpp \ - memory_mapped_file.cpp \ condition.cpp \ lower_case.cpp \ normalize_unicode.cpp \ @@ -62,7 +61,6 @@ HEADERS += \ commands_queue.hpp \ stats.hpp \ shared_buffer_manager.hpp \ - memory_mapped_file.hpp \ buffer_vector.hpp \ array_adapters.hpp \ runner.hpp \ diff --git a/base/memory_mapped_file.cpp b/base/memory_mapped_file.cpp deleted file mode 100644 index b3dd9201e8..0000000000 --- a/base/memory_mapped_file.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "memory_mapped_file.hpp" - -#ifndef OMIM_OS_WINDOWS - #include - #include - #include - #ifdef OMIM_OS_ANDROID - #include - #else - #include - #endif - #include -#endif - - -MemoryMappedFile::MemoryMappedFile(char const * fileName, bool isReadOnly) - : m_isReadOnly(isReadOnly) -{ -#ifdef OMIM_OS_WINDOWS - m_fp = fopen(fileName, isReadOnly ? "r" : "w"); - fseek(m_fp, 0, SEEK_END); - m_size = ftell(m_fp); - fseek(m_fp, 0, SEEK_SET); - - m_data = reinterpret_cast(new char[m_size]); - fread(m_data, 1, m_size, m_fp); -#else - struct stat s; - stat(fileName, &s); - m_size = s.st_size; - m_fd = open(fileName, isReadOnly ? O_RDONLY : O_RDWR); - m_data = mmap(0, m_size, isReadOnly ? PROT_READ : (PROT_READ | PROT_WRITE), MAP_SHARED, m_fd, 0); -#endif -} - -MemoryMappedFile::~MemoryMappedFile() -{ -#ifdef OMIM_OS_WINDOWS - if (!m_isReadOnly) - { - fwrite(m_data, 1, m_size, m_fp); - } - fclose(m_fp); - delete[] reinterpret_cast(m_data); -#else - munmap(m_data, m_size); - close(m_fd); -#endif -} - -void * MemoryMappedFile::data() -{ - return m_data; -} - -size_t MemoryMappedFile::size() const -{ - return m_size; -} diff --git a/base/memory_mapped_file.hpp b/base/memory_mapped_file.hpp deleted file mode 100644 index 1e4f8bffdb..0000000000 --- a/base/memory_mapped_file.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once -#include "base.hpp" - -#include "../std/target_os.hpp" - -#include "../std/windows.hpp" -#include "../std/cstdio.hpp" - -class MemoryMappedFile -{ - bool m_isReadOnly; - -#ifdef OMIM_OS_WINDOWS - FILE * m_fp; -#else - int m_fd; -#endif - - void * m_data; - size_t m_size; - -public: - MemoryMappedFile(char const * fileName, bool isReadOnly); - ~MemoryMappedFile(); - - void * data(); - size_t size() const; -};