diff options
author | Ian Pedowitz <ijpedowitz@google.com> | 2015-10-22 22:32:07 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 22:32:07 +0000 |
commit | 159a5c337250613c166ae45b2811861f70c733bd (patch) | |
tree | 1a26bcab4226d26c54ad2bad041522d8007707d2 | |
parent | a0c1be26177d554ef9c5d61b8a564bb03d402a04 (diff) | |
parent | 6880307e8e35a6c484942443fb4ddd6173126152 (diff) | |
download | frameworks_native-159a5c337250613c166ae45b2811861f70c733bd.zip frameworks_native-159a5c337250613c166ae45b2811861f70c733bd.tar.gz frameworks_native-159a5c337250613c166ae45b2811861f70c733bd.tar.bz2 |
Revert "Track ashmem memory usage in Parcel"
am: 6880307e8e
* commit '6880307e8e35a6c484942443fb4ddd6173126152':
Revert "Track ashmem memory usage in Parcel"
-rw-r--r-- | include/binder/Parcel.h | 6 | ||||
-rw-r--r-- | libs/binder/Parcel.cpp | 38 |
2 files changed, 12 insertions, 32 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h index 220a935..3ada1e9 100644 --- a/include/binder/Parcel.h +++ b/include/binder/Parcel.h @@ -342,11 +342,9 @@ public: private: size_t mBlobAshmemSize; - size_t mOpenAshmemSize; public: size_t getBlobAshmemSize() const; - size_t getOpenAshmemSize() const; }; // --------------------------------------------------------------------------- @@ -414,9 +412,9 @@ inline TextOutput& operator<<(TextOutput& to, const Parcel& parcel) // Generic acquire and release of objects. void acquire_object(const sp<ProcessState>& proc, - const flat_binder_object& obj, const void* who, size_t* outAshmemSize); + const flat_binder_object& obj, const void* who); void release_object(const sp<ProcessState>& proc, - const flat_binder_object& obj, const void* who, size_t* outAshmemSize); + const flat_binder_object& obj, const void* who); void flatten_binder(const sp<ProcessState>& proc, const sp<IBinder>& binder, flat_binder_object* out); diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 1c03585..7a4ddc4 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -96,7 +96,7 @@ enum { }; void acquire_object(const sp<ProcessState>& proc, - const flat_binder_object& obj, const void* who, size_t* outAshmemSize) + const flat_binder_object& obj, const void* who) { switch (obj.type) { case BINDER_TYPE_BINDER: @@ -123,13 +123,8 @@ void acquire_object(const sp<ProcessState>& proc, return; } case BINDER_TYPE_FD: { - if (obj.cookie != 0) { - // If we own an ashmem fd, keep track of how much memory it refers to. - int size = ashmem_get_size_region(obj.handle); - if (size > 0) { - *outAshmemSize += size; - } - } + // intentionally blank -- nothing to do to acquire this, but we do + // recognize it as a legitimate object type. return; } } @@ -138,7 +133,7 @@ void acquire_object(const sp<ProcessState>& proc, } void release_object(const sp<ProcessState>& proc, - const flat_binder_object& obj, const void* who, size_t* outAshmemSize) + const flat_binder_object& obj, const void* who) { switch (obj.type) { case BINDER_TYPE_BINDER: @@ -165,14 +160,7 @@ void release_object(const sp<ProcessState>& proc, return; } case BINDER_TYPE_FD: { - if (obj.cookie != 0) { - int size = ashmem_get_size_region(obj.handle); - if (size > 0) { - *outAshmemSize -= size; - } - - close(obj.handle); - } + if (obj.cookie != 0) close(obj.handle); return; } } @@ -516,7 +504,7 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len) flat_binder_object* flat = reinterpret_cast<flat_binder_object*>(mData + off); - acquire_object(proc, *flat, this, &mOpenAshmemSize); + acquire_object(proc, *flat, this); if (flat->type == BINDER_TYPE_FD) { // If this is a file descriptor, we need to dup it so the @@ -1038,7 +1026,7 @@ restart_write: // Need to write meta-data? if (nullMetaData || val.binder != 0) { mObjects[mObjectsSize] = mDataPos; - acquire_object(ProcessState::self(), val, this, &mOpenAshmemSize); + acquire_object(ProcessState::self(), val, this); mObjectsSize++; } @@ -1621,7 +1609,7 @@ void Parcel::releaseObjects() i--; const flat_binder_object* flat = reinterpret_cast<flat_binder_object*>(data+objects[i]); - release_object(proc, *flat, this, &mOpenAshmemSize); + release_object(proc, *flat, this); } } @@ -1635,7 +1623,7 @@ void Parcel::acquireObjects() i--; const flat_binder_object* flat = reinterpret_cast<flat_binder_object*>(data+objects[i]); - acquire_object(proc, *flat, this, &mOpenAshmemSize); + acquire_object(proc, *flat, this); } } @@ -1817,7 +1805,7 @@ status_t Parcel::continueWrite(size_t desired) // will need to rescan because we may have lopped off the only FDs mFdsKnown = false; } - release_object(proc, *flat, this, &mOpenAshmemSize); + release_object(proc, *flat, this); } binder_size_t* objects = (binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t)); @@ -1903,7 +1891,6 @@ void Parcel::initState() mAllowFds = true; mOwner = NULL; mBlobAshmemSize = 0; - mOpenAshmemSize = 0; } void Parcel::scanForFds() const @@ -1926,11 +1913,6 @@ size_t Parcel::getBlobAshmemSize() const return mBlobAshmemSize; } -size_t Parcel::getOpenAshmemSize() const -{ - return mOpenAshmemSize; -} - // --- Parcel::Blob --- Parcel::Blob::Blob() : |