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

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

Issue 2341233002: Replace NULL with nullptr in WebSocket code in net/socket/ (Closed)
Patch Set: Rebase Created 4 years, 3 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 | « no previous file | net/socket/websocket_transport_client_socket_pool.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 #include "net/socket/websocket_endpoint_lock_manager.h" 5 #include "net/socket/websocket_endpoint_lock_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 if (socket_it == socket_lock_info_map_.end()) 72 if (socket_it == socket_lock_info_map_.end())
73 return; 73 return;
74 74
75 LockInfoMap::iterator lock_info_it = socket_it->second; 75 LockInfoMap::iterator lock_info_it = socket_it->second;
76 76
77 DVLOG(3) << "Unlocking (StreamSocket*)" << socket << " for " 77 DVLOG(3) << "Unlocking (StreamSocket*)" << socket << " for "
78 << lock_info_it->first.ToString() << " (" 78 << lock_info_it->first.ToString() << " ("
79 << socket_lock_info_map_.size() << " socket(s) left)"; 79 << socket_lock_info_map_.size() << " socket(s) left)";
80 socket_lock_info_map_.erase(socket_it); 80 socket_lock_info_map_.erase(socket_it);
81 DCHECK_EQ(socket, lock_info_it->second.socket); 81 DCHECK_EQ(socket, lock_info_it->second.socket);
82 lock_info_it->second.socket = NULL; 82 lock_info_it->second.socket = nullptr;
83 UnlockEndpointAfterDelay(lock_info_it->first); 83 UnlockEndpointAfterDelay(lock_info_it->first);
84 } 84 }
85 85
86 void WebSocketEndpointLockManager::UnlockEndpoint(const IPEndPoint& endpoint) { 86 void WebSocketEndpointLockManager::UnlockEndpoint(const IPEndPoint& endpoint) {
87 LockInfoMap::iterator lock_info_it = lock_info_map_.find(endpoint); 87 LockInfoMap::iterator lock_info_it = lock_info_map_.find(endpoint);
88 if (lock_info_it == lock_info_map_.end()) 88 if (lock_info_it == lock_info_map_.end())
89 return; 89 return;
90 if (lock_info_it->second.socket) 90 if (lock_info_it->second.socket)
91 EraseSocket(lock_info_it); 91 EraseSocket(lock_info_it);
92 UnlockEndpointAfterDelay(endpoint); 92 UnlockEndpointAfterDelay(endpoint);
93 } 93 }
94 94
95 bool WebSocketEndpointLockManager::IsEmpty() const { 95 bool WebSocketEndpointLockManager::IsEmpty() const {
96 return lock_info_map_.empty() && socket_lock_info_map_.empty(); 96 return lock_info_map_.empty() && socket_lock_info_map_.empty();
97 } 97 }
98 98
99 base::TimeDelta WebSocketEndpointLockManager::SetUnlockDelayForTesting( 99 base::TimeDelta WebSocketEndpointLockManager::SetUnlockDelayForTesting(
100 base::TimeDelta new_delay) { 100 base::TimeDelta new_delay) {
101 base::TimeDelta old_delay = unlock_delay_; 101 base::TimeDelta old_delay = unlock_delay_;
102 unlock_delay_ = new_delay; 102 unlock_delay_ = new_delay;
103 return old_delay; 103 return old_delay;
104 } 104 }
105 105
106 WebSocketEndpointLockManager::LockInfo::LockInfo() : socket(NULL) {} 106 WebSocketEndpointLockManager::LockInfo::LockInfo() : socket(nullptr) {}
107 WebSocketEndpointLockManager::LockInfo::~LockInfo() { 107 WebSocketEndpointLockManager::LockInfo::~LockInfo() {
108 DCHECK(!socket); 108 DCHECK(!socket);
109 } 109 }
110 110
111 WebSocketEndpointLockManager::LockInfo::LockInfo(const LockInfo& rhs) 111 WebSocketEndpointLockManager::LockInfo::LockInfo(const LockInfo& rhs)
112 : socket(rhs.socket) { 112 : socket(rhs.socket) {
113 DCHECK(!rhs.queue); 113 DCHECK(!rhs.queue);
114 } 114 }
115 115
116 WebSocketEndpointLockManager::WebSocketEndpointLockManager() 116 WebSocketEndpointLockManager::WebSocketEndpointLockManager()
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 next_job->GotEndpointLock(); 159 next_job->GotEndpointLock();
160 } 160 }
161 161
162 void WebSocketEndpointLockManager::EraseSocket( 162 void WebSocketEndpointLockManager::EraseSocket(
163 LockInfoMap::iterator lock_info_it) { 163 LockInfoMap::iterator lock_info_it) {
164 DVLOG(3) << "Removing (StreamSocket*)" << lock_info_it->second.socket 164 DVLOG(3) << "Removing (StreamSocket*)" << lock_info_it->second.socket
165 << " for " << lock_info_it->first.ToString() << " (" 165 << " for " << lock_info_it->first.ToString() << " ("
166 << socket_lock_info_map_.size() << " socket(s) left)"; 166 << socket_lock_info_map_.size() << " socket(s) left)";
167 size_t erased = socket_lock_info_map_.erase(lock_info_it->second.socket); 167 size_t erased = socket_lock_info_map_.erase(lock_info_it->second.socket);
168 DCHECK_EQ(1U, erased); 168 DCHECK_EQ(1U, erased);
169 lock_info_it->second.socket = NULL; 169 lock_info_it->second.socket = nullptr;
170 } 170 }
171 171
172 } // namespace net 172 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/socket/websocket_transport_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698