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

Side by Side Diff: net/url_request/url_request_file_job.cc

Issue 3872002: Thread IO safety: file_util annotated, IO thread blocked from doing IO (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 10 years, 2 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 | « net/socket/ssl_client_socket_nss.cc ('k') | no next file » | 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) 2006-2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2010 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 // For loading files, we make use of overlapped i/o to ensure that reading from 5 // For loading files, we make use of overlapped i/o to ensure that reading from
6 // the filesystem (e.g., a network filesystem) does not block the calling 6 // the filesystem (e.g., a network filesystem) does not block the calling
7 // thread. An alternative approach would be to use a background thread or pool 7 // thread. An alternative approach would be to use a background thread or pool
8 // of threads, but it seems better to leverage the operating system's ability 8 // of threads, but it seems better to leverage the operating system's ability
9 // to do background file reads for us. 9 // to do background file reads for us.
10 // 10 //
11 // Since overlapped reads require a 'static' buffer for the duration of the 11 // Since overlapped reads require a 'static' buffer for the duration of the
12 // asynchronous read, the URLRequestFileJob keeps a buffer as a member var. In 12 // asynchronous read, the URLRequestFileJob keeps a buffer as a member var. In
13 // URLRequestFileJob::Read, data is simply copied from the object's buffer into 13 // URLRequestFileJob::Read, data is simply copied from the object's buffer into
14 // the given buffer. If there is no data to copy, the URLRequestFileJob 14 // the given buffer. If there is no data to copy, the URLRequestFileJob
15 // attempts to read more from the file to fill its buffer. If reading from the 15 // attempts to read more from the file to fill its buffer. If reading from the
16 // file does not complete synchronously, then the URLRequestFileJob waits for a 16 // file does not complete synchronously, then the URLRequestFileJob waits for a
17 // signal from the OS that the overlapped read has completed. It does so by 17 // signal from the OS that the overlapped read has completed. It does so by
18 // leveraging the MessageLoop::WatchObject API. 18 // leveraging the MessageLoop::WatchObject API.
19 19
20 #include "net/url_request/url_request_file_job.h" 20 #include "net/url_request/url_request_file_job.h"
21 21
22 #include "base/compiler_specific.h" 22 #include "base/compiler_specific.h"
23 #include "base/message_loop.h" 23 #include "base/message_loop.h"
24 #include "base/platform_file.h" 24 #include "base/platform_file.h"
25 #include "base/string_util.h" 25 #include "base/string_util.h"
26 #include "base/thread_restrictions.h"
26 #include "build/build_config.h" 27 #include "build/build_config.h"
27 #include "googleurl/src/gurl.h" 28 #include "googleurl/src/gurl.h"
28 #include "net/base/io_buffer.h" 29 #include "net/base/io_buffer.h"
29 #include "net/base/load_flags.h" 30 #include "net/base/load_flags.h"
30 #include "net/base/mime_util.h" 31 #include "net/base/mime_util.h"
31 #include "net/base/net_errors.h" 32 #include "net/base/net_errors.h"
32 #include "net/base/net_util.h" 33 #include "net/base/net_util.h"
33 #include "net/http/http_util.h" 34 #include "net/http/http_util.h"
34 #include "net/url_request/url_request.h" 35 #include "net/url_request/url_request.h"
35 #include "net/url_request/url_request_file_dir_job.h" 36 #include "net/url_request/url_request_file_dir_job.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 #if defined(OS_WIN) 122 #if defined(OS_WIN)
122 // Resolve UNC paths on a background thread. 123 // Resolve UNC paths on a background thread.
123 if (!file_path_.value().compare(0, 2, L"\\\\")) { 124 if (!file_path_.value().compare(0, 2, L"\\\\")) {
124 DCHECK(!async_resolver_); 125 DCHECK(!async_resolver_);
125 async_resolver_ = new AsyncResolver(this); 126 async_resolver_ = new AsyncResolver(this);
126 WorkerPool::PostTask(FROM_HERE, NewRunnableMethod( 127 WorkerPool::PostTask(FROM_HERE, NewRunnableMethod(
127 async_resolver_.get(), &AsyncResolver::Resolve, file_path_), true); 128 async_resolver_.get(), &AsyncResolver::Resolve, file_path_), true);
128 return; 129 return;
129 } 130 }
130 #endif 131 #endif
132
133 // URL requests should not block on the disk!
134 // http://code.google.com/p/chromium/issues/detail?id=59849
135 bool exists;
131 base::PlatformFileInfo file_info; 136 base::PlatformFileInfo file_info;
132 bool exists = file_util::GetFileInfo(file_path_, &file_info); 137 {
138 base::ThreadRestrictions::ScopedAllowIO allow_io;
139 exists = file_util::GetFileInfo(file_path_, &file_info);
140 }
133 141
134 // Continue asynchronously. 142 // Continue asynchronously.
135 MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod( 143 MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
136 this, &URLRequestFileJob::DidResolve, exists, file_info)); 144 this, &URLRequestFileJob::DidResolve, exists, file_info));
137 } 145 }
138 146
139 void URLRequestFileJob::Kill() { 147 void URLRequestFileJob::Kill() {
140 stream_.Close(); 148 stream_.Close();
141 149
142 #if defined(OS_WIN) 150 #if defined(OS_WIN)
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 if (!resolved) 331 if (!resolved)
324 return false; 332 return false;
325 333
326 *location = net::FilePathToFileURL(new_path); 334 *location = net::FilePathToFileURL(new_path);
327 *http_status_code = 301; 335 *http_status_code = 301;
328 return true; 336 return true;
329 #else 337 #else
330 return false; 338 return false;
331 #endif 339 #endif
332 } 340 }
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698