AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use shared_ptr to maintain strong references to ClientProcess transactions

This commit is contained in:
Jack Andersen 2016-04-18 14:15:41 -10:00
parent e50cf6d0ec
commit e6cf759477
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hecl/include/hecl/ClientProcess.hpp
View File

@ -64,8 +64,8 @@ public:
: Transaction(parent, Type::Lambda), m_func(std::move(func)) {} : Transaction(parent, Type::Lambda), m_func(std::move(func)) {}
}; };
private: private:
std::list<std::unique_ptr<Transaction>> m_pendingQueue; std::list<std::shared_ptr<Transaction>> m_pendingQueue;
std::list<std::unique_ptr<Transaction>> m_completedQueue; std::list<std::shared_ptr<Transaction>> m_completedQueue;
int m_inProgress = 0; int m_inProgress = 0;
bool m_running = true; bool m_running = true;
@ -83,12 +83,15 @@ private:
public: public:
ClientProcess(int verbosityLevel=1); ClientProcess(int verbosityLevel=1);
~ClientProcess() {shutdown();} ~ClientProcess() {shutdown();}
const BufferTransaction* addBufferTransaction(const hecl::ProjectPath& path, void* target, std::shared_ptr<const BufferTransaction>
size_t maxLen, size_t offset); addBufferTransaction(const hecl::ProjectPath& path, void* target,
const CookTransaction* addCookTransaction(const hecl::ProjectPath& path, Database::IDataSpec* spec); size_t maxLen, size_t offset);
const LambdaTransaction* addLambdaTransaction(std::function<void(BlenderToken&)>&& func); std::shared_ptr<const CookTransaction>
addCookTransaction(const hecl::ProjectPath& path, Database::IDataSpec* spec);
std::shared_ptr<const LambdaTransaction>
addLambdaTransaction(std::function<void(BlenderToken&)>&& func);
bool syncCook(const hecl::ProjectPath& path, Database::IDataSpec* spec, BlenderToken& btok); bool syncCook(const hecl::ProjectPath& path, Database::IDataSpec* spec, BlenderToken& btok);
void swapCompletedQueue(std::list<std::unique_ptr<Transaction>>& queue); void swapCompletedQueue(std::list<std::shared_ptr<Transaction>>& queue);
void waitUntilComplete(); void waitUntilComplete();
void shutdown(); void shutdown();
}; };

16
hecl/lib/ClientProcess.cpp
View File

@ -70,7 +70,7 @@ void ClientProcess::Worker::proc()
} }
while (m_proc.m_pendingQueue.size()) while (m_proc.m_pendingQueue.size())
{ {
std::unique_ptr<Transaction> trans = std::move(m_proc.m_pendingQueue.front()); std::shared_ptr<Transaction> trans = std::move(m_proc.m_pendingQueue.front());
++m_proc.m_inProgress; ++m_proc.m_inProgress;
m_proc.m_pendingQueue.pop_front(); m_proc.m_pendingQueue.pop_front();
lk.unlock(); lk.unlock();
@ -104,32 +104,32 @@ ClientProcess::ClientProcess(int verbosityLevel)
} }
} }
const ClientProcess::BufferTransaction* std::shared_ptr<const ClientProcess::BufferTransaction>
ClientProcess::addBufferTransaction(const ProjectPath& path, void* target, ClientProcess::addBufferTransaction(const ProjectPath& path, void* target,
size_t maxLen, size_t offset) size_t maxLen, size_t offset)
{ {
std::unique_lock<std::mutex> lk(m_mutex); std::unique_lock<std::mutex> lk(m_mutex);
BufferTransaction* ret = new BufferTransaction(*this, path, target, maxLen, offset); auto ret = std::make_shared<BufferTransaction>(*this, path, target, maxLen, offset);
m_pendingQueue.emplace_back(ret); m_pendingQueue.emplace_back(ret);
m_cv.notify_one(); m_cv.notify_one();
return ret; return ret;
} }
const ClientProcess::CookTransaction* std::shared_ptr<const ClientProcess::CookTransaction>
ClientProcess::addCookTransaction(const hecl::ProjectPath& path, Database::IDataSpec* spec) ClientProcess::addCookTransaction(const hecl::ProjectPath& path, Database::IDataSpec* spec)
{ {
std::unique_lock<std::mutex> lk(m_mutex); std::unique_lock<std::mutex> lk(m_mutex);
CookTransaction* ret = new CookTransaction(*this, path, spec); auto ret = std::make_shared<CookTransaction>(*this, path, spec);
m_pendingQueue.emplace_back(ret); m_pendingQueue.emplace_back(ret);
m_cv.notify_one(); m_cv.notify_one();
return ret; return ret;
} }
const ClientProcess::LambdaTransaction* std::shared_ptr<const ClientProcess::LambdaTransaction>
ClientProcess::addLambdaTransaction(std::function<void(BlenderToken&)>&& func) ClientProcess::addLambdaTransaction(std::function<void(BlenderToken&)>&& func)
{ {
std::unique_lock<std::mutex> lk(m_mutex); std::unique_lock<std::mutex> lk(m_mutex);
LambdaTransaction* ret = new LambdaTransaction(*this, std::move(func)); auto ret = std::make_shared<LambdaTransaction>(*this, std::move(func));
m_pendingQueue.emplace_back(ret); m_pendingQueue.emplace_back(ret);
m_cv.notify_one(); m_cv.notify_one();
return ret; return ret;
@ -151,7 +151,7 @@ bool ClientProcess::syncCook(const hecl::ProjectPath& path, Database::IDataSpec*
return false; return false;
} }
void ClientProcess::swapCompletedQueue(std::list<std::unique_ptr<Transaction>>& queue) void ClientProcess::swapCompletedQueue(std::list<std::shared_ptr<Transaction>>& queue)
{ {
std::unique_lock<std::mutex> lk(m_mutex); std::unique_lock<std::mutex> lk(m_mutex);
queue.swap(m_completedQueue); queue.swap(m_completedQueue);