Merge "Repeat proxy limit callbacks if we keep going above the limit." into sc-qpr1-dev (41b55287) · Commits · e / os / android_frameworks_native-old

libs/binder/BpBinder.cpp

+16 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ namespace android {

		Mutex BpBinder::sTrackingLock;
		std::unordered_map<int32_t, uint32_t> BpBinder::sTrackingMap;
		std::unordered_map<int32_t, uint32_t> sLastLimitCallbackMap;
		int BpBinder::sNumTrackedUids = 0;
		std::atomic_bool BpBinder::sCountByUidEnabled(false);
		binder_proxy_limit_callback BpBinder::sLimitCallback;
		@@ -117,12 +118,24 @@ sp<BpBinder> BpBinder::create(int32_t handle) {
		if (sBinderProxyThrottleCreate) {
		return nullptr;
		}
		trackedValue = trackedValue & COUNTING_VALUE_MASK;
		uint32_t lastLimitCallbackAt = sLastLimitCallbackMap[trackedUid];

		if (trackedValue > lastLimitCallbackAt &&
		(trackedValue - lastLimitCallbackAt > sBinderProxyCountHighWatermark)) {
		ALOGE("Still too many binder proxy objects sent to uid %d from uid %d (%d proxies "
		"held)",
		getuid(), trackedUid, trackedValue);
		if (sLimitCallback) sLimitCallback(trackedUid);
		sLastLimitCallbackMap[trackedUid] = trackedValue;
		}
		} else {
		if ((trackedValue & COUNTING_VALUE_MASK) >= sBinderProxyCountHighWatermark) {
		ALOGE("Too many binder proxy objects sent to uid %d from uid %d (%d proxies held)",
		getuid(), trackedUid, trackedValue);
		sTrackingMap[trackedUid] \|= LIMIT_REACHED_MASK;
		if (sLimitCallback) sLimitCallback(trackedUid);
		sLastLimitCallbackMap[trackedUid] = trackedValue & COUNTING_VALUE_MASK;
		if (sBinderProxyThrottleCreate) {
		ALOGI("Throttling binder proxy creates from uid %d in uid %d until binder proxy"
		" count drops below %d",
		@@ -452,8 +465,9 @@ BpBinder::~BpBinder()
		((trackedValue & COUNTING_VALUE_MASK) <= sBinderProxyCountLowWatermark)
		)) {
		ALOGI("Limit reached bit reset for uid %d (fewer than %d proxies from uid %d held)",
		getuid(), mTrackedUid, sBinderProxyCountLowWatermark);
		getuid(), sBinderProxyCountLowWatermark, mTrackedUid);
		sTrackingMap[mTrackedUid] &= ~LIMIT_REACHED_MASK;
		sLastLimitCallbackMap.erase(mTrackedUid);
		}
		if (--sTrackingMap[mTrackedUid] == 0) {
		sTrackingMap.erase(mTrackedUid);