Merge "Update Guardrail." into pi-dev (55b486eb) · Commits · e / os / android_frameworks_base

cmds/statsd/src/StatsLogProcessor.cpp

+0 −6

Original line number	Diff line number	Diff line
		@@ -199,11 +199,6 @@ void StatsLogProcessor::OnConfigUpdated(const ConfigKey& key, const StatsdConfig
		sp<MetricsManager> newMetricsManager =
		new MetricsManager(key, config, mTimeBaseSec, mUidMap,
		mAnomalyAlarmMonitor, mPeriodicAlarmMonitor);
		auto it = mMetricsManagers.find(key);
		if (it == mMetricsManagers.end() && mMetricsManagers.size() > StatsdStats::kMaxConfigCount) {
		ALOGE("Can't accept more configs!");
		return;
		}

		if (newMetricsManager->isConfigValid()) {
		mUidMap->OnConfigUpdated(key);
		@@ -213,7 +208,6 @@ void StatsLogProcessor::OnConfigUpdated(const ConfigKey& key, const StatsdConfig
		mUidMap->addListener(newMetricsManager.get());
		}
		mMetricsManagers[key] = newMetricsManager;
		// Why doesn't this work? mMetricsManagers.insert({key, std::move(newMetricsManager)});
		VLOG("StatsdConfig valid");
		} else {
		// If there is any error in the config, don't use it.

cmds/statsd/src/config/ConfigManager.cpp

+58 −37

Original line number	Diff line number	Diff line
		@@ -14,9 +14,13 @@
		* limitations under the License.
		*/

		#define DEBUG false // STOPSHIP if true
		#include "Log.h"

		#include "config/ConfigManager.h"
		#include "storage/StorageManager.h"

		#include "guardrail/StatsdStats.h"
		#include "stats_util.h"

		#include <android-base/file.h>
		@@ -68,24 +72,37 @@ void ConfigManager::UpdateConfig(const ConfigKey& key, const StatsdConfig& confi
		{
		lock_guard <mutex> lock(mMutex);

		auto it = mConfigs.find(key);

		const int numBytes = config.ByteSize();
		vector<uint8_t> buffer(numBytes);
		config.SerializeToArray(&buffer[0], numBytes);

		const bool isDuplicate =
		it != mConfigs.end() &&
		StorageManager::hasIdenticalConfig(key, buffer);
		auto uidIt = mConfigs.find(key.GetUid());
		// GuardRail: Limit the number of configs per uid.
		if (uidIt != mConfigs.end()) {
		auto it = uidIt->second.find(key);
		if (it == uidIt->second.end() &&
		uidIt->second.size() >= StatsdStats::kMaxConfigCountPerUid) {
		ALOGE("ConfigManager: uid %d has exceeded the config count limit", key.GetUid());
		return;
		}
		}

		// Check if it's a duplicate config.
		if (uidIt != mConfigs.end() && uidIt->second.find(key) != uidIt->second.end() &&
		StorageManager::hasIdenticalConfig(key, buffer)) {
		// This is a duplicate config.
		ALOGI("ConfigManager This is a duplicate config %s", key.ToString().c_str());
		// Update saved file on disk. We still update timestamp of file when
		// there exists a duplicate configuration to avoid garbage collection.
		update_saved_configs_locked(key, buffer, numBytes);
		return;
		}

		if (isDuplicate) return;
		// Update saved file on disk.
		update_saved_configs_locked(key, buffer, numBytes);

		// Add to set
		mConfigs.insert(key);
		// Add to set.
		mConfigs[key.GetUid()].insert(key);

		for (sp<ConfigListener> listener : mListeners) {
		broadcastList.push_back(listener);
		@@ -113,11 +130,10 @@ void ConfigManager::RemoveConfig(const ConfigKey& key) {
		{
		lock_guard <mutex> lock(mMutex);

		auto it = mConfigs.find(key);
		if (it != mConfigs.end()) {
		auto uidIt = mConfigs.find(key.GetUid());
		if (uidIt != mConfigs.end() && uidIt->second.find(key) != uidIt->second.end()) {
		// Remove from map
		mConfigs.erase(it);

		uidIt->second.erase(key);
		for (sp<ConfigListener> listener : mListeners) {
		broadcastList.push_back(listener);
		}
		@@ -150,18 +166,20 @@ void ConfigManager::RemoveConfigs(int uid) {
		{
		lock_guard <mutex> lock(mMutex);

		for (auto it = mConfigs.begin(); it != mConfigs.end();) {
		auto uidIt = mConfigs.find(uid);
		if (uidIt == mConfigs.end()) {
		return;
		}

		for (auto it = uidIt->second.begin(); it != uidIt->second.end(); ++it) {
		// Remove from map
		if (it->GetUid() == uid) {
		remove_saved_configs(*it);
		removed.push_back(*it);
		mConfigReceivers.erase(*it);
		it = mConfigs.erase(it);
		} else {
		it++;
		}
		}

		mConfigs.erase(uidIt);

		for (sp<ConfigListener> listener : mListeners) {
		broadcastList.push_back(listener);
		}
		@@ -182,17 +200,16 @@ void ConfigManager::RemoveAllConfigs() {
		{
		lock_guard <mutex> lock(mMutex);


		for (auto it = mConfigs.begin(); it != mConfigs.end();) {
		for (auto uidIt = mConfigs.begin(); uidIt != mConfigs.end();) {
		for (auto it = uidIt->second.begin(); it != uidIt->second.end();) {
		// Remove from map
		removed.push_back(*it);
		auto receiverIt = mConfigReceivers.find(*it);
		if (receiverIt != mConfigReceivers.end()) {
		mConfigReceivers.erase(*it);
		it = uidIt->second.erase(it);
		}
		it = mConfigs.erase(it);
		uidIt = mConfigs.erase(uidIt);
		}

		mConfigReceivers.clear();
		for (sp<ConfigListener> listener : mListeners) {
		broadcastList.push_back(listener);
		}
		@@ -211,9 +228,11 @@ vector<ConfigKey> ConfigManager::GetAllConfigKeys() const {
		lock_guard<mutex> lock(mMutex);

		vector<ConfigKey> ret;
		for (auto it = mConfigs.cbegin(); it != mConfigs.cend(); ++it) {
		for (auto uidIt = mConfigs.cbegin(); uidIt != mConfigs.cend(); ++uidIt) {
		for (auto it = uidIt->second.cbegin(); it != uidIt->second.cend(); ++it) {
		ret.push_back(*it);
		}
		}
		return ret;
		}

		@@ -231,16 +250,18 @@ const sp<android::IBinder> ConfigManager::GetConfigReceiver(const ConfigKey& key
		void ConfigManager::Dump(FILE* out) {
		lock_guard<mutex> lock(mMutex);

		fprintf(out, "CONFIGURATIONS (%d)\n", (int)mConfigs.size());
		fprintf(out, "CONFIGURATIONS\n");
		fprintf(out, " uid name\n");
		for (const auto& key : mConfigs) {
		fprintf(out, " %6d %lld\n", key.GetUid(), (long long)key.GetId());
		auto receiverIt = mConfigReceivers.find(key);
		for (auto uidIt = mConfigs.cbegin(); uidIt != mConfigs.cend(); ++uidIt) {
		for (auto it = uidIt->second.cbegin(); it != uidIt->second.cend(); ++it) {
		fprintf(out, " %6d %lld\n", it->GetUid(), (long long)it->GetId());
		auto receiverIt = mConfigReceivers.find(*it);
		if (receiverIt != mConfigReceivers.end()) {
		fprintf(out, " -> received by PendingIntent as binder\n");
		}
		}
		}
		}

		void ConfigManager::update_saved_configs_locked(const ConfigKey& key,
		const vector<uint8_t>& buffer,

cmds/statsd/src/config/ConfigManager.h

+2 −5

Original line number	Diff line number	Diff line
		@@ -36,9 +36,6 @@ StatsdConfig build_fake_config();

		/**
		* Keeps track of which configurations have been set from various sources.
		*
		* TODO: Store the configs persistently too.
		* TODO: Dump method for debugging.
		*/
		class ConfigManager : public virtual android::RefBase {
		public:
		@@ -125,9 +122,9 @@ private:
		void remove_saved_configs(const ConfigKey& key);

		/**
		* Config keys that have been set.
		* Maps from uid to the config keys that have been set.
		*/
		std::set<ConfigKey> mConfigs;
		std::map<int, std::set<ConfigKey>> mConfigs;

		/**
		* Each config key can be subscribed by up to one receiver, specified as IBinder from

cmds/statsd/src/guardrail/StatsdStats.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -78,17 +78,17 @@ public:
		~StatsdStats(){};

		// TODO: set different limit if the device is low ram.
		const static int kDimensionKeySizeSoftLimit = 300;
		const static int kDimensionKeySizeHardLimit = 500;
		const static int kDimensionKeySizeSoftLimit = 500;
		const static int kDimensionKeySizeHardLimit = 800;

		// Per atom dimension key size limit
		static const std::map<int, std::pair<size_t, size_t>> kAtomDimensionKeySizeLimitMap;

		const static int kMaxConfigCount = 10;
		const static int kMaxConfigCountPerUid = 10;
		const static int kMaxAlertCountPerConfig = 100;
		const static int kMaxConditionCountPerConfig = 200;
		const static int kMaxMetricCountPerConfig = 300;
		const static int kMaxMatcherCountPerConfig = 500;
		const static int kMaxConditionCountPerConfig = 300;
		const static int kMaxMetricCountPerConfig = 1000;
		const static int kMaxMatcherCountPerConfig = 800;

		// The max number of old config stats we keep.
		const static int kMaxIceBoxSize = 20;