Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/media/webrtc_logging_handler_host.h" | 5 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/cpu.h" | 11 #include "base/cpu.h" |
| 12 #include "base/file_util.h" | 12 #include "base/file_util.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/prefs/pref_service.h" | 14 #include "base/prefs/pref_service.h" |
| 15 #include "base/strings/string_number_conversions.h" | 15 #include "base/strings/string_number_conversions.h" |
| 16 #include "base/sys_info.h" | 16 #include "base/sys_info.h" |
| 17 #include "base/time/time.h" | 17 #include "base/time/time.h" |
| 18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
| 19 #include "chrome/browser/chromeos/settings/cros_settings.h" | 19 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 20 #include "chrome/browser/media/webrtc_log_list.h" | 20 #include "chrome/browser/media/webrtc_log_list.h" |
| 21 #include "chrome/browser/media/webrtc_log_uploader.h" | 21 #include "chrome/browser/media/webrtc_log_uploader.h" |
| 22 #include "chrome/browser/media/webrtc_rtp_dump_handler.h" | |
| 22 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
| 23 #include "chrome/common/chrome_switches.h" | 24 #include "chrome/common/chrome_switches.h" |
| 24 #include "chrome/common/media/webrtc_logging_messages.h" | 25 #include "chrome/common/media/webrtc_logging_messages.h" |
| 25 #include "chrome/common/partial_circular_buffer.h" | 26 #include "chrome/common/partial_circular_buffer.h" |
| 26 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
| 27 #include "chromeos/settings/cros_settings_names.h" | 28 #include "chromeos/settings/cros_settings_names.h" |
| 28 #include "content/public/browser/browser_thread.h" | 29 #include "content/public/browser/browser_thread.h" |
| 29 #include "content/public/browser/content_browser_client.h" | 30 #include "content/public/browser/content_browser_client.h" |
| 30 #include "content/public/browser/gpu_data_manager.h" | 31 #include "content/public/browser/gpu_data_manager.h" |
| 31 #include "content/public/browser/render_process_host.h" | 32 #include "content/public/browser/render_process_host.h" |
| 32 #include "gpu/config/gpu_info.h" | 33 #include "gpu/config/gpu_info.h" |
| 33 #include "net/base/address_family.h" | 34 #include "net/base/address_family.h" |
| 34 #include "net/url_request/url_request_context_getter.h" | 35 #include "net/url_request/url_request_context_getter.h" |
| 35 | 36 |
| 36 #if defined(OS_LINUX) | 37 #if defined(OS_LINUX) |
| 37 #include "base/linux_util.h" | 38 #include "base/linux_util.h" |
| 38 #endif | 39 #endif |
| 39 | 40 |
| 40 #if defined(OS_MACOSX) | 41 #if defined(OS_MACOSX) |
| 41 #include "base/mac/mac_util.h" | 42 #include "base/mac/mac_util.h" |
| 42 #endif | 43 #endif |
| 43 | 44 |
| 44 #if defined(OS_CHROMEOS) | 45 #if defined(OS_CHROMEOS) |
| 45 #include "chromeos/system/statistics_provider.h" | 46 #include "chromeos/system/statistics_provider.h" |
| 46 #endif | 47 #endif |
| 47 | 48 |
| 48 using base::IntToString; | 49 using base::IntToString; |
| 49 using content::BrowserThread; | 50 using content::BrowserThread; |
| 50 | 51 |
| 52 namespace { | |
| 51 | 53 |
| 52 #if defined(OS_ANDROID) | 54 #if defined(OS_ANDROID) |
| 53 const size_t kWebRtcLogSize = 1 * 1024 * 1024; // 1 MB | 55 const size_t kWebRtcLogSize = 1 * 1024 * 1024; // 1 MB |
| 54 #else | 56 #else |
| 55 const size_t kWebRtcLogSize = 6 * 1024 * 1024; // 6 MB | 57 const size_t kWebRtcLogSize = 6 * 1024 * 1024; // 6 MB |
| 56 #endif | 58 #endif |
| 57 | 59 |
| 58 namespace { | |
| 59 | |
| 60 const char kLogNotStoppedOrNoLogOpen[] = | 60 const char kLogNotStoppedOrNoLogOpen[] = |
| 61 "Logging not stopped or no log open."; | 61 "Logging not stopped or no log open."; |
| 62 | 62 |
| 63 // For privacy reasons when logging IP addresses. The returned "sensitive | 63 // For privacy reasons when logging IP addresses. The returned "sensitive |
| 64 // string" is for release builds a string with the end stripped away. Last | 64 // string" is for release builds a string with the end stripped away. Last |
| 65 // octet for IPv4 and last 80 bits (5 groups) for IPv6. String will be | 65 // octet for IPv4 and last 80 bits (5 groups) for IPv6. String will be |
| 66 // "1.2.3.x" and "1.2.3::" respectively. For debug builds, the string is | 66 // "1.2.3.x" and "1.2.3::" respectively. For debug builds, the string is |
| 67 // not stripped. | 67 // not stripped. |
| 68 std::string IPAddressToSensitiveString(const net::IPAddressNumber& address) { | 68 std::string IPAddressToSensitiveString(const net::IPAddressNumber& address) { |
| 69 #if defined(NDEBUG) | 69 #if defined(NDEBUG) |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 183 } | 183 } |
| 184 return; | 184 return; |
| 185 } | 185 } |
| 186 upload_callback_ = callback; | 186 upload_callback_ = callback; |
| 187 logging_state_ = UPLOADING; | 187 logging_state_ = UPLOADING; |
| 188 content::BrowserThread::PostTaskAndReplyWithResult( | 188 content::BrowserThread::PostTaskAndReplyWithResult( |
| 189 content::BrowserThread::FILE, | 189 content::BrowserThread::FILE, |
| 190 FROM_HERE, | 190 FROM_HERE, |
| 191 base::Bind(&WebRtcLoggingHandlerHost::GetLogDirectoryAndEnsureExists, | 191 base::Bind(&WebRtcLoggingHandlerHost::GetLogDirectoryAndEnsureExists, |
| 192 this), | 192 this), |
| 193 base::Bind(&WebRtcLoggingHandlerHost::TriggerUploadLog, this)); | 193 base::Bind(&WebRtcLoggingHandlerHost::TriggerUpload, this)); |
| 194 } | 194 } |
| 195 | 195 |
| 196 void WebRtcLoggingHandlerHost::UploadLogDone() { | 196 void WebRtcLoggingHandlerHost::UploadLogDone() { |
| 197 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 197 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 198 logging_state_ = CLOSED; | 198 logging_state_ = CLOSED; |
| 199 } | 199 } |
| 200 | 200 |
| 201 void WebRtcLoggingHandlerHost::DiscardLog(const GenericDoneCallback& callback) { | 201 void WebRtcLoggingHandlerHost::DiscardLog(const GenericDoneCallback& callback) { |
| 202 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 202 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 203 DCHECK(!callback.is_null()); | 203 DCHECK(!callback.is_null()); |
| 204 | 204 |
| 205 GenericDoneCallback discard_callback = callback; | 205 GenericDoneCallback discard_callback = callback; |
| 206 if (logging_state_ != STOPPED) { | 206 if (logging_state_ != STOPPED) { |
| 207 FireGenericDoneCallback(&discard_callback, false, | 207 FireGenericDoneCallback(&discard_callback, false, |
| 208 kLogNotStoppedOrNoLogOpen); | 208 kLogNotStoppedOrNoLogOpen); |
| 209 return; | 209 return; |
| 210 } | 210 } |
| 211 g_browser_process->webrtc_log_uploader()->LoggingStoppedDontUpload(); | 211 g_browser_process->webrtc_log_uploader()->LoggingStoppedDontUpload(); |
| 212 circular_buffer_.reset(); | 212 circular_buffer_.reset(); |
| 213 log_buffer_.reset(); | 213 log_buffer_.reset(); |
| 214 logging_state_ = CLOSED; | 214 logging_state_ = CLOSED; |
| 215 rtp_dump_handler_.reset(); | |
| 215 FireGenericDoneCallback(&discard_callback, true, ""); | 216 FireGenericDoneCallback(&discard_callback, true, ""); |
| 216 } | 217 } |
| 217 | 218 |
| 218 void WebRtcLoggingHandlerHost::LogMessage(const std::string& message) { | 219 void WebRtcLoggingHandlerHost::LogMessage(const std::string& message) { |
| 219 BrowserThread::PostTask( | 220 BrowserThread::PostTask( |
| 220 BrowserThread::IO, | 221 BrowserThread::IO, |
| 221 FROM_HERE, | 222 FROM_HERE, |
| 222 base::Bind( | 223 base::Bind( |
| 223 &WebRtcLoggingHandlerHost::AddLogMessageFromBrowser, | 224 &WebRtcLoggingHandlerHost::AddLogMessageFromBrowser, |
| 224 this, | 225 this, |
| 225 WebRtcLoggingMessageData(base::Time::Now(), message))); | 226 WebRtcLoggingMessageData(base::Time::Now(), message))); |
| 226 } | 227 } |
| 227 | 228 |
| 228 void WebRtcLoggingHandlerHost::StartRtpDump( | 229 void WebRtcLoggingHandlerHost::StartRtpDump( |
| 229 bool incoming, | 230 bool incoming, |
| 230 bool outgoing, | 231 bool outgoing, |
| 231 const GenericDoneCallback& callback) { | 232 const GenericDoneCallback& callback) { |
| 232 NOTIMPLEMENTED(); | 233 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 234 DCHECK(!callback.is_null()); | |
| 235 | |
| 236 GenericDoneCallback start_callback = callback; | |
| 237 if (!incoming && !outgoing) { | |
| 238 FireGenericDoneCallback(&start_callback, false, "Invalid argument."); | |
|
Henrik Grunell
2014/05/14 12:14:12
This will end up in the javascript app, I think th
jiayl
2014/05/14 18:59:12
Done improving the error message.
How could we ch
Henrik Grunell
2014/05/15 14:36:34
I'd like a JS enum used in the JS API. We could do
jiayl
2014/05/15 23:06:22
Done.
| |
| 239 return; | |
| 240 } | |
| 241 | |
| 242 if (!rtp_dump_handler_) { | |
| 243 content::BrowserThread::PostTaskAndReplyWithResult( | |
| 244 content::BrowserThread::FILE, | |
| 245 FROM_HERE, | |
| 246 base::Bind(&WebRtcLoggingHandlerHost::GetLogDirectoryAndEnsureExists, | |
| 247 this), | |
| 248 base::Bind(&WebRtcLoggingHandlerHost::CreateRtpDumpHandlerAndStart, | |
| 249 this, | |
| 250 incoming, | |
| 251 outgoing, | |
| 252 callback)); | |
| 253 return; | |
| 254 } | |
| 255 | |
| 256 DoStartRtpDump(incoming, outgoing, &start_callback); | |
| 233 } | 257 } |
| 234 | 258 |
| 235 void WebRtcLoggingHandlerHost::StopRtpDump( | 259 void WebRtcLoggingHandlerHost::StopRtpDump( |
| 236 bool incoming, | 260 bool incoming, |
| 237 bool outgoing, | 261 bool outgoing, |
| 238 const GenericDoneCallback& callback) { | 262 const GenericDoneCallback& callback) { |
| 239 NOTIMPLEMENTED(); | 263 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 264 DCHECK(!callback.is_null()); | |
| 265 | |
| 266 GenericDoneCallback stop_callback = callback; | |
| 267 if (!(incoming || outgoing) || !rtp_dump_handler_) { | |
| 268 FireGenericDoneCallback(&stop_callback, false, "Invalid argument"); | |
| 269 return; | |
| 270 } | |
| 271 | |
| 272 WebRtcRtpDumpHandler::PacketType type(incoming, outgoing); | |
| 273 rtp_dump_handler_->StopDump(type, callback); | |
| 274 } | |
| 275 | |
| 276 void WebRtcLoggingHandlerHost::OnRtpPacket(const uint8* packet_header, | |
| 277 size_t header_length, | |
| 278 size_t packet_length, | |
| 279 bool incoming) { | |
| 280 // Can be called on any thread as it always posts to the IO thread. | |
|
Henrik Grunell
2014/05/14 12:14:12
Move this comment to the declaration.
jiayl
2014/05/14 18:59:12
Done.
| |
| 281 | |
| 282 scoped_ptr<uint8[]> header_data(new uint8[header_length]); | |
| 283 memcpy(header_data.get(), packet_header, header_length); | |
| 284 | |
| 285 BrowserThread::PostTask( | |
| 286 BrowserThread::IO, | |
| 287 FROM_HERE, | |
| 288 base::Bind(&WebRtcLoggingHandlerHost::DumpRtpPacketOnIOThread, | |
| 289 this, | |
| 290 base::Passed(&header_data), | |
| 291 header_length, | |
| 292 packet_length, | |
| 293 incoming)); | |
| 294 } | |
| 295 | |
| 296 void WebRtcLoggingHandlerHost::DumpRtpPacketOnIOThread( | |
| 297 scoped_ptr<uint8[]> packet_header, | |
| 298 size_t header_length, | |
| 299 size_t packet_length, | |
| 300 bool incoming) { | |
| 301 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
| 302 | |
| 303 if (rtp_dump_handler_) { | |
| 304 rtp_dump_handler_->OnRtpPacket( | |
| 305 packet_header.get(), header_length, packet_length, incoming); | |
| 306 } | |
| 240 } | 307 } |
| 241 | 308 |
| 242 void WebRtcLoggingHandlerHost::OnChannelClosing() { | 309 void WebRtcLoggingHandlerHost::OnChannelClosing() { |
| 243 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 310 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 244 if (logging_state_ == STARTED || logging_state_ == STOPPED) { | 311 if (logging_state_ == STARTED || logging_state_ == STOPPED) { |
| 245 if (upload_log_on_render_close_) { | 312 if (upload_log_on_render_close_) { |
| 246 logging_state_ = UPLOADING; | 313 logging_state_ = UPLOADING; |
| 247 logging_started_time_ = base::Time(); | 314 logging_started_time_ = base::Time(); |
| 248 content::BrowserThread::PostTaskAndReplyWithResult( | 315 content::BrowserThread::PostTaskAndReplyWithResult( |
| 249 content::BrowserThread::FILE, | 316 content::BrowserThread::FILE, |
| 250 FROM_HERE, | 317 FROM_HERE, |
| 251 base::Bind(&WebRtcLoggingHandlerHost::GetLogDirectoryAndEnsureExists, | 318 base::Bind(&WebRtcLoggingHandlerHost::GetLogDirectoryAndEnsureExists, |
| 252 this), | 319 this), |
| 253 base::Bind(&WebRtcLoggingHandlerHost::TriggerUploadLog, this)); | 320 base::Bind(&WebRtcLoggingHandlerHost::TriggerUpload, this)); |
| 254 } else { | 321 } else { |
| 255 g_browser_process->webrtc_log_uploader()->LoggingStoppedDontUpload(); | 322 g_browser_process->webrtc_log_uploader()->LoggingStoppedDontUpload(); |
| 256 } | 323 } |
| 257 } | 324 } |
| 258 content::BrowserMessageFilter::OnChannelClosing(); | 325 content::BrowserMessageFilter::OnChannelClosing(); |
| 259 } | 326 } |
| 260 | 327 |
| 261 void WebRtcLoggingHandlerHost::OnDestruct() const { | 328 void WebRtcLoggingHandlerHost::OnDestruct() const { |
| 262 BrowserThread::DeleteOnIOThread::Destruct(this); | 329 BrowserThread::DeleteOnIOThread::Destruct(this); |
| 263 } | 330 } |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 445 base::FilePath log_dir_path = | 512 base::FilePath log_dir_path = |
| 446 WebRtcLogList::GetWebRtcLogDirectoryForProfile(profile_->GetPath()); | 513 WebRtcLogList::GetWebRtcLogDirectoryForProfile(profile_->GetPath()); |
| 447 base::File::Error error; | 514 base::File::Error error; |
| 448 if (!base::CreateDirectoryAndGetError(log_dir_path, &error)) { | 515 if (!base::CreateDirectoryAndGetError(log_dir_path, &error)) { |
| 449 DLOG(ERROR) << "Could not create WebRTC log directory, error: " << error; | 516 DLOG(ERROR) << "Could not create WebRTC log directory, error: " << error; |
| 450 return base::FilePath(); | 517 return base::FilePath(); |
| 451 } | 518 } |
| 452 return log_dir_path; | 519 return log_dir_path; |
| 453 } | 520 } |
| 454 | 521 |
| 455 void WebRtcLoggingHandlerHost::TriggerUploadLog( | 522 void WebRtcLoggingHandlerHost::TriggerUpload( |
| 456 const base::FilePath& log_directory) { | 523 const base::FilePath& log_directory) { |
| 457 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 524 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 458 DCHECK_EQ(logging_state_, UPLOADING); | 525 DCHECK_EQ(logging_state_, UPLOADING); |
| 459 | 526 |
| 527 WebRtcRtpDumpHandler::ReleasedDumps dumps; | |
| 528 if (rtp_dump_handler_) { | |
|
Henrik Grunell
2014/05/14 12:14:12
Remove {}
jiayl
2014/05/14 18:59:12
Done.
| |
| 529 dumps = rtp_dump_handler_->ReleaseDumps(); | |
| 530 } | |
| 531 | |
| 532 DoUploadLogAndDumps(log_directory, dumps); | |
| 533 } | |
| 534 | |
| 535 void WebRtcLoggingHandlerHost::FireGenericDoneCallback( | |
| 536 GenericDoneCallback* callback, | |
| 537 bool success, | |
| 538 const std::string& error_message) { | |
| 539 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
| 540 DCHECK(!(*callback).is_null()); | |
| 541 content::BrowserThread::PostTask( | |
| 542 content::BrowserThread::UI, | |
| 543 FROM_HERE, | |
| 544 base::Bind(*callback, success, error_message)); | |
| 545 (*callback).Reset(); | |
| 546 } | |
| 547 | |
| 548 void WebRtcLoggingHandlerHost::CreateRtpDumpHandlerAndStart( | |
| 549 bool incoming, | |
| 550 bool outgoing, | |
| 551 GenericDoneCallback callback, | |
| 552 const base::FilePath& dump_dir) { | |
| 553 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
| 554 | |
| 555 if (!rtp_dump_handler_) | |
| 556 rtp_dump_handler_.reset(new WebRtcRtpDumpHandler(dump_dir)); | |
| 557 | |
| 558 DoStartRtpDump(incoming, outgoing, &callback); | |
| 559 } | |
| 560 | |
| 561 void WebRtcLoggingHandlerHost::DoStartRtpDump(bool incoming, | |
| 562 bool outgoing, | |
| 563 GenericDoneCallback* callback) { | |
| 564 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
| 565 DCHECK(rtp_dump_handler_); | |
| 566 | |
| 567 std::string error; | |
| 568 WebRtcRtpDumpHandler::PacketType type(incoming, outgoing); | |
| 569 bool result = rtp_dump_handler_->StartDump(type, &error); | |
| 570 FireGenericDoneCallback(callback, result, error); | |
| 571 } | |
| 572 | |
| 573 void WebRtcLoggingHandlerHost::DoUploadLogAndDumps( | |
| 574 const base::FilePath& log_directory, | |
| 575 const WebRtcRtpDumpHandler::ReleasedDumps& rtp_dumps) { | |
| 460 WebRtcLogUploadDoneData upload_done_data; | 576 WebRtcLogUploadDoneData upload_done_data; |
| 461 upload_done_data.log_path = log_directory; | 577 upload_done_data.log_path = log_directory; |
| 578 | |
| 579 if (!rtp_dumps.incoming_dump_path.empty()) { | |
| 580 upload_done_data.rtp_dumps.push_back( | |
| 581 WebRtcRtpDumpDescription("rtpdump_recv", rtp_dumps.incoming_dump_path)); | |
| 582 } | |
| 583 | |
| 584 if (!rtp_dumps.outgoing_dump_path.empty()) { | |
| 585 upload_done_data.rtp_dumps.push_back( | |
| 586 WebRtcRtpDumpDescription("rtpdump_send", rtp_dumps.outgoing_dump_path)); | |
| 587 } | |
| 588 | |
| 462 upload_done_data.callback = upload_callback_; | 589 upload_done_data.callback = upload_callback_; |
| 463 upload_done_data.host = this; | 590 upload_done_data.host = this; |
| 464 upload_callback_.Reset(); | 591 upload_callback_.Reset(); |
| 465 | 592 |
| 466 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind( | 593 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind( |
| 467 &WebRtcLogUploader::LoggingStoppedDoUpload, | 594 &WebRtcLogUploader::LoggingStoppedDoUpload, |
| 468 base::Unretained(g_browser_process->webrtc_log_uploader()), | 595 base::Unretained(g_browser_process->webrtc_log_uploader()), |
| 469 Passed(&log_buffer_), | 596 Passed(&log_buffer_), |
| 470 kWebRtcLogSize, | 597 kWebRtcLogSize, |
| 471 meta_data_, | 598 meta_data_, |
| 472 upload_done_data)); | 599 upload_done_data)); |
| 473 | 600 |
| 474 meta_data_.clear(); | 601 meta_data_.clear(); |
| 475 circular_buffer_.reset(); | 602 circular_buffer_.reset(); |
| 476 } | 603 } |
| 477 | |
| 478 void WebRtcLoggingHandlerHost::FireGenericDoneCallback( | |
| 479 GenericDoneCallback* callback, bool success, | |
| 480 const std::string& error_message) { | |
| 481 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
| 482 DCHECK(!(*callback).is_null()); | |
| 483 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, | |
| 484 base::Bind(*callback, success, | |
| 485 error_message)); | |
| 486 (*callback).Reset(); | |
| 487 } | |
| OLD | NEW |