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

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: Reuploading from google.com account 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
« no previous file with comments | « chrome/browser/browser_main.h ('k') | chrome/common/chrome_switches.h » ('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) 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 namespace {
212 void SetSocketReusePolicy(int warmest_socket_trial_group,
213 const int socket_policy[],
214 int num_groups) {
215 for (int i = 0; i < num_groups; i++) {
216 if (warmest_socket_trial_group == socket_policy[i]) {
217 net::SetSocketReusePolicy(i);
218 return;
219 }
220 }
221
222 NOTREACHED() << "Not a valid socket reuse policy group";
223 }
224 }
225
210 namespace net { 226 namespace net {
211 class NetLog; 227 class NetLog;
212 } // namespace net 228 } // namespace net
213 229
214 // BrowserMainParts ------------------------------------------------------------ 230 // BrowserMainParts ------------------------------------------------------------
215 231
216 BrowserMainParts::BrowserMainParts(const MainFunctionParams& parameters) 232 BrowserMainParts::BrowserMainParts(const MainFunctionParams& parameters)
217 : parameters_(parameters), 233 : parameters_(parameters),
218 parsed_command_line_(parameters.command_line_) { 234 parsed_command_line_(parameters.command_line_) {
219 } 235 }
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 if (parsed_command_line().HasSwitch(switches::kMaxSpdyConcurrentStreams)) { 483 if (parsed_command_line().HasSwitch(switches::kMaxSpdyConcurrentStreams)) {
468 int value = 0; 484 int value = 0;
469 base::StringToInt(parsed_command_line().GetSwitchValueASCII( 485 base::StringToInt(parsed_command_line().GetSwitchValueASCII(
470 switches::kMaxSpdyConcurrentStreams), 486 switches::kMaxSpdyConcurrentStreams),
471 &value); 487 &value);
472 if (value > 0) 488 if (value > 0)
473 net::SpdySession::set_max_concurrent_streams(value); 489 net::SpdySession::set_max_concurrent_streams(value);
474 } 490 }
475 } 491 }
476 492
493 // If --socket-reuse-policy is not specified, run an A/B test for choosing the
494 // warmest socket.
495 void BrowserMainParts::WarmConnectionFieldTrial() {
496 const CommandLine& command_line = parsed_command_line();
497 if (command_line.HasSwitch(switches::kSocketReusePolicy)) {
498 std::string socket_reuse_policy_str = command_line.GetSwitchValueASCII(
499 switches::kSocketReusePolicy);
500 int policy = -1;
501 base::StringToInt(socket_reuse_policy_str, &policy);
502
503 const int policy_list[] = { 0, 1, 2 };
504 LOG(INFO) << "Setting socket_reuse_policy = " << policy;
505 SetSocketReusePolicy(policy, policy_list, arraysize(policy_list));
506 return;
507 }
508
509 const base::FieldTrial::Probability kWarmSocketDivisor = 100;
510 const base::FieldTrial::Probability kWarmSocketProbability = 33;
511
512 // After January 30, 2013 builds, it will always be in default group.
513 scoped_refptr<base::FieldTrial> warmest_socket_trial(
514 new base::FieldTrial(
515 "WarmSocketImpact", kWarmSocketDivisor, "last_accessed_socket",
516 2013, 1, 30));
517
518 // Default value is USE_LAST_ACCESSED_SOCKET.
519 const int last_accessed_socket = warmest_socket_trial->kDefaultGroupNumber;
520 const int warmest_socket = warmest_socket_trial->AppendGroup(
521 "warmest_socket", kWarmSocketProbability);
522 const int warm_socket = warmest_socket_trial->AppendGroup(
523 "warm_socket", kWarmSocketProbability);
524
525 const int warmest_socket_trial_group = warmest_socket_trial->group();
526
527 const int policy_list[] = { warmest_socket, warm_socket,
528 last_accessed_socket };
529 SetSocketReusePolicy(warmest_socket_trial_group, policy_list,
530 arraysize(policy_list));
531 }
532
477 // If neither --enable-connect-backup-jobs or --disable-connect-backup-jobs is 533 // If neither --enable-connect-backup-jobs or --disable-connect-backup-jobs is
478 // specified, run an A/B test for automatically establishing backup TCP 534 // specified, run an A/B test for automatically establishing backup TCP
479 // connections when a certain timeout value is exceeded. 535 // connections when a certain timeout value is exceeded.
480 void BrowserMainParts::ConnectBackupJobsFieldTrial() { 536 void BrowserMainParts::ConnectBackupJobsFieldTrial() {
481 if (parsed_command_line().HasSwitch(switches::kEnableConnectBackupJobs)) { 537 if (parsed_command_line().HasSwitch(switches::kEnableConnectBackupJobs)) {
482 net::internal::ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled( 538 net::internal::ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(
483 true); 539 true);
484 } else if (parsed_command_line().HasSwitch( 540 } else if (parsed_command_line().HasSwitch(
485 switches::kDisableConnectBackupJobs)) { 541 switches::kDisableConnectBackupJobs)) {
486 net::internal::ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled( 542 net::internal::ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 660
605 // Note: make sure to call ConnectionFieldTrial() before 661 // Note: make sure to call ConnectionFieldTrial() before
606 // ProxyConnectionsFieldTrial(). 662 // ProxyConnectionsFieldTrial().
607 ConnectionFieldTrial(); 663 ConnectionFieldTrial();
608 SocketTimeoutFieldTrial(); 664 SocketTimeoutFieldTrial();
609 ProxyConnectionsFieldTrial(); 665 ProxyConnectionsFieldTrial();
610 prerender::ConfigurePrefetchAndPrerender(parsed_command_line()); 666 prerender::ConfigurePrefetchAndPrerender(parsed_command_line());
611 SpdyFieldTrial(); 667 SpdyFieldTrial();
612 ConnectBackupJobsFieldTrial(); 668 ConnectBackupJobsFieldTrial();
613 RevocationCheckingDisabledFieldTrial(); 669 RevocationCheckingDisabledFieldTrial();
670 WarmConnectionFieldTrial();
614 } 671 }
615 672
616 // ----------------------------------------------------------------------------- 673 // -----------------------------------------------------------------------------
617 // TODO(viettrungluu): move more/rest of BrowserMain() into above structure 674 // TODO(viettrungluu): move more/rest of BrowserMain() into above structure
618 675
619 namespace { 676 namespace {
620 677
621 // This function provides some ways to test crash and assertion handling 678 // This function provides some ways to test crash and assertion handling
622 // behavior of the program. 679 // behavior of the program.
623 void HandleTestParameters(const CommandLine& command_line) { 680 void HandleTestParameters(const CommandLine& command_line) {
(...skipping 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after
2003 #if defined(OS_CHROMEOS) 2060 #if defined(OS_CHROMEOS)
2004 // To be precise, logout (browser shutdown) is not yet done, but the 2061 // To be precise, logout (browser shutdown) is not yet done, but the
2005 // remaining work is negligible, hence we say LogoutDone here. 2062 // remaining work is negligible, hence we say LogoutDone here.
2006 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 2063 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
2007 false); 2064 false);
2008 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 2065 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
2009 #endif 2066 #endif
2010 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 2067 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
2011 return result_code; 2068 return result_code;
2012 } 2069 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.h ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698