Don't share ResourceDispatcherHostImpl's timer for reporting upload progress.

content/browser/loader/resource_loader.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/loader/resource_loader.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 22 matching lines @@
 #include "net/ssl/client_cert_store.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request_status.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace content {
 namespace {
 
+// The interval for calls to ResourceLoader::ReportUploadProgress.
+const int kUploadProgressIntervalMsec = 100;
+
 void PopulateResourceResponse(ResourceRequestInfoImpl* info,
                               net::URLRequest* request,
                               ResourceResponse* response) {
   response->head.request_time = request->request_time();
   response->head.response_time = request->response_time();
   response->head.headers = request->response_headers();
   request->GetCharset(&response->head.charset);
   response->head.content_length = request->GetExpectedContentSize();
   request->GetMimeType(&response->head.mime_type);
   net::HttpResponseInfo response_info = request->response_info();
@@ skipping 27 matching lines @@
 }  // namespace
 
 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request,
                                scoped_ptr<ResourceHandler> handler,
                                ResourceLoaderDelegate* delegate)
     : deferred_stage_(DEFERRED_NONE),
       request_(request.Pass()),
       handler_(handler.Pass()),
       delegate_(delegate),
       last_upload_position_(0),
-      waiting_for_upload_progress_ack_(false),
       is_transferring_(false),
       weak_ptr_factory_(this) {
   request_->set_delegate(this);
   handler_->SetController(this);
 }
 
 ResourceLoader::~ResourceLoader() {
   if (login_delegate_.get())
     login_delegate_->OnRequestCancelled();
   ssl_client_auth_handler_.reset();
@@ skipping 31 matching lines @@
   ResourceRequestInfoImpl* info = GetRequestInfo();
   info->set_was_ignored_by_handler(true);
   CancelRequest(false);
 }
 
 void ResourceLoader::CancelWithError(int error_code) {
   CancelRequestInternal(error_code, false);
 }
 
 void ResourceLoader::ReportUploadProgress() {
-  if (waiting_for_upload_progress_ack_)
-    return;  // Send one progress event at a time.
-
   net::UploadProgress progress = request_->GetUploadProgress();
   if (!progress.size())
     return;  // Nothing to upload.

[mmenke, 2015/05/20 20:05:41]

BUG:  A request will return a size of 0 until it actually starts a URLRequestJob
(Which the NetworkDelegate can delay).  I think you're best off just always
running the timer, until OnResponseStarted.

[Andre, 2015/05/20 21:05:12]

Thanks. Changed to use a RepeatingTimer.

 
-  if (progress.position() == last_upload_position_)
-    return;  // No progress made since last time.
-
   const uint64 kHalfPercentIncrements = 200;
   const TimeDelta kOneSecond = TimeDelta::FromMilliseconds(1000);
 
   uint64 amt_since_last = progress.position() - last_upload_position_;
   TimeDelta time_since_last = TimeTicks::Now() - last_upload_ticks_;
 
   bool is_finished = (progress.size() == progress.position());
   bool enough_new_progress =
       (amt_since_last > (progress.size() / kHalfPercentIncrements));
   bool too_much_time_passed = time_since_last > kOneSecond;
 
   if (is_finished || enough_new_progress || too_much_time_passed) {
-    ResourceRequestInfoImpl* info = GetRequestInfo();
-    if (info->is_upload_progress_enabled()) {
-      handler_->OnUploadProgress(progress.position(), progress.size());
-      waiting_for_upload_progress_ack_ = true;
-    }
+    handler_->OnUploadProgress(progress.position(), progress.size());
     last_upload_ticks_ = TimeTicks::Now();
     last_upload_position_ = progress.position();

[mmenke, 2015/05/20 20:05:41]

BUG:  In the redirect case, we'll start uploading the file again, so will need
to start the timer once more.

[Andre, 2015/05/20 21:05:11]

Now using a RepeatingTimer until OnResponseStarted, which should happen after
redirect (I think?).

+  } else {
+    ScheduleReportUploadProgress();
   }
 }
 
 void ResourceLoader::MarkAsTransferring() {
   CHECK(IsResourceTypeFrame(GetRequestInfo()->GetResourceType()))
       << "Can only transfer for navigations";
   is_transferring_ = true;
 
   int child_id = GetRequestInfo()->GetChildID();
   AppCacheInterceptor::PrepareForCrossSiteTransfer(request(), child_id);
@@ skipping 29 matching lines @@
 
 ResourceRequestInfoImpl* ResourceLoader::GetRequestInfo() {
   return ResourceRequestInfoImpl::ForRequest(request_.get());
 }
 
 void ResourceLoader::ClearLoginDelegate() {
   login_delegate_ = NULL;
 }
 
 void ResourceLoader::OnUploadProgressACK() {
-  waiting_for_upload_progress_ack_ = false;
+  if (last_upload_position_ < request_->GetUploadProgress().size())
+    ScheduleReportUploadProgress();
 }
 
 void ResourceLoader::OnReceivedRedirect(net::URLRequest* unused,
                                         const net::RedirectInfo& redirect_info,
                                         bool* defer) {
   DCHECK_EQ(request_.get(), unused);
 
   VLOG(1) << "OnReceivedRedirect: " << request_->url().spec();
   DCHECK(request_->status().is_success());
 
@@ skipping 113 matching lines @@
                            request_->url(),
                            info->GetResourceType())) {
     Cancel();
     return;
   }
 
   if (!request_->status().is_success()) {
     ResponseCompleted();
     return;
   }
 

[mmenke, 2015/05/20 20:05:41]

Why did you remove the code here?

[Andre, 2015/05/20 21:05:12]

Because the way I was posting a delayed task in OnUploadProgressACK should
guarantee the final progress message being sent without needing this.
But now I've changed it to use a RepeatingTimer, so bringing this back.

-  // We want to send a final upload progress message prior to sending the
-  // response complete message even if we're waiting for an ack to to a
-  // previous upload progress message.
-  waiting_for_upload_progress_ack_ = false;
-  ReportUploadProgress();
-
   CompleteResponseStarted();
 
   if (is_deferred())
     return;
 
   if (request_->status().is_success())
     StartReading(false);  // Read the first chunk.
   else
     ResponseCompleted();
 }
@@ skipping 118 matching lines @@
 void ResourceLoader::StartRequestInternal() {
   DCHECK(!request_->is_pending());
 
   if (!request_->status().is_success()) {
     return;
   }
 
   request_->Start();
 
   delegate_->DidStartRequest(this);
+
+  if (GetRequestInfo()->is_upload_progress_enabled())
+    ScheduleReportUploadProgress();
 }
 
 void ResourceLoader::CancelRequestInternal(int error, bool from_renderer) {
   VLOG(1) << "CancelRequestInternal: " << request_->url().spec();
 
   ResourceRequestInfoImpl* info = GetRequestInfo();
 
   // WebKit will send us a cancel for downloads since it no longer handles
   // them.  In this case, ignore the cancel since we handle downloads in the
   // browser.
@@ skipping 210 matching lines @@
   } else {
     // This will result in our destruction.
     CallDidFinishLoading();
   }
 }
 
 void ResourceLoader::CallDidFinishLoading() {
   delegate_->DidFinishLoading(this);
 }
 
+void ResourceLoader::ScheduleReportUploadProgress() {
+  base::MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&ResourceLoader::ReportUploadProgress,
+                 weak_ptr_factory_.GetWeakPtr()),
+      base::TimeDelta::FromMilliseconds(kUploadProgressIntervalMsec));
+}
+
 void ResourceLoader::RecordHistograms() {
   ResourceRequestInfoImpl* info = GetRequestInfo();
 
   if (info->GetResourceType() == RESOURCE_TYPE_PREFETCH) {
     PrefetchStatus status = STATUS_UNDEFINED;
     TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time();
 
     switch (request_->status().status()) {
       case net::URLRequestStatus::SUCCESS:
         if (request_->was_cached()) {
@@ skipping 14 matching lines @@
       case net::URLRequestStatus::FAILED:
         status = STATUS_UNDEFINED;
         break;
     }
 
     UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX);
   }
 }
 
 }  // namespace content