Snap for 5354487 from 24934da6496595986eb3f763c54427b25ecd1892 to qt-release (8a35aec6) · Commits · e / os / platform_frameworks_native

libs/cputimeinstate/cputimeinstate.cpp

+11 −29

Original line number	Diff line number	Diff line
		@@ -45,14 +45,14 @@ using android::base::unique_fd;
		namespace android {
		namespace bpf {

		typedef struct {
		struct time_key_t {
		uint32_t uid;
		uint32_t freq;
		} time_key_t;
		};

		typedef struct {
		struct val_t {
		uint64_t ar[100];
		} val_t;
		};

		static std::mutex gInitializedMutex;
		static bool gInitialized = false;
		@@ -65,19 +65,13 @@ static unique_fd gMapFd;
		static bool readNumbersFromFile(const std::string &path, std::vector<uint32_t> *out) {
		std::string data;

		if (!android::base::ReadFileToString(path, &data)) {
		ALOGD("Failed to read file %s", path.c_str());
		return false;
		}
		if (!android::base::ReadFileToString(path, &data)) return false;

		auto strings = android::base::Split(data, " \n");
		for (const auto &s : strings) {
		if (s.empty()) continue;
		uint32_t n;
		if (!android::base::ParseUint(s, &n)) {
		ALOGD("Failed to parse file %s", path.c_str());
		return false;
		}
		if (!android::base::ParseUint(s, &n)) return false;
		out->emplace_back(n);
		}
		return true;
		@@ -141,16 +135,8 @@ static bool attachTracepointProgram(const std::string &eventType, const std::str
		std::string path = StringPrintf(BPF_FS_PATH "prog_time_in_state_tracepoint_%s_%s",
		eventType.c_str(), eventName.c_str());
		int prog_fd = bpf_obj_get(path.c_str());
		if (prog_fd < 0) {
		ALOGD("bpf_obj_get() failed for program %s", path.c_str());
		return false;
		}
		if (bpf_attach_tracepoint(prog_fd, eventType.c_str(), eventName.c_str()) < 0) {
		ALOGD("Failed to attach bpf program to tracepoint %s/%s", eventType.c_str(),
		eventName.c_str());
		return false;
		}
		return true;
		if (prog_fd < 0) return false;
		return bpf_attach_tracepoint(prog_fd, eventType.c_str(), eventName.c_str()) >= 0;
		}

		// Start tracking and aggregating data to be reported by getUidCpuFreqTimes and getUidsCpuFreqTimes.
		@@ -224,20 +210,16 @@ bool getUidsCpuFreqTimes(
		auto fn = [freqTimeMap, &policyFreqIdxs](const time_key_t &key, const val_t &val,
		const BpfMap<time_key_t, val_t> &) {
		if (freqTimeMap->find(key.uid) == freqTimeMap->end()) {
		std::vector<std::vector<uint64_t>> v;
		(*freqTimeMap)[key.uid].resize(gNPolicies);
		for (uint32_t i = 0; i < gNPolicies; ++i) {
		std::vector<uint64_t> v2(gPolicyFreqs[i].size(), 0);
		v.emplace_back(v2);
		(*freqTimeMap)[key.uid][i].resize(gPolicyFreqs[i].size(), 0);
		}
		(*freqTimeMap)[key.uid] = v;
		}

		for (size_t policy = 0; policy < gNPolicies; ++policy) {
		for (const auto &cpu : gPolicyCpus[policy]) {
		uint32_t cpuTime = val.ar[cpu];
		if (cpuTime == 0) continue;
		auto freqIdx = policyFreqIdxs[policy][key.freq];
		(*freqTimeMap)[key.uid][policy][freqIdx] += cpuTime;
		(*freqTimeMap)[key.uid][policy][freqIdx] += val.ar[cpu];
		}
		}
		return android::netdutils::status::ok;

libs/cputimeinstate/cputimeinstate.h

+2 −0

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

		#pragma once

		#include <unordered_map>
		#include <vector>

libs/gui/LayerState.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ status_t layer_state_t::write(Parcel& output) const

		output.writeFloat(bgColorAlpha);
		output.writeUint32(static_cast<uint32_t>(bgColorDataspace));
		output.writeBool(colorSpaceAgnostic);

		return NO_ERROR;
		}
		@@ -177,6 +178,7 @@ status_t layer_state_t::read(const Parcel& input)

		bgColorAlpha = input.readFloat();
		bgColorDataspace = static_cast<ui::Dataspace>(input.readUint32());
		colorSpaceAgnostic = input.readBool();

		return NO_ERROR;
		}

libs/gui/SurfaceComposerClient.cpp

+14 −0

Original line number	Diff line number	Diff line
		@@ -989,6 +989,20 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setDesir
		return *this;
		}

		SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setColorSpaceAgnostic(
		const sp<SurfaceControl>& sc, const bool agnostic) {
		layer_state_t* s = getLayerState(sc);
		if (!s) {
		mStatus = BAD_INDEX;
		return *this;
		}
		s->what \|= layer_state_t::eColorSpaceAgnosticChanged;
		s->colorSpaceAgnostic = agnostic;

		registerSurfaceControlForCallback(sc);
		return *this;
		}

		SurfaceComposerClient::Transaction&
		SurfaceComposerClient::Transaction::addTransactionCompletedCallback(
		TransactionCompletedCallbackTakesContext callback, void* callbackContext) {

libs/gui/include/gui/LayerState.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ struct layer_state_t {
		eCachedBufferChanged = 0x2'00000000,
		eBackgroundColorChanged = 0x4'00000000,
		eMetadataChanged = 0x8'00000000,
		eColorSpaceAgnosticChanged = 0x10'00000000,
		};

		layer_state_t()
		@@ -115,7 +116,8 @@ struct layer_state_t {
		api(-1),
		colorTransform(mat4()),
		bgColorAlpha(0),
		bgColorDataspace(ui::Dataspace::UNKNOWN) {
		bgColorDataspace(ui::Dataspace::UNKNOWN),
		colorSpaceAgnostic(false) {
		matrix.dsdx = matrix.dtdy = 1.0f;
		matrix.dsdy = matrix.dtdx = 0.0f;
		hdrMetadata.validTypes = 0;
		@@ -192,6 +194,10 @@ struct layer_state_t {
		// the background color layer
		float bgColorAlpha;
		ui::Dataspace bgColorDataspace;

		// A color space agnostic layer means the color of this layer can be
		// interpreted in any color space.
		bool colorSpaceAgnostic;
		};

		struct ComposerState {