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

Side by Side Diff: chrome/browser/browser_main.cc

Issue 6990036: Deciding best connection to schedule requests on based on cwnd and idle time (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: addressing comments Created 9 years, 6 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #include "content/common/hi_res_timer_manager.h" 93 #include "content/common/hi_res_timer_manager.h"
94 #include "content/common/main_function_params.h" 94 #include "content/common/main_function_params.h"
95 #include "content/common/result_codes.h" 95 #include "content/common/result_codes.h"
96 #include "grit/app_locale_settings.h" 96 #include "grit/app_locale_settings.h"
97 #include "grit/chromium_strings.h" 97 #include "grit/chromium_strings.h"
98 #include "grit/generated_resources.h" 98 #include "grit/generated_resources.h"
99 #include "grit/platform_locale_settings.h" 99 #include "grit/platform_locale_settings.h"
100 #include "net/base/cookie_monster.h" 100 #include "net/base/cookie_monster.h"
101 #include "net/base/net_module.h" 101 #include "net/base/net_module.h"
102 #include "net/base/network_change_notifier.h" 102 #include "net/base/network_change_notifier.h"
103 #include "net/http/http_basic_stream.h"
103 #include "net/http/http_network_layer.h" 104 #include "net/http/http_network_layer.h"
104 #include "net/http/http_stream_factory.h" 105 #include "net/http/http_stream_factory.h"
105 #include "net/socket/client_socket_pool_base.h" 106 #include "net/socket/client_socket_pool_base.h"
106 #include "net/socket/client_socket_pool_manager.h" 107 #include "net/socket/client_socket_pool_manager.h"
107 #include "net/socket/tcp_client_socket.h" 108 #include "net/socket/tcp_client_socket.h"
108 #include "net/spdy/spdy_session.h" 109 #include "net/spdy/spdy_session.h"
109 #include "net/spdy/spdy_session_pool.h" 110 #include "net/spdy/spdy_session_pool.h"
110 #include "net/url_request/url_request.h" 111 #include "net/url_request/url_request.h"
111 #include "net/url_request/url_request_throttler_manager.h" 112 #include "net/url_request/url_request_throttler_manager.h"
112 #include "net/websockets/websocket_job.h" 113 #include "net/websockets/websocket_job.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 #endif 201 #endif
201 202
202 #if defined(TOOLKIT_USES_GTK) 203 #if defined(TOOLKIT_USES_GTK)
203 #include "ui/gfx/gtk_util.h" 204 #include "ui/gfx/gtk_util.h"
204 #endif 205 #endif
205 206
206 #if defined(TOUCH_UI) && defined(HAVE_XINPUT2) 207 #if defined(TOUCH_UI) && defined(HAVE_XINPUT2)
207 #include "views/touchui/touch_factory.h" 208 #include "views/touchui/touch_factory.h"
208 #endif 209 #endif
209 210
211 using net::internal::ClientSocketPoolBaseHelper;
212 using net::HttpBasicStream;
213
210 namespace net { 214 namespace net {
211 class NetLog; 215 class NetLog;
212 } // namespace net 216 } // namespace net
213 217
214 // BrowserMainParts ------------------------------------------------------------ 218 // BrowserMainParts ------------------------------------------------------------
215 219
216 BrowserMainParts::BrowserMainParts(const MainFunctionParams& parameters) 220 BrowserMainParts::BrowserMainParts(const MainFunctionParams& parameters)
217 : parameters_(parameters), 221 : parameters_(parameters),
218 parsed_command_line_(parameters.command_line_) { 222 parsed_command_line_(parameters.command_line_) {
219 } 223 }
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 if (parsed_command_line().HasSwitch(switches::kMaxSpdyConcurrentStreams)) { 471 if (parsed_command_line().HasSwitch(switches::kMaxSpdyConcurrentStreams)) {
468 int value = 0; 472 int value = 0;
469 base::StringToInt(parsed_command_line().GetSwitchValueASCII( 473 base::StringToInt(parsed_command_line().GetSwitchValueASCII(
470 switches::kMaxSpdyConcurrentStreams), 474 switches::kMaxSpdyConcurrentStreams),
471 &value); 475 &value);
472 if (value > 0) 476 if (value > 0)
473 net::SpdySession::set_max_concurrent_streams(value); 477 net::SpdySession::set_max_concurrent_streams(value);
474 } 478 }
475 } 479 }
476 480
481 // If --socket-reuse-policy is not specified, run an A/B test for choosing the
482 // warmest socket.
483 void BrowserMainParts::WarmConnectionFieldTrial() {
484 const CommandLine& command_line = parsed_command_line();
485 if (command_line.HasSwitch(switches::kSocketReusePolicy)) {
486 std::string alpha_str = command_line.GetSwitchValueASCII(
487 switches::kSocketReusePolicy);
488 int coef = -1;
489 base::StringToInt(alpha_str, &coef);
490
491 const int socket_policy[] = { 0, 1, 2 };
492 LOG(ERROR) << "Chose socket_reuse_policy coef = " << coef;
493 ApplySocketReuseGroup(coef, socket_policy, arraysize(socket_policy));
494 return;
495 }
496
497 const base::FieldTrial::Probability kWarmSocketDivisor = 100;
498 const base::FieldTrial::Probability kWarmSocketProbability = 33;
499
500 // After January 30, 2013 builds, it will always be in default group.
501 scoped_refptr<base::FieldTrial> warmest_socket_trial(
502 new base::FieldTrial(
503 "WarmSocketImpact", kWarmSocketDivisor, "last_accessed_socket",
504 2013, 1, 30));
505
506 // Default value is USE_LAST_ACCESSED_SOCKET.
507 const int last_accessed_socket = warmest_socket_trial->kDefaultGroupNumber;
508 const int warmest_socket = warmest_socket_trial->AppendGroup(
509 "warmest_socket", kWarmSocketProbability);
510 const int warm_socket = warmest_socket_trial->AppendGroup(
511 "warm_socket", kWarmSocketProbability);
Mike Belshe 2011/06/12 22:10:35 nit: you're now assuming that the field trial ret
Gagan 2011/06/13 03:52:47 Actually no. Im assuming that all 3 groups are rep
512
513 const int warmest_socket_trial_group = warmest_socket_trial->group();
514
515 const int socket_policy[] = { warmest_socket, warm_socket,
516 last_accessed_socket };
517 ApplySocketReuseGroup(warmest_socket_trial_group, socket_policy,
518 arraysize(socket_policy));
519 }
520
521 void BrowserMainParts::ApplySocketReuseGroup(int warmest_socket_trial_group,
522 const int socket_policy[],
523 int num_groups) {
524 for (int i = 0; i < num_groups; i++) {
525 if (warmest_socket_trial_group == socket_policy[i]) {
526 ClientSocketPoolBaseHelper::SetSocketReusePolicy(i);
527 HttpBasicStream::SetSocketReusePolicy(i);
528 return;
529 }
530 }
531
532 LOG(ERROR) << "Not a valid socket reuse policy group";
533 NOTREACHED() << "Not a valid socket reuse policy group";
Mike Belshe 2011/06/12 22:10:35 nit: the notreached() will crash even a release b
Gagan 2011/06/13 03:52:47 base/logging.h defines NOTREACHED as DCHECK(false)
534 }
535
477 // If neither --enable-connect-backup-jobs or --disable-connect-backup-jobs is 536 // If neither --enable-connect-backup-jobs or --disable-connect-backup-jobs is
478 // specified, run an A/B test for automatically establishing backup TCP 537 // specified, run an A/B test for automatically establishing backup TCP
479 // connections when a certain timeout value is exceeded. 538 // connections when a certain timeout value is exceeded.
480 void BrowserMainParts::ConnectBackupJobsFieldTrial() { 539 void BrowserMainParts::ConnectBackupJobsFieldTrial() {
481 if (parsed_command_line().HasSwitch(switches::kEnableConnectBackupJobs)) { 540 if (parsed_command_line().HasSwitch(switches::kEnableConnectBackupJobs)) {
482 net::internal::ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled( 541 net::internal::ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(
483 true); 542 true);
484 } else if (parsed_command_line().HasSwitch( 543 } else if (parsed_command_line().HasSwitch(
485 switches::kDisableConnectBackupJobs)) { 544 switches::kDisableConnectBackupJobs)) {
486 net::internal::ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled( 545 net::internal::ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start(); 645 chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start();
587 646
588 // Note: make sure to call ConnectionFieldTrial() before 647 // Note: make sure to call ConnectionFieldTrial() before
589 // ProxyConnectionsFieldTrial(). 648 // ProxyConnectionsFieldTrial().
590 ConnectionFieldTrial(); 649 ConnectionFieldTrial();
591 SocketTimeoutFieldTrial(); 650 SocketTimeoutFieldTrial();
592 ProxyConnectionsFieldTrial(); 651 ProxyConnectionsFieldTrial();
593 prerender::ConfigurePrefetchAndPrerender(parsed_command_line()); 652 prerender::ConfigurePrefetchAndPrerender(parsed_command_line());
594 SpdyFieldTrial(); 653 SpdyFieldTrial();
595 ConnectBackupJobsFieldTrial(); 654 ConnectBackupJobsFieldTrial();
655 WarmConnectionFieldTrial();
596 } 656 }
597 657
598 // ----------------------------------------------------------------------------- 658 // -----------------------------------------------------------------------------
599 // TODO(viettrungluu): move more/rest of BrowserMain() into above structure 659 // TODO(viettrungluu): move more/rest of BrowserMain() into above structure
600 660
601 namespace { 661 namespace {
602 662
603 // This function provides some ways to test crash and assertion handling 663 // This function provides some ways to test crash and assertion handling
604 // behavior of the program. 664 // behavior of the program.
605 void HandleTestParameters(const CommandLine& command_line) { 665 void HandleTestParameters(const CommandLine& command_line) {
(...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after
1970 #if defined(OS_CHROMEOS) 2030 #if defined(OS_CHROMEOS)
1971 // To be precise, logout (browser shutdown) is not yet done, but the 2031 // To be precise, logout (browser shutdown) is not yet done, but the
1972 // remaining work is negligible, hence we say LogoutDone here. 2032 // remaining work is negligible, hence we say LogoutDone here.
1973 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 2033 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1974 false); 2034 false);
1975 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 2035 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1976 #endif 2036 #endif
1977 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 2037 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
1978 return result_code; 2038 return result_code;
1979 } 2039 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698