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

Side by Side Diff: net/spdy/spdy_session.h

Issue 295823002: Ensure races between pending and new SPDY streams don't violate session concurrency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Switch to early return. Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | net/spdy/spdy_session.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SPDY_SPDY_SESSION_H_ 5 #ifndef NET_SPDY_SPDY_SESSION_H_
6 #define NET_SPDY_SPDY_SESSION_H_ 6 #define NET_SPDY_SPDY_SESSION_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, DeleteExpiredPushStreams); 487 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, DeleteExpiredPushStreams);
488 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, ProtocolNegotiation); 488 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, ProtocolNegotiation);
489 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, ClearSettings); 489 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, ClearSettings);
490 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, AdjustRecvWindowSize); 490 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, AdjustRecvWindowSize);
491 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, AdjustSendWindowSize); 491 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, AdjustSendWindowSize);
492 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlInactiveStream); 492 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlInactiveStream);
493 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlNoReceiveLeaks); 493 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlNoReceiveLeaks);
494 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlNoSendLeaks); 494 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlNoSendLeaks);
495 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlEndToEnd); 495 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlEndToEnd);
496 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, StreamIdSpaceExhausted); 496 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, StreamIdSpaceExhausted);
497 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, UnstallRacesWithStreamCreation);
497 498
498 typedef std::deque<base::WeakPtr<SpdyStreamRequest> > 499 typedef std::deque<base::WeakPtr<SpdyStreamRequest> >
499 PendingStreamRequestQueue; 500 PendingStreamRequestQueue;
500 501
501 struct ActiveStreamInfo { 502 struct ActiveStreamInfo {
502 ActiveStreamInfo(); 503 ActiveStreamInfo();
503 explicit ActiveStreamInfo(SpdyStream* stream); 504 explicit ActiveStreamInfo(SpdyStream* stream);
504 ~ActiveStreamInfo(); 505 ~ActiveStreamInfo();
505 506
506 SpdyStream* stream; 507 SpdyStream* stream;
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
1125 // This SPDY proxy is allowed to push resources from origins that are 1126 // This SPDY proxy is allowed to push resources from origins that are
1126 // different from those of their associated streams. 1127 // different from those of their associated streams.
1127 HostPortPair trusted_spdy_proxy_; 1128 HostPortPair trusted_spdy_proxy_;
1128 1129
1129 TimeFunc time_func_; 1130 TimeFunc time_func_;
1130 }; 1131 };
1131 1132
1132 } // namespace net 1133 } // namespace net
1133 1134
1134 #endif // NET_SPDY_SPDY_SESSION_H_ 1135 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW
« no previous file with comments | « no previous file | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698