src: Removed ApplicationStateMonitor

This commit is contained in:
Eberhard Graether
2017-05-04 13:49:38 +02:00
parent 29b07473fe
commit 9beea94fd8
5 changed files with 0 additions and 138 deletions
-58
View File
@@ -1,58 +0,0 @@
#include "ApplicationStateMonitor.h"
#include "settings/ApplicationSettings.h"
std::shared_ptr<ApplicationStateMonitor> ApplicationStateMonitor::getInstance()
{
if (!s_instance)
{
s_instance = std::shared_ptr<ApplicationStateMonitor>(new ApplicationStateMonitor());
}
return s_instance;
}
std::vector<FilePath> ApplicationStateMonitor::getStoredIndexingFiles()
{
return ApplicationSettings::getInstance()->getIndexingFilePaths();
}
void ApplicationStateMonitor::clearStoredIndexingFiles()
{
ApplicationSettings::getInstance()->setIndexingFilePaths(std::vector<FilePath>());
ApplicationSettings::getInstance()->save();
}
void ApplicationStateMonitor::clearIndexingFiles()
{
std::lock_guard<std::mutex> lock(m_indexingFilesMutex);
m_indexingFiles.clear();
storeCurrentState();
}
void ApplicationStateMonitor::addIndexingFile(FilePath file)
{
std::lock_guard<std::mutex> lock(m_indexingFilesMutex);
m_indexingFiles.insert(file);
storeCurrentState();
}
void ApplicationStateMonitor::removeIndexingFile(FilePath file)
{
std::lock_guard<std::mutex> lock(m_indexingFilesMutex);
m_indexingFiles.erase(file);
storeCurrentState();
}
std::shared_ptr<ApplicationStateMonitor> ApplicationStateMonitor::s_instance;
ApplicationStateMonitor::ApplicationStateMonitor()
{
}
void ApplicationStateMonitor::storeCurrentState()
{
std::vector<FilePath> indexingFiles;
indexingFiles.insert(indexingFiles.begin(), m_indexingFiles.begin(), m_indexingFiles.end());
ApplicationSettings::getInstance()->setIndexingFilePaths(indexingFiles);
ApplicationSettings::getInstance()->save();
}
-32
View File
@@ -1,32 +0,0 @@
#ifndef APPLICATION_STATE_MONITOR_H
#define APPLICATION_STATE_MONITOR_H
#include <memory>
#include <mutex>
#include <set>
#include <vector>
class FilePath;
class ApplicationStateMonitor
{
public:
static std::shared_ptr<ApplicationStateMonitor> getInstance();
static std::vector<FilePath> getStoredIndexingFiles();
static void clearStoredIndexingFiles();
void clearIndexingFiles();
void addIndexingFile(FilePath file);
void removeIndexingFile(FilePath file);
private:
static std::shared_ptr<ApplicationStateMonitor> s_instance;
ApplicationStateMonitor();
void storeCurrentState();
std::set<FilePath> m_indexingFiles;
std::mutex m_indexingFilesMutex;
};
#endif // APPLICATION_STATE_MONITOR_H
-2
View File
@@ -472,8 +472,6 @@ add_files(
Application.cpp
Application.h
ApplicationStateMonitor.cpp
ApplicationStateMonitor.h
LicenseChecker.cpp
LicenseChecker.h
)
-5
View File
@@ -8,7 +8,6 @@
#include "utility/file/FileRegister.h"
#include "utility/file/FileRegisterStateData.h"
#include "utility/scheduling/Blackboard.h"
#include "ApplicationStateMonitor.h"
#include "Application.h"
TaskBuildIndex::TaskBuildIndex(
@@ -45,8 +44,6 @@ Task::TaskState TaskBuildIndex::doUpdate(std::shared_ptr<Blackboard> blackboard)
}
else
{
ApplicationStateMonitor::getInstance()->addIndexingFile(indexerCommand->getSourceFilePath());
{
std::lock_guard<std::mutex> lock(blackboard->getMutex());
@@ -82,8 +79,6 @@ Task::TaskState TaskBuildIndex::doUpdate(std::shared_ptr<Blackboard> blackboard)
blackboard->get("indexed_source_file_count", indexedSourceFileCount);
blackboard->set("indexed_source_file_count", indexedSourceFileCount + 1);
}
ApplicationStateMonitor::getInstance()->removeIndexingFile(indexerCommand->getSourceFilePath());
}
return (m_indexer->interrupted() ? STATE_FAILURE : STATE_SUCCESS);