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

Delta Between Two Patch Sets: src/plugin/Instances.h

Issue 29330403: Issue #1467, #3397 - Rewrite the map from threads to tabs (Closed)
Left Patch Set: rebase / fix copyright year Created Feb. 8, 2016, 6:43 p.m.
Right Patch Set: add comment; new function body Created July 17, 2016, 4:01 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « adblockplus.gyp ('k') | src/plugin/PluginClass.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
Oleksandr 2016/02/10 10:58:49 Nit: If I understand correctly this file will have
Eric 2016/05/19 17:23:58 Synchronization isn't fundamental to what these cl
sergei 2016/05/23 13:14:48 I like "BHOContainer.h" but the classes' names sho
Eric 2016/07/17 16:04:44 This file also appears in https://codereview.adblo
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #ifndef _INSTANCES_H_ 18 #ifndef _INSTANCES_H_
19 #define _INSTANCES_H_ 19 #define _INSTANCES_H_
20 20
21 #include <mutex> 21 #include <mutex>
22 #include <map> 22 #include <map>
23 23
24 /** 24 /**
25 * A base class for a synchronized map from threads to BHO instances. 25 * A base class for a synchronized map from threads to BHO instances.
26 *
27 * This is a base class for 'CurrentThreadMap', defined in PluginClass.cpp.
28 * It's separated out here for testability.
29 * This class should not be used as polymorphic base class, as it has no virtual base class.
26 * 30 *
27 * The member functions here not simply forwarded versions of the container func tions. 31 * The member functions here not simply forwarded versions of the container func tions.
28 * Rather, they are specialized for tracking BHO calls to SetSite(). 32 * Rather, they are specialized for tracking BHO calls to SetSite().
29 * Their semantics allow for verification that the call pattern is as expected. 33 * Their semantics allow for verification that the call pattern is as expected.
30 * 34 *
31 * The key to the map (in the subclass) is the thread ID, thus operations are se rialized on a per-key basis. 35 * The key to the map (in the subclass) is the thread ID, thus operations are se rialized on a per-key basis.
32 * Calls to SetSite() bracket all other calls, so on a per-key basis 36 * Calls to SetSite() bracket all other calls, so on a per-key basis
33 * the order of operations is always either (insert / find-success / erase) or (find-failure). 37 * the order of operations is always either (insert / find-success / erase) or (find-failure).
34 * The library guarantees for std::map seem to indicate that operations on diffe rent keys 38 * The library guarantees for std::map seem to indicate that operations on diffe rent keys
35 * do not interfer with each other, but there's some ambiguity there. 39 * do not interfer with each other, but there's some ambiguity there.
(...skipping 15 matching lines...) Expand all
51 mutable std::mutex mutex; 55 mutable std::mutex mutex;
52 56
53 public: 57 public:
54 /** 58 /**
55 * Returns true if (as expected) no key of value 'id' was present. 59 * Returns true if (as expected) no key of value 'id' was present.
56 * Returns false otherwise. 60 * Returns false otherwise.
57 */ 61 */
58 bool AddIfAbsent(Key id, T p) 62 bool AddIfAbsent(Key id, T p)
59 { 63 {
60 SentryType sentry(mutex); 64 SentryType sentry(mutex);
61 auto it = idMap.find(id); 65 auto it = idMap.insert(std::make_pair(id,p));
sergei 2016/07/19 07:56:09 missing space after comma
Eric 2016/07/27 20:14:22 Fixed.
62 if (it != idMap.end()) 66 return it.second;
63 { 67 // Assert it.second==true implies the insertion took place,
64 return false; 68 // which means there was no key of value 'id' already present.
sergei 2016/07/19 07:56:10 I think we don't need this comment.
65 }
66 idMap[id] = p;
67 return true;
68 } 69 }
69 70
70 /** 71 /**
71 * Returns true if (as expected) a key of value 'id' was already present. 72 * Returns true if (as expected) a key of value 'id' was already present.
72 * Returns false otherwise. 73 * Returns false otherwise.
73 */ 74 */
74 bool RemoveAndCheck(Key id) 75 bool RemoveIfPresent(Key id)
75 { 76 {
76 SentryType sentry(mutex); 77 SentryType sentry(mutex);
77 auto it = idMap.find(id); 78 auto it = idMap.find(id);
78 if (it == idMap.end()) 79 if (it == idMap.end())
79 { 80 {
80 return false; 81 return false;
81 } 82 }
82 idMap.erase(it); 83 idMap.erase(it);
83 return true; 84 return true;
84 } 85 }
85 86
86 /** 87 /**
87 * Returns a non-nullValue if a key of value 'id' is present. 88 * Returns a non-nullValue if a key of value 'id' is present.
88 * Returns nullValue otherwise. 89 * Returns nullValue otherwise.
89 */ 90 */
90 T Locate(Key id) const 91 T Locate(Key id) const
91 { 92 {
92 SentryType sentry(mutex); 93 SentryType sentry(mutex);
93 auto it = idMap.find(id); 94 auto it = idMap.find(id);
94 return (it != idMap.end()) ? it->second : nullValue; 95 return (it != idMap.end()) ? it->second : nullValue;
95 } 96 }
96 }; 97 };
97 98
98 #endif 99 #endif
LEFTRIGHT

Powered by Google App Engine
This is Rietveld