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

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

Issue 1124553002: Remove now unused OrderedSocketData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comments Created 5 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
« no previous file with comments | « net/socket/socket_test_util.h ('k') | no next file » | 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 #include "net/socket/socket_test_util.h" 5 #include "net/socket/socket_test_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 read_in_progress_ = false; 373 read_in_progress_ = false;
374 weak_factory_.InvalidateWeakPtrs(); 374 weak_factory_.InvalidateWeakPtrs();
375 StaticSocketDataProvider::Reset(); 375 StaticSocketDataProvider::Reset();
376 } 376 }
377 377
378 void DelayedSocketData::CompleteRead() { 378 void DelayedSocketData::CompleteRead() {
379 if (socket() && read_in_progress_) 379 if (socket() && read_in_progress_)
380 socket()->OnReadComplete(OnRead()); 380 socket()->OnReadComplete(OnRead());
381 } 381 }
382 382
383 OrderedSocketData::OrderedSocketData(
384 MockRead* reads, size_t reads_count, MockWrite* writes, size_t writes_count)
385 : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
386 sequence_number_(0), loop_stop_stage_(0),
387 blocked_(false), weak_factory_(this) {
388 }
389
390 OrderedSocketData::OrderedSocketData(
391 const MockConnect& connect,
392 MockRead* reads, size_t reads_count,
393 MockWrite* writes, size_t writes_count)
394 : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
395 sequence_number_(0), loop_stop_stage_(0),
396 blocked_(false), weak_factory_(this) {
397 set_connect_data(connect);
398 }
399
400 void OrderedSocketData::EndLoop() {
401 // If we've already stopped the loop, don't do it again until we've advanced
402 // to the next sequence_number.
403 NET_TRACE(1, " *** ") << "Stage " << sequence_number_ << ": EndLoop()";
404 if (loop_stop_stage_ > 0) {
405 const MockRead& next_read = helper()->PeekRead();
406 if ((next_read.sequence_number & ~MockRead::STOPLOOP) >
407 loop_stop_stage_) {
408 NET_TRACE(1, " *** ") << "Stage " << sequence_number_
409 << ": Clearing stop index";
410 loop_stop_stage_ = 0;
411 } else {
412 return;
413 }
414 }
415 // Record the sequence_number at which we stopped the loop.
416 NET_TRACE(1, " *** ") << "Stage " << sequence_number_
417 << ": Posting Quit at read " << read_index();
418 loop_stop_stage_ = sequence_number_;
419 }
420
421 MockRead OrderedSocketData::OnRead() {
422 weak_factory_.InvalidateWeakPtrs();
423 blocked_ = false;
424 const MockRead& next_read = helper()->PeekRead();
425 if (next_read.sequence_number & MockRead::STOPLOOP)
426 EndLoop();
427 if ((next_read.sequence_number & ~MockRead::STOPLOOP) <=
428 sequence_number_++) {
429 NET_TRACE(1, " *** ") << "Stage " << sequence_number_ - 1 << ": Read "
430 << read_index();
431 DumpMockReadWrite(next_read);
432 blocked_ = (next_read.result == ERR_IO_PENDING);
433 return StaticSocketDataProvider::OnRead();
434 }
435 NET_TRACE(1, " *** ") << "Stage " << sequence_number_ - 1 << ": I/O Pending";
436 MockRead result = MockRead(ASYNC, ERR_IO_PENDING);
437 DumpMockReadWrite(result);
438 blocked_ = true;
439 return result;
440 }
441
442 MockWriteResult OrderedSocketData::OnWrite(const std::string& data) {
443 NET_TRACE(1, " *** ") << "Stage " << sequence_number_ << ": Write "
444 << write_index();
445 DumpMockReadWrite(helper()->PeekWrite());
446 ++sequence_number_;
447 if (blocked_) {
448 // TODO(willchan): This 100ms delay seems to work around some weirdness. We
449 // should probably fix the weirdness. One example is in SpdyStream,
450 // DoSendRequest() will return ERR_IO_PENDING, and there's a race. If the
451 // SYN_REPLY causes OnResponseReceived() to get called before
452 // SpdyStream::ReadResponseHeaders() is called, we hit a NOTREACHED().
453 base::MessageLoop::current()->PostDelayedTask(
454 FROM_HERE,
455 base::Bind(&OrderedSocketData::CompleteRead,
456 weak_factory_.GetWeakPtr()),
457 base::TimeDelta::FromMilliseconds(100));
458 }
459 return StaticSocketDataProvider::OnWrite(data);
460 }
461
462 void OrderedSocketData::Reset() {
463 NET_TRACE(1, " *** ") << "Stage " << sequence_number_ << ": Reset()";
464 sequence_number_ = 0;
465 loop_stop_stage_ = 0;
466 set_socket(NULL);
467 weak_factory_.InvalidateWeakPtrs();
468 StaticSocketDataProvider::Reset();
469 }
470
471 void OrderedSocketData::CompleteRead() {
472 if (socket() && blocked_) {
473 NET_TRACE(1, " *** ") << "Stage " << sequence_number_;
474 socket()->OnReadComplete(OnRead());
475 }
476 }
477
478 OrderedSocketData::~OrderedSocketData() {}
479
480 SequencedSocketData::SequencedSocketData(MockRead* reads, 383 SequencedSocketData::SequencedSocketData(MockRead* reads,
481 size_t reads_count, 384 size_t reads_count,
482 MockWrite* writes, 385 MockWrite* writes,
483 size_t writes_count) 386 size_t writes_count)
484 : helper_(reads, reads_count, writes, writes_count), 387 : helper_(reads, reads_count, writes, writes_count),
485 sequence_number_(0), 388 sequence_number_(0),
486 read_state_(IDLE), 389 read_state_(IDLE),
487 write_state_(IDLE), 390 write_state_(IDLE),
488 weak_factory_(this) { 391 weak_factory_(this) {
489 // Check that reads and writes have a contiguous set of sequence numbers 392 // Check that reads and writes have a contiguous set of sequence numbers
(...skipping 1730 matching lines...) Expand 10 before | Expand all | Expand 10 after
2220 2123
2221 const char kSOCKS5OkRequest[] = 2124 const char kSOCKS5OkRequest[] =
2222 { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 }; 2125 { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
2223 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest); 2126 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
2224 2127
2225 const char kSOCKS5OkResponse[] = 2128 const char kSOCKS5OkResponse[] =
2226 { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 }; 2129 { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
2227 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse); 2130 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
2228 2131
2229 } // namespace net 2132 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/socket_test_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698