Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: src/Event.cpp

Issue 29369479: Issue #4694 - Add mutex protection to JS event handling
Patch Set: Created Dec. 21, 2016, 7:35 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/Event.cpp
===================================================================
new file mode 100644
--- /dev/null
+++ b/src/Event.cpp
@@ -0,0 +1,52 @@
+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2016 Eyeo GmbH
+ *
+ * Adblock Plus is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Adblock Plus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Event.h"
+
+void EventManager::Set(const std::string& eventName, AdblockPlus::JsEngine::EventCallback callback)
+{
+ UniqueLockType ul(m);
+ eventMap[eventName] = callback;
+}
+
+void EventManager::Remove(const std::string& eventName)
+{
+ UniqueLockType ul(m);
+ eventMap.erase(eventName);
+}
+
+/**
+ * \par Implementation Notes
+ *
+ * A triggered event runs with mutex unlocked.
sergei 2017/03/15 12:17:20 I don't think we need this comment.
+ */
+void EventManager::Trigger(const std::string& eventName, AdblockPlus::JsValueList& args)
+{
+ AdblockPlus::JsEngine::EventCallback f;
+ {
+ // Find the callback with mutex locked
sergei 2017/03/15 12:17:20 this comment is superfluous.
+ UniqueLockType ul(m);
+ auto it = eventMap.find(eventName);
+ if (it == eventMap.end())
+ {
+ return;
+ }
+ f = it->second;
+ }
+ // Execute the callback with mutex unlocked
sergei 2017/03/15 12:17:20 this comment is superfluous.
+ f(args);
+}

Powered by Google App Engine
This is Rietveld