diff options
| author | Adrian Roos <roosa@google.com> | 2015-10-22 16:12:53 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-10-22 17:47:27 -0700 |
| commit | cbf3726357966539c2a685f46e61c3fc8937f19e (patch) | |
| tree | 9ff9ab4b2003e8e5362a40b884ae1d36983007b7 /include | |
| parent | 6880307e8e35a6c484942443fb4ddd6173126152 (diff) | |
| download | frameworks_native-cbf3726357966539c2a685f46e61c3fc8937f19e.zip frameworks_native-cbf3726357966539c2a685f46e61c3fc8937f19e.tar.gz frameworks_native-cbf3726357966539c2a685f46e61c3fc8937f19e.tar.bz2 | |
Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit 6880307e8e35a6c484942443fb4ddd6173126152.
Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/Parcel.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h index 3ada1e9..220a935 100644 --- a/include/binder/Parcel.h +++ b/include/binder/Parcel.h @@ -342,9 +342,11 @@ public: private: size_t mBlobAshmemSize; + size_t mOpenAshmemSize; public: size_t getBlobAshmemSize() const; + size_t getOpenAshmemSize() const; }; // --------------------------------------------------------------------------- @@ -412,9 +414,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); + const flat_binder_object& obj, const void* who, size_t* outAshmemSize); void release_object(const sp<ProcessState>& proc, - const flat_binder_object& obj, const void* who); + const flat_binder_object& obj, const void* who, size_t* outAshmemSize); void flatten_binder(const sp<ProcessState>& proc, const sp<IBinder>& binder, flat_binder_object* out); |