organicmaps/geocore
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

rm more unused from platform

Browse source
This commit is contained in:
LaGrunge 2019-10-14 14:45:34 +03:00 • committed by cc-engineering
parent 54aac65ad7
commit 6681006e43
2 changed files with 4 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
platform/platform.cpp
View file

@ -1,5 +1,6 @@
#include "platform/platform.hpp"
#include "coding/file_reader.hpp"
#include "coding/internal/file_data.hpp"
#include "coding/writer.hpp"
@ -19,8 +20,9 @@
#include <boost/filesystem.hpp>
#include <boost/range/iterator_range.hpp>
namespace fs = boost::filesystem;
#include "platform/constants.hpp"
namespace fs = boost::filesystem;
using namespace std;
namespace
@ -290,27 +292,6 @@ unsigned Platform::CpuCores() const
return cores > 0 ? cores : 1;
}
void Platform::ShutdownThreads()
{
ASSERT(m_networkThread && m_fileThread && m_backgroundThread, ());
m_networkThread->ShutdownAndJoin();
m_fileThread->ShutdownAndJoin();
m_backgroundThread->ShutdownAndJoin();
m_networkThread.reset();
m_fileThread.reset();
m_backgroundThread.reset();
}
void Platform::RunThreads()
{
ASSERT(!m_networkThread && !m_fileThread && !m_backgroundThread, ());
m_networkThread = make_unique<base::thread_pool::delayed::ThreadPool>();
m_fileThread = make_unique<base::thread_pool::delayed::ThreadPool>();
m_backgroundThread = make_unique<base::thread_pool::delayed::ThreadPool>();
}
namespace
{
struct CloseDir
@ -323,7 +304,6 @@ struct CloseDir
};
} // namespace
// static
Platform::EError Platform::RmDir(string const & dirName)
{
@ -395,8 +375,6 @@ bool Platform::GetFileSizeByFullPath(string const & filePath, uint64_t & size)
namespace
{
// Web service ip to check internet connection. Now it's a mail.ru ip.
char constexpr kSomeWorkingWebServer[] = "217.69.139.202";
// Returns directory where binary resides, including slash at the end.
bool GetBinaryDir(string & outPath)
@ -561,29 +539,6 @@ Platform::Platform()
LOG(LDEBUG, ("Settings directory:", m_settingsDir));
}
#include "platform/constants.hpp"
#include "platform/measurement_utils.hpp"
#include "platform/platform.hpp"
#include "platform/settings.hpp"
#include "coding/file_reader.hpp"
#include "base/logging.hpp"
#include "platform/target_os.hpp"
#include <algorithm>
#include <future>
#include <memory>
#include <regex>
#include <string>
#include <boost/filesystem.hpp>
#include <boost/range/iterator_range.hpp>
namespace fs = boost::filesystem;
using namespace std;
unique_ptr<ModelReader> Platform::GetReader(string const & file, string const & searchScope) const
{

64
platform/platform.hpp
View file

@ -32,15 +32,6 @@ Platform & GetPlatform();
class Platform
{
public:
friend class ThreadRunner;
// ThreadRunner may be subclassed for testing purposes.
class ThreadRunner
{
public:
ThreadRunner() { GetPlatform().RunThreads(); }
virtual ~ThreadRunner() { GetPlatform().ShutdownThreads(); }
};
enum EError
{
@ -63,13 +54,6 @@ public:
FILE_TYPE_DIRECTORY = 0x4
};
enum class EConnectionType : uint8_t
{
CONNECTION_NONE,
CONNECTION_WIFI,
CONNECTION_WWAN
};
enum class Thread : uint8_t
{
File,
@ -108,7 +92,7 @@ public:
virtual ~Platform() = default;
static bool IsFileExistsByFullPath(std::string const & filePath);
static void DisableBackupForFile(std::string const & filePath);
static bool RemoveFileIfExists(std::string const & filePath);
/// @returns path to current working directory.
@ -170,9 +154,6 @@ public:
/// @return full path to file in the settings directory
std::string SettingsPathForFile(std::string const & file) const { return SettingsDir() + file; }
/// Returns application private directory.
std::string const & PrivateDir() const { return m_privateDir; }
/// @return reader for file decriptor.
/// @throws FileAbsentException
/// @param[in] file name or full path which we want to read
@ -224,49 +205,6 @@ public:
// Please note, that number of active cores can vary at runtime.
// DO NOT assume for the same return value between calls.
unsigned CpuCores() const;
/// \brief Placing an executable object |task| on a queue of |thread|. Then the object will be
/// executed on |thread|.
/// \note |task| cannot be moved in case of |Thread::Gui|. This way unique_ptr cannot be used
/// in |task|. Use shared_ptr instead.
template <typename Task>
void RunTask(Thread thread, Task && task)
{
ASSERT(m_networkThread && m_fileThread && m_backgroundThread, ());
switch (thread)
{
case Thread::File:
m_fileThread->Push(std::forward<Task>(task));
break;
case Thread::Network:
m_networkThread->Push(std::forward<Task>(task));
break;
case Thread::Background: m_backgroundThread->Push(std::forward<Task>(task)); break;
}
}
template <typename Task>
void RunDelayedTask(Thread thread, base::thread_pool::delayed::ThreadPool::Duration const & delay, Task && task)
{
ASSERT(m_networkThread && m_fileThread && m_backgroundThread, ());
switch (thread)
{
case Thread::File:
m_fileThread->PushDelayed(delay, std::forward<Task>(task));
break;
case Thread::Network:
m_networkThread->PushDelayed(delay, std::forward<Task>(task));
break;
case Thread::Background:
m_backgroundThread->PushDelayed(delay, std::forward<Task>(task));
break;
}
}
private:
void RunThreads();
void ShutdownThreads();
};
std::string DebugPrint(Platform::EError err);