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

Side by Side Diff: content/common/resource_dispatcher.cc

Issue 9447084: Refactor Pickle Read methods to use higher performance PickleIterator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile (racing with incoming CLs) Created 8 years, 9 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 | « content/common/pepper_file_messages.cc ('k') | content/common/ssl_status_serialization.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/common/resource_dispatcher.h" 7 #include "content/common/resource_dispatcher.h"
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 286
287 // ResourceDispatcher implementation ------------------------------------------ 287 // ResourceDispatcher implementation ------------------------------------------
288 288
289 bool ResourceDispatcher::OnMessageReceived(const IPC::Message& message) { 289 bool ResourceDispatcher::OnMessageReceived(const IPC::Message& message) {
290 if (!IsResourceDispatcherMessage(message)) { 290 if (!IsResourceDispatcherMessage(message)) {
291 return false; 291 return false;
292 } 292 }
293 293
294 int request_id; 294 int request_id;
295 295
296 void* iter = NULL; 296 PickleIterator iter(message);
297 if (!message.ReadInt(&iter, &request_id)) { 297 if (!message.ReadInt(&iter, &request_id)) {
298 NOTREACHED() << "malformed resource message"; 298 NOTREACHED() << "malformed resource message";
299 return true; 299 return true;
300 } 300 }
301 301
302 PendingRequestInfo* request_info = GetPendingRequestInfo(request_id); 302 PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
303 if (!request_info) { 303 if (!request_info) {
304 // Release resources in the message if it is a data message. 304 // Release resources in the message if it is a data message.
305 ReleaseResourcesInDataMessage(message); 305 ReleaseResourcesInDataMessage(message);
306 return true; 306 return true;
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 default: 670 default:
671 break; 671 break;
672 } 672 }
673 673
674 return false; 674 return false;
675 } 675 }
676 676
677 // static 677 // static
678 void ResourceDispatcher::ReleaseResourcesInDataMessage( 678 void ResourceDispatcher::ReleaseResourcesInDataMessage(
679 const IPC::Message& message) { 679 const IPC::Message& message) {
680 void* iter = NULL; 680 PickleIterator iter(message);
681 int request_id; 681 int request_id;
682 if (!message.ReadInt(&iter, &request_id)) { 682 if (!message.ReadInt(&iter, &request_id)) {
683 NOTREACHED() << "malformed resource message"; 683 NOTREACHED() << "malformed resource message";
684 return; 684 return;
685 } 685 }
686 686
687 // If the message contains a shared memory handle, we should close the 687 // If the message contains a shared memory handle, we should close the
688 // handle or there will be a memory leak. 688 // handle or there will be a memory leak.
689 if (message.type() == ResourceMsg_DataReceived::ID) { 689 if (message.type() == ResourceMsg_DataReceived::ID) {
690 base::SharedMemoryHandle shm_handle; 690 base::SharedMemoryHandle shm_handle;
691 if (IPC::ParamTraits<base::SharedMemoryHandle>::Read(&message, 691 if (IPC::ParamTraits<base::SharedMemoryHandle>::Read(&message,
692 &iter, 692 &iter,
693 &shm_handle)) { 693 &shm_handle)) {
694 base::SharedMemory::CloseHandle(shm_handle); 694 base::SharedMemory::CloseHandle(shm_handle);
695 } 695 }
696 } 696 }
697 } 697 }
698 698
699 // static 699 // static
700 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) { 700 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
701 while (!queue->empty()) { 701 while (!queue->empty()) {
702 IPC::Message* message = queue->front(); 702 IPC::Message* message = queue->front();
703 ReleaseResourcesInDataMessage(*message); 703 ReleaseResourcesInDataMessage(*message);
704 queue->pop_front(); 704 queue->pop_front();
705 delete message; 705 delete message;
706 } 706 }
707 } 707 }
OLDNEW
« no previous file with comments | « content/common/pepper_file_messages.cc ('k') | content/common/ssl_status_serialization.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698