Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Side by Side Diff: net/socket/websocket_endpoint_lock_manager.h

Issue 835623003: Add a delay when unlocking WebSocket endpoints. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Document WebSocketEndpointLockManager Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/socket/socket_test_util.cc ('k') | net/socket/websocket_endpoint_lock_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_SOCKET_WEBSOCKET_ENDPOINT_LOCK_MANAGER_H_ 5 #ifndef NET_SOCKET_WEBSOCKET_ENDPOINT_LOCK_MANAGER_H_
6 #define NET_SOCKET_WEBSOCKET_ENDPOINT_LOCK_MANAGER_H_ 6 #define NET_SOCKET_WEBSOCKET_ENDPOINT_LOCK_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/containers/linked_list.h" 10 #include "base/containers/linked_list.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/singleton.h" 13 #include "base/memory/singleton.h"
14 #include "base/time/time.h"
14 #include "net/base/ip_endpoint.h" 15 #include "net/base/ip_endpoint.h"
15 #include "net/base/net_export.h" 16 #include "net/base/net_export.h"
16 #include "net/socket/websocket_transport_client_socket_pool.h" 17 #include "net/socket/websocket_transport_client_socket_pool.h"
17 18
18 namespace net { 19 namespace net {
19 20
20 class StreamSocket; 21 class StreamSocket;
21 22
23 // Keep track of ongoing WebSocket connections in order to satisfy the WebSocket
24 // connection throttling requirements described in RFC6455 4.1.2:
25 //
26 // 2. If the client already has a WebSocket connection to the remote
27 // host (IP address) identified by /host/ and port /port/ pair, even
28 // if the remote host is known by another name, the client MUST wait
29 // until that connection has been established or for that connection
30 // to have failed. There MUST be no more than one connection in a
31 // CONNECTING state. If multiple connections to the same IP address
32 // are attempted simultaneously, the client MUST serialize them so
33 // that there is no more than one connection at a time running
34 // through the following steps.
35 //
36 // This class is neither thread-safe nor thread-compatible.
37 // TODO(ricea): Make this class thread-compatible by making it not be a
38 // singleton.
22 class NET_EXPORT_PRIVATE WebSocketEndpointLockManager { 39 class NET_EXPORT_PRIVATE WebSocketEndpointLockManager {
23 public: 40 public:
41 // Implement this interface to wait for an endpoint to be available.
24 class NET_EXPORT_PRIVATE Waiter : public base::LinkNode<Waiter> { 42 class NET_EXPORT_PRIVATE Waiter : public base::LinkNode<Waiter> {
25 public: 43 public:
26 // If the node is in a list, removes it. 44 // If the node is in a list, removes it.
27 virtual ~Waiter(); 45 virtual ~Waiter();
28 46
29 virtual void GotEndpointLock() = 0; 47 virtual void GotEndpointLock() = 0;
30 }; 48 };
31 49
32 static WebSocketEndpointLockManager* GetInstance(); 50 static WebSocketEndpointLockManager* GetInstance();
33 51
34 // Returns OK if lock was acquired immediately, ERR_IO_PENDING if not. If the 52 // Returns OK if lock was acquired immediately, ERR_IO_PENDING if not. If the
35 // lock was not acquired, then |waiter->GotEndpointLock()| will be called when 53 // lock was not acquired, then |waiter->GotEndpointLock()| will be called when
36 // it is. A Waiter automatically removes itself from the list of waiters when 54 // it is. A Waiter automatically removes itself from the list of waiters when
37 // its destructor is called. 55 // its destructor is called.
38 int LockEndpoint(const IPEndPoint& endpoint, Waiter* waiter); 56 int LockEndpoint(const IPEndPoint& endpoint, Waiter* waiter);
39 57
40 // Records the IPEndPoint associated with a particular socket. This is 58 // Records the IPEndPoint associated with a particular socket. This is
41 // necessary because TCPClientSocket refuses to return the PeerAddress after 59 // necessary because TCPClientSocket refuses to return the PeerAddress after
42 // the connection is disconnected. The association will be forgotten when 60 // the connection is disconnected. The association will be forgotten when
43 // UnlockSocket() or UnlockEndpoint() is called. The |socket| pointer must not 61 // UnlockSocket() or UnlockEndpoint() is called. The |socket| pointer must not
44 // be deleted between the call to RememberSocket() and the call to 62 // be deleted between the call to RememberSocket() and the call to
45 // UnlockSocket(). 63 // UnlockSocket().
46 void RememberSocket(StreamSocket* socket, const IPEndPoint& endpoint); 64 void RememberSocket(StreamSocket* socket, const IPEndPoint& endpoint);
47 65
48 // Releases the lock on the endpoint that was associated with |socket| by 66 // Removes the socket association that was recorded by RememberSocket(), then
49 // RememberSocket(). If appropriate, triggers the next socket connection. 67 // asynchronously releases the lock on the endpoint after a delay. If
50 // Should be called exactly once for each |socket| that was passed to 68 // appropriate, calls |waiter->GetEndpointLock()| when the lock is
51 // RememberSocket(). Does nothing if UnlockEndpoint() has been called since 69 // released. Should be called exactly once for each |socket| that was passed
70 // to RememberSocket(). Does nothing if UnlockEndpoint() has been called since
52 // the call to RememberSocket(). 71 // the call to RememberSocket().
53 void UnlockSocket(StreamSocket* socket); 72 void UnlockSocket(StreamSocket* socket);
54 73
55 // Releases the lock on |endpoint|. Does nothing if |endpoint| is not locked. 74 // Asynchronously releases the lock on |endpoint| after a delay. Does nothing
56 // Removes any socket association that was recorded with RememberSocket(). If 75 // if |endpoint| is not locked. Removes any socket association that was
57 // appropriate, calls |waiter->GotEndpointLock()|. 76 // recorded with RememberSocket(). If appropriate, calls
77 // |waiter->GotEndpointLock()| when the lock is released.
58 void UnlockEndpoint(const IPEndPoint& endpoint); 78 void UnlockEndpoint(const IPEndPoint& endpoint);
59 79
60 // Checks that |lock_info_map_| and |socket_lock_info_map_| are empty. For 80 // Checks that |lock_info_map_| and |socket_lock_info_map_| are empty. For
61 // tests. 81 // tests.
62 bool IsEmpty() const; 82 bool IsEmpty() const;
63 83
84 // Changes the value of the unlock delay. Returns the previous value of the
85 // delay.
86 base::TimeDelta SetUnlockDelayForTesting(base::TimeDelta new_delay);
87
64 private: 88 private:
65 struct LockInfo { 89 struct LockInfo {
66 typedef base::LinkedList<Waiter> WaiterQueue; 90 typedef base::LinkedList<Waiter> WaiterQueue;
67 91
68 LockInfo(); 92 LockInfo();
69 ~LockInfo(); 93 ~LockInfo();
70 94
71 // This object must be copyable to be placed in the map, but it cannot be 95 // This object must be copyable to be placed in the map, but it cannot be
72 // copied after |queue| has been assigned to. 96 // copied after |queue| has been assigned to.
73 LockInfo(const LockInfo& rhs); 97 LockInfo(const LockInfo& rhs);
(...skipping 16 matching lines...) Expand all
90 114
91 // SocketLockInfoMap requires std::map iterator semantics for LockInfoMap 115 // SocketLockInfoMap requires std::map iterator semantics for LockInfoMap
92 // (ie. that the iterator will remain valid as long as the entry is not 116 // (ie. that the iterator will remain valid as long as the entry is not
93 // deleted). 117 // deleted).
94 typedef std::map<IPEndPoint, LockInfo> LockInfoMap; 118 typedef std::map<IPEndPoint, LockInfo> LockInfoMap;
95 typedef std::map<StreamSocket*, LockInfoMap::iterator> SocketLockInfoMap; 119 typedef std::map<StreamSocket*, LockInfoMap::iterator> SocketLockInfoMap;
96 120
97 WebSocketEndpointLockManager(); 121 WebSocketEndpointLockManager();
98 ~WebSocketEndpointLockManager(); 122 ~WebSocketEndpointLockManager();
99 123
100 void UnlockEndpointByIterator(LockInfoMap::iterator lock_info_it); 124 void UnlockEndpointAfterDelay(const IPEndPoint& endpoint);
125 void DelayedUnlockEndpoint(const IPEndPoint& endpoint);
101 void EraseSocket(LockInfoMap::iterator lock_info_it); 126 void EraseSocket(LockInfoMap::iterator lock_info_it);
102 127
103 // If an entry is present in the map for a particular endpoint, then that 128 // If an entry is present in the map for a particular endpoint, then that
104 // endpoint is locked. If LockInfo.queue is non-empty, then one or more 129 // endpoint is locked. If LockInfo.queue is non-empty, then one or more
105 // Waiters are waiting for the lock. 130 // Waiters are waiting for the lock.
106 LockInfoMap lock_info_map_; 131 LockInfoMap lock_info_map_;
107 132
108 // Store sockets remembered by RememberSocket() and not yet unlocked by 133 // Store sockets remembered by RememberSocket() and not yet unlocked by
109 // UnlockSocket() or UnlockEndpoint(). Every entry in this map always 134 // UnlockSocket() or UnlockEndpoint(). Every entry in this map always
110 // references a live entry in lock_info_map_, and the LockInfo::socket member 135 // references a live entry in lock_info_map_, and the LockInfo::socket member
111 // is non-NULL if and only if there is an entry in this map for the socket. 136 // is non-NULL if and only if there is an entry in this map for the socket.
112 SocketLockInfoMap socket_lock_info_map_; 137 SocketLockInfoMap socket_lock_info_map_;
113 138
139 // Time to wait between a call to Unlock* and actually unlocking the socket.
140 base::TimeDelta unlock_delay_;
141
142 // Number of sockets currently pending unlock.
143 size_t pending_unlock_count_;
144
145 // The messsage loop holding the unlock delay callback may outlive this
146 // object.
147 base::WeakPtrFactory<WebSocketEndpointLockManager> weak_factory_;
148
114 friend struct DefaultSingletonTraits<WebSocketEndpointLockManager>; 149 friend struct DefaultSingletonTraits<WebSocketEndpointLockManager>;
115 150
116 DISALLOW_COPY_AND_ASSIGN(WebSocketEndpointLockManager); 151 DISALLOW_COPY_AND_ASSIGN(WebSocketEndpointLockManager);
117 }; 152 };
118 153
119 } // namespace net 154 } // namespace net
120 155
121 #endif // NET_SOCKET_WEBSOCKET_ENDPOINT_LOCK_MANAGER_H_ 156 #endif // NET_SOCKET_WEBSOCKET_ENDPOINT_LOCK_MANAGER_H_
OLDNEW
« no previous file with comments | « net/socket/socket_test_util.cc ('k') | net/socket/websocket_endpoint_lock_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698