Merge "Revert "libprocessgroup: Add support for SetUserProfiles"" (3a354cb7) · Commits · e / os / android_system_core

libprocessgroup/include/processgroup/processgroup.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ bool CgroupGetAttributePathForTask(const std::string& attr_name, int tid, std::s

		bool SetTaskProfiles(int tid, const std::vector<std::string>& profiles, bool use_fd_cache = false);
		bool SetProcessProfiles(uid_t uid, pid_t pid, const std::vector<std::string>& profiles);
		bool SetUserProfiles(uid_t uid, const std::vector<std::string>& profiles);

		#ifndef __ANDROID_VNDK__

libprocessgroup/processgroup.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -174,10 +174,6 @@ extern "C" bool android_set_process_profiles(uid_t uid, pid_t pid, size_t num_pr
		return SetProcessProfiles(uid, pid, profiles_);
		}

		bool SetUserProfiles(uid_t uid, const std::vector<std::string>& profiles) {
		return TaskProfiles::GetInstance().SetUserProfiles(uid, profiles, false);
		}

		static std::string ConvertUidToPath(const char* cgroup, uid_t uid) {
		return StringPrintf("%s/uid_%d", cgroup, uid);
		}

libprocessgroup/task_profiles.cpp

+0 −66

Original line number	Diff line number	Diff line
		@@ -139,19 +139,6 @@ bool ProfileAttribute::GetPathForTask(int tid, std::string* path) const {
		return true;
		}

		bool ProfileAttribute::GetPathForUID(uid_t uid, std::string* path) const
		{
		if (path == nullptr) {
		return true;
		}

		const std::string& file_name =
		controller()->version() == 2 && !file_v2_name_.empty() ? file_v2_name_ : file_name_;
		*path = StringPrintf("%s/uid_%d/%s", controller()->path(), uid, file_name.c_str());
		return true;
		}


		bool SetClampsAction::ExecuteForProcess(uid_t, pid_t) const {
		// TODO: add support when kernel supports util_clamp
		LOG(WARNING) << "SetClampsAction::ExecuteForProcess is not supported";
		@@ -238,31 +225,6 @@ bool SetAttributeAction::ExecuteForTask(int tid) const {
		return true;
		}

		bool SetAttributeAction::ExecuteForUID(uid_t uid) const
		{
		std::string path;

		if (!attribute_->GetPathForUID(uid, &path)) {
		LOG(ERROR) << "Failed to find cgroup for uid " << uid;
		return false;
		}

		if (!WriteStringToFile(value_, path)) {
		if (access(path.c_str(), F_OK) < 0) {
		if (optional_) {
		return true;
		} else {
		LOG(ERROR) << "No such cgroup attribute: " << path;
		return false;
		}
		}
		PLOG(ERROR) << "Failed to write '" << value_ << "' to " << path;
		return false;
		}
		return true;
		}


		SetCgroupAction::SetCgroupAction(const CgroupController& c, const std::string& p)
		: controller_(c), path_(p) {
		FdCacheHelper::Init(controller_.GetTasksFilePath(path_), fd_[ProfileAction::RCT_TASK]);
		@@ -590,16 +552,6 @@ bool TaskProfile::ExecuteForTask(int tid) const {
		return true;
		}

		bool TaskProfile::ExecuteForUID(uid_t uid) const {
		for (const auto& element : elements_) {
		if (!element->ExecuteForUID(uid)) {
		LOG(VERBOSE) << "Applying profile action " << element->Name() << " failed";
		return false;
		}
		}
		return true;
		}

		void TaskProfile::EnableResourceCaching(ProfileAction::ResourceCacheType cache_type) {
		if (res_cached_) {
		return;
		@@ -852,24 +804,6 @@ const IProfileAttribute* TaskProfiles::GetAttribute(const std::string& name) con
		return nullptr;
		}

		bool TaskProfiles::SetUserProfiles(uid_t uid, const std::vector<std::string>& profiles,
		bool use_fd_cache) {
		for (const auto& name : profiles) {
		TaskProfile* profile = GetProfile(name);
		if (profile != nullptr) {
		if (use_fd_cache) {
		profile->EnableResourceCaching(ProfileAction::RCT_PROCESS);
		}
		if (!profile->ExecuteForUID(uid)) {
		PLOG(WARNING) << "Failed to apply " << name << " process profile";
		}
		} else {
		PLOG(WARNING) << "Failed to find " << name << "process profile";
		}
		}
		return true;
		}

		bool TaskProfiles::SetProcessProfiles(uid_t uid, pid_t pid,
		const std::vector<std::string>& profiles, bool use_fd_cache) {
		bool success = true;

libprocessgroup/task_profiles.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ class IProfileAttribute {
		virtual const CgroupController* controller() const = 0;
		virtual const std::string& file_name() const = 0;
		virtual bool GetPathForTask(int tid, std::string* path) const = 0;
		virtual bool GetPathForUID(uid_t uid, std::string* path) const = 0;
		};

		class ProfileAttribute : public IProfileAttribute {
		@@ -51,7 +50,6 @@ class ProfileAttribute : public IProfileAttribute {
		void Reset(const CgroupController& controller, const std::string& file_name) override;

		bool GetPathForTask(int tid, std::string* path) const override;
		bool GetPathForUID(uid_t uid, std::string* path) const override;

		private:
		CgroupController controller_;
		@@ -71,7 +69,6 @@ class ProfileAction {
		// Default implementations will fail
		virtual bool ExecuteForProcess(uid_t, pid_t) const { return false; };
		virtual bool ExecuteForTask(int) const { return false; };
		virtual bool ExecuteForUID(uid_t) const { return false; };

		virtual void EnableResourceCaching(ResourceCacheType) {}
		virtual void DropResourceCaching(ResourceCacheType) {}
		@@ -116,7 +113,6 @@ class SetAttributeAction : public ProfileAction {
		const char* Name() const override { return "SetAttribute"; }
		bool ExecuteForProcess(uid_t uid, pid_t pid) const override;
		bool ExecuteForTask(int tid) const override;
		bool ExecuteForUID(uid_t uid) const override;

		private:
		const IProfileAttribute* attribute_;
		@@ -180,7 +176,6 @@ class TaskProfile {

		bool ExecuteForProcess(uid_t uid, pid_t pid) const;
		bool ExecuteForTask(int tid) const;
		bool ExecuteForUID(uid_t uid) const;
		void EnableResourceCaching(ProfileAction::ResourceCacheType cache_type);
		void DropResourceCaching(ProfileAction::ResourceCacheType cache_type);

		@@ -217,7 +212,6 @@ class TaskProfiles {
		bool SetProcessProfiles(uid_t uid, pid_t pid, const std::vector<std::string>& profiles,
		bool use_fd_cache);
		bool SetTaskProfiles(int tid, const std::vector<std::string>& profiles, bool use_fd_cache);
		bool SetUserProfiles(uid_t uid, const std::vector<std::string>& profiles, bool use_fd_cache);

		private:
		std::map<std::string, std::shared_ptr<TaskProfile>> profiles_;

libprocessgroup/task_profiles_test.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -121,10 +121,6 @@ class ProfileAttributeMock : public IProfileAttribute {
		return true;
		};

		bool GetPathForUID(uid_t, std::string *) const override {
		return false;
		}

		private:
		const std::string file_name_;
		};