summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-10-22 00:49:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-22 00:49:15 +0000
commita0c1be26177d554ef9c5d61b8a564bb03d402a04 (patch)
treedb222a4a3bdfd3318a0bdfee52471301fea51109 /include
parent5957172a7edb83d05423d5abae0091628f0c557c (diff)
parente2f499fb734bc30a1e1c947112caa0727349b6ed (diff)
downloadframeworks_native-a0c1be26177d554ef9c5d61b8a564bb03d402a04.zip
frameworks_native-a0c1be26177d554ef9c5d61b8a564bb03d402a04.tar.gz
frameworks_native-a0c1be26177d554ef9c5d61b8a564bb03d402a04.tar.bz2
Track ashmem memory usage in Parcel
am: e2f499fb73 * commit 'e2f499fb734bc30a1e1c947112caa0727349b6ed': Track ashmem memory usage in Parcel
Diffstat (limited to 'include')
-rw-r--r--include/binder/Parcel.h6
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);