diff options
3 files changed, 7 insertions, 38 deletions
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc index f641bf8..26ba53e 100644 --- a/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc +++ b/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc @@ -119,7 +119,6 @@ WebSocketExperimentRunner::WebSocketExperimentRunner() } WebSocketExperimentRunner::~WebSocketExperimentRunner() { - DLOG(INFO) << "WebSocketExperimentRunner deleted"; DCHECK(!task_.get()); } @@ -205,7 +204,6 @@ void WebSocketExperimentRunner::DoLoop() { task_state_ = STATE_NONE; next_state_ = STATE_NONE; - DLOG(INFO) << "WebSocketExperiment state=" << state; switch (state) { case STATE_IDLE: task_.reset(); @@ -243,11 +241,10 @@ void WebSocketExperimentRunner::DoLoop() { } void WebSocketExperimentRunner::OnTaskCompleted(int result) { - DLOG(INFO) << "WebSocketExperiment TaskCompleted result=" - << net::ErrorToString(result); if (result == net::ERR_ABORTED) { task_.reset(); // Task is Canceled. + DLOG(INFO) << "WebSocketExperiment Task is canceled."; Release(); return; } @@ -260,21 +257,7 @@ void WebSocketExperimentRunner::OnTaskCompleted(int result) { void WebSocketExperimentRunner::UpdateTaskResultHistogram( const WebSocketExperimentTask* task) { DCHECK(task); - const WebSocketExperimentTask::Config& task_config = task->config(); const WebSocketExperimentTask::Result& task_result = task->result(); - DLOG(INFO) << "Result for url=" << task_config.url - << " last_result=" - << net::ErrorToString(task_result.last_result) - << " last_state=" << task_result.last_state - << " url_fetch=" << task_result.url_fetch.InSecondsF() - << " websocket_connect=" - << task_result.websocket_connect.InSecondsF() - << " websocket_echo=" - << task_result.websocket_echo.InSecondsF() - << " websocket_idle=" - << task_result.websocket_idle.InSecondsF() - << " websocket_total=" - << task_result.websocket_total.InSecondsF(); UPDATE_HISTOGRAM("LastState", task_result.last_state, 1, WebSocketExperimentTask::NUM_STATES, diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc index a9a3ccc..ef3b627 100644 --- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc +++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc @@ -22,7 +22,6 @@ URLFetcher* WebSocketExperimentTask::Context::CreateURLFetcher( // before it has gotten lazily initialized yet. if (!getter) return NULL; - DLOG(INFO) << "url=" << config.http_url; URLFetcher* fetcher = new URLFetcher(config.http_url, URLFetcher::GET, delegate); fetcher->set_request_context(getter); @@ -62,7 +61,6 @@ WebSocketExperimentTask::WebSocketExperimentTask( } WebSocketExperimentTask::~WebSocketExperimentTask() { - DLOG(INFO) << "WebSocketExperimentTask finished"; DCHECK(!websocket_); } @@ -86,7 +84,6 @@ void WebSocketExperimentTask::OnURLFetchComplete( const std::string& data) { result_.url_fetch = base::TimeTicks::Now() - url_fetch_start_time_; RevokeTimeoutTimer(); - DLOG(INFO) << "OnURLFetchCompleted"; int result = net::ERR_FAILED; if (next_state_ != STATE_URL_FETCH_COMPLETE) { DLOG(INFO) << "unexpected state=" << next_state_; @@ -120,7 +117,6 @@ void WebSocketExperimentTask::OnMessage( result_.websocket_idle = base::TimeTicks::Now() - websocket_idle_start_time_; RevokeTimeoutTimer(); - DLOG(INFO) << "OnMessage msg=" << msg; received_messages_.push_back(msg); int result = net::ERR_UNEXPECTED; switch (next_state_) { @@ -173,7 +169,6 @@ void WebSocketExperimentTask::DoLoop(int result) { do { State state = next_state_; next_state_ = STATE_NONE; - DLOG(INFO) << "WebSocketExperimentTask state=" << state; switch (state) { case STATE_URL_FETCH: result = DoURLFetch(); @@ -221,8 +216,6 @@ void WebSocketExperimentTask::DoLoop(int result) { result_.last_state = state; } while (result != net::ERR_IO_PENDING && next_state_ != STATE_NONE); - DLOG(INFO) << "WebSocketExperiemntTask Loop done next_state=" << next_state_ - << " result=" << net::ErrorToString(result); if (result != net::ERR_IO_PENDING) Finish(result); } @@ -239,15 +232,12 @@ int WebSocketExperimentTask::DoURLFetch() { next_state_ = STATE_URL_FETCH_COMPLETE; SetTimeout(config_.url_fetch_deadline_ms); - DLOG(INFO) << "URLFetch url=" << url_fetcher_->url() - << " timeout=" << config_.url_fetch_deadline_ms; url_fetch_start_time_ = base::TimeTicks::Now(); url_fetcher_->Start(); return net::ERR_IO_PENDING; } int WebSocketExperimentTask::DoURLFetchComplete(int result) { - DLOG(INFO) << "DoURLFetchComplete result=" << result; url_fetcher_.reset(); if (result < 0) @@ -408,9 +398,6 @@ void WebSocketExperimentTask::RevokeTimeoutTimer() { } void WebSocketExperimentTask::Finish(int result) { - DLOG(INFO) << "Finish Task for " << config_.url - << " next_state=" << next_state_ - << " result=" << net::ErrorToString(result); url_fetcher_.reset(); scoped_refptr<net::WebSocket> websocket = websocket_; websocket_ = NULL; diff --git a/net/websockets/websocket.cc b/net/websockets/websocket.cc index ddef4c0..e588707 100644 --- a/net/websockets/websocket.cc +++ b/net/websockets/websocket.cc @@ -190,7 +190,6 @@ IOBufferWithSize* WebSocket::CreateClientHandshakeMessage() const { } // TODO(ukai): Add cookie if necessary. msg += "\r\n"; - DLOG(INFO) << "ClientHandshake request=" << msg; IOBufferWithSize* buf = new IOBufferWithSize(msg.size()); memcpy(buf->data(), msg.data(), msg.size()); return buf; @@ -203,7 +202,6 @@ int WebSocket::CheckHandshake() { const char *start = current_read_buf_->StartOfBuffer() + read_consumed_len_; const char *p = start; size_t len = current_read_buf_->offset() - read_consumed_len_; - DLOG(INFO) << "ClientHandshake response=" << std::string(start, len); if (len < kServerHandshakeHeaderLength) { return -1; } @@ -245,7 +243,7 @@ int WebSocket::CheckHandshake() { if (header_size < kConnectionHeaderLength) return -1; if (memcmp(p, kConnectionHeader, kConnectionHeaderLength)) { - DLOG(INFO) << "Bad Upgrade Header " + DLOG(INFO) << "Bad Connection Header " << std::string(p, kConnectionHeaderLength); ready_state_ = CLOSED; return p - start; @@ -258,7 +256,8 @@ int WebSocket::CheckHandshake() { scoped_refptr<HttpResponseHeaders> headers( new HttpResponseHeaders(HttpUtil::AssembleRawHeaders(start, eoh))); if (!ProcessHeaders(*headers)) { - DLOG(INFO) << "Process Headers failed"; + DLOG(INFO) << "Process Headers failed: " + << std::string(start, eoh); ready_state_ = CLOSED; return eoh; } @@ -274,9 +273,9 @@ int WebSocket::CheckHandshake() { ready_state_ = CLOSED; break; } - DLOG(INFO) << "CheckHandshake mode=" << mode_ - << " ready_state=" << ready_state_ - << " eoh=" << eoh; + if (ready_state_ == CLOSED) + DLOG(INFO) << "CheckHandshake mode=" << mode_ + << " " << std::string(start, eoh); return eoh; } |