mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 12:12:15 +02:00
Code

Stop : immediately call newly-registered Stop::Scope handlers

Browse Source 
if stop() method was already called before the Stop::Scope
handler was constructed.
This commit is contained in:
James Yonan 2016-05-05 00:33:35 -06:00
parent 8e370c16d3
commit a2f31fbf75
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
openvpn/common/stop.hpp
View File

@ -38,14 +38,22 @@ namespace openvpn {
public:
Scope(Stop* stop_arg, std::function<void()>&& method_arg)
: stop(stop_arg),
index(0),
method(std::move(method_arg))
method(std::move(method_arg)),
index(-1)
{
if (stop)
{
std::lock_guard<std::recursive_mutex> lock(stop->mutex);
index = stop->scopes.size();
stop->scopes.push_back(this);
if (stop->stop_called)
{
// stop already called, call method immediately
method();
}
else
{
index = stop->scopes.size();
stop->scopes.push_back(this);
}
}
}
@ -54,7 +62,7 @@ namespace openvpn {
if (stop)
{
std::lock_guard<std::recursive_mutex> lock(stop->mutex);
if (stop->scopes.size() > index && stop->scopes[index] == this)
if (index >= 0 && index < stop->scopes.size() && stop->scopes[index] == this)
{
stop->scopes[index] = nullptr;
stop->prune();
@ -66,9 +74,9 @@ namespace openvpn {
Scope(const Scope&) = delete;
Scope& operator=(const Scope&) = delete;
Stop* stop;
size_t index;
std::function<void()> method;
Stop *const stop;
const std::function<void()> method;
int index;
};
Stop()
@ -78,13 +86,14 @@ namespace openvpn {
void stop()
{
std::lock_guard<std::recursive_mutex> lock(mutex);
stop_called = true;
while (scopes.size())
{
Scope* scope = scopes.back();
scopes.pop_back();
if (scope)
{
scope->stop = nullptr;
scope->index = -1;
scope->method();
}
}
@ -100,8 +109,9 @@ namespace openvpn {
scopes.pop_back();
}
std::vector<Scope*> scopes;
std::recursive_mutex mutex;
std::vector<Scope*> scopes;
bool stop_called = false;
};
}