diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-10 20:44:47 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-10 20:44:47 +0000 |
| commit | 8e69495160c6548aca20903b10b5c44f76958c21 (patch) | |
| tree | 261754db774bbe6328f32005b518141e924ec75d /net/proxy/proxy_service.cc | |
| parent | d6dc5993ec32e9e79b539a1784daeddef54e0968 (diff) | |
| download | chromium_src-8e69495160c6548aca20903b10b5c44f76958c21.zip chromium_src-8e69495160c6548aca20903b10b5c44f76958c21.tar.gz chromium_src-8e69495160c6548aca20903b10b5c44f76958c21.tar.bz2 | |
Change the default number of proxy resolver threads used for evaluating PAC scripts from 1 to 4.
Also adds a command line flag to override the default: --num-pac-threads=X
BUG=11079
Review URL: http://codereview.chromium.org/2893005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
| -rw-r--r-- | net/proxy/proxy_service.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index 060745b..e6dc15e 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -39,6 +39,7 @@ using base::TimeTicks; namespace net { static const size_t kMaxNumNetLogEntries = 100; +static const size_t kDefaultNumPacThreads = 4; // Config getter that fails every time. class ProxyConfigServiceNull : public ProxyConfigService { @@ -264,9 +265,12 @@ ProxyService::ProxyService(ProxyConfigService* config_service, ProxyService* ProxyService::Create( ProxyConfigService* proxy_config_service, bool use_v8_resolver, + size_t num_pac_threads, URLRequestContext* url_request_context, NetLog* net_log, MessageLoop* io_loop) { + if (num_pac_threads == 0) + num_pac_threads = kDefaultNumPacThreads; ProxyResolverFactory* sync_resolver_factory; if (use_v8_resolver) { @@ -278,10 +282,8 @@ ProxyService* ProxyService::Create( sync_resolver_factory = new ProxyResolverFactoryForNonV8(); } - const size_t kMaxNumResolverThreads = 1u; ProxyResolver* proxy_resolver = - new MultiThreadedProxyResolver(sync_resolver_factory, - kMaxNumResolverThreads); + new MultiThreadedProxyResolver(sync_resolver_factory, num_pac_threads); ProxyService* proxy_service = new ProxyService(proxy_config_service, proxy_resolver, net_log); @@ -298,7 +300,9 @@ ProxyService* ProxyService::Create( // static ProxyService* ProxyService::CreateFixed(const ProxyConfig& pc) { - return Create(new ProxyConfigServiceFixed(pc), false, NULL, NULL, NULL); + // TODO(eroman): This isn't quite right, won't work if |pc| specifies + // a PAC script. + return Create(new ProxyConfigServiceFixed(pc), false, 0, NULL, NULL, NULL); } // static |