thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 01:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Poco: fix endless execution of task that was cancelled before run() method

Browse Source
This commit is contained in:
Pavel Kartavyy 2016-08-18 19:43:39 +03:00
parent 9c8697655e
commit 50c28f08b4
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/libpoco/Foundation/include/Poco/Task.h
View File

@ -26,6 +26,8 @@
#include "Poco/Mutex.h" #include "Poco/Mutex.h"
#include "Poco/Event.h" #include "Poco/Event.h"
#include <atomic>
namespace Poco { namespace Poco {
@ -140,7 +142,7 @@ private:
std::string _name; std::string _name;
TaskManager* _pOwner; TaskManager* _pOwner;
float _progress; float _progress;
TaskState _state; std::atomic<TaskState> _state;
Event _cancelEvent; Event _cancelEvent;
mutable FastMutex _mutex; mutable FastMutex _mutex;

14
contrib/libpoco/Foundation/src/Task.cpp
View File

@ -17,7 +17,8 @@
#include "Poco/Task.h" #include "Poco/Task.h"
#include "Poco/TaskManager.h" #include "Poco/TaskManager.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include <iostream>
#include <array>
namespace Poco { namespace Poco {
@ -61,8 +62,17 @@ void Task::run()
pOwner->taskStarted(this); pOwner->taskStarted(this);
try try
{ {
_state = TASK_RUNNING; /** Task can be already cancelled.
* To prevent endless executing already cancelled task _state is assigned to TASK_RUNNING only if _state != TASK_CANCELLING
*/
std::array<TaskState, 3> allowed_states{TASK_IDLE, TASK_STARTING, TASK_FINISHED};
for (auto & expected : allowed_states)
if (_state.compare_exchange_strong(expected, TASK_RUNNING))
break;
if (_state == TASK_RUNNING)
runTask(); runTask();
} }
catch (Exception& exc) catch (Exception& exc)
{ {