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

Unified Diff: native_client_sdk/src/tests/nacl_io_test/fake_resource_manager.cc

Issue 77423002: [NaCl SDK] Add URLLoader fake pepper interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: feedback Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: native_client_sdk/src/tests/nacl_io_test/fake_resource_manager.cc
diff --git a/native_client_sdk/src/tests/nacl_io_test/fake_resource_manager.cc b/native_client_sdk/src/tests/nacl_io_test/fake_resource_manager.cc
index b87248fcc6a101a10fa4427b351b3ae480d83575..ccb2993f82e2cb1b0a28593e3297243db5a70a20 100644
--- a/native_client_sdk/src/tests/nacl_io_test/fake_resource_manager.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/fake_resource_manager.cc
@@ -57,7 +57,7 @@ void FakeResourceManager::AddRef(PP_Resource handle) {
}
void FakeResourceManager::Release(PP_Resource handle) {
- AUTO_LOCK(lock_);
+ sdk_util::AutoLock lock(lock_);
ResourceMap::iterator iter = resource_map_.find(handle);
ASSERT_NE(resource_map_.end(), iter) << "Releasing unknown resource "
<< handle;
@@ -70,6 +70,18 @@ void FakeResourceManager::Release(PP_Resource handle) {
<< resource_tracker->file() << ":"
<< resource_tracker->line();
resource_tracker->Release();
+ // It's OK to access the tracker when its refcount is zero; it doesn't
+ // actually destroy the object until the manager is destroyed.
+ if (resource_tracker->ref_count() == 0) {
+ // Remove the resource from this tracker.
+ FakeResource* resource = resource_tracker->Pass();
+ // Release the lock before we call Destroy; resources can call
+ // FakeResourceManager::Release(), which will deadlock if we are already
+ // holding the lock.
+ lock.Unlock();
+
+ resource->Destroy();
+ }
}
FakeResourceTracker* FakeResourceManager::Get(PP_Resource handle) {

Powered by Google App Engine
This is Rietveld 408576698