Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dba77ad7 authored Aug 03, 2023 by David Anderson

snapuserd: Factor setpriority/settid calls into a helper.

This allows disabling the code in host builds, since settid() isn't
available in the glibc prebuilt.

Bug: 288273605
Test: snapuserd_test
Change-Id: Ifddb5cb8b04484a1ab0a29794d65c9839759a919

parent fe032d03

fs_mgr/libsnapshot/snapuserd/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -72,6 +72,7 @@ cc_library_static {
	"user-space-merge/snapuserd_transitions.cpp",		"user-space-merge/snapuserd_transitions.cpp",
	"user-space-merge/snapuserd_verify.cpp",		"user-space-merge/snapuserd_verify.cpp",
	"user-space-merge/worker.cpp",		"user-space-merge/worker.cpp",
			"utility.cpp",
	],		],
	static_libs: [		static_libs: [
	"libbase",		"libbase",

fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@
	#include "merge_worker.h"		#include "merge_worker.h"

	#include "snapuserd_core.h"		#include "snapuserd_core.h"
			#include "utility.h"

	namespace android {		namespace android {
	namespace snapshot {		namespace snapshot {
	@@ -550,8 +551,8 @@ bool MergeWorker::Run() {
	return true;		return true;
	}		}

	if (setpriority(PRIO_PROCESS, gettid(), kNiceValueForMergeThreads)) {		if (!SetThreadPriority(kNiceValueForMergeThreads)) {
	SNAP_PLOG(ERROR) << "Failed to set priority for TID: " << gettid();		SNAP_PLOG(ERROR) << "Failed to set thread priority";
	}		}

	SNAP_LOG(INFO) << "Merge starting..";		SNAP_LOG(INFO) << "Merge starting..";

fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	#include "read_worker.h"		#include "read_worker.h"

	#include "snapuserd_core.h"		#include "snapuserd_core.h"
			#include "utility.h"

	namespace android {		namespace android {
	namespace snapshot {		namespace snapshot {
	@@ -208,8 +209,8 @@ bool ReadWorker::Init() {
	bool ReadWorker::Run() {		bool ReadWorker::Run() {
	SNAP_LOG(INFO) << "Processing snapshot I/O requests....";		SNAP_LOG(INFO) << "Processing snapshot I/O requests....";

	if (setpriority(PRIO_PROCESS, gettid(), kNiceValueForMergeThreads)) {		if (!SetThreadPriority(kNiceValueForMergeThreads)) {
	SNAP_PLOG(ERROR) << "Failed to set priority for TID: " << gettid();		SNAP_PLOG(ERROR) << "Failed to set thread priority";
	}		}

	// Start serving IO		// Start serving IO

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	#include "snapuserd_readahead.h"		#include "snapuserd_readahead.h"

	#include "snapuserd_core.h"		#include "snapuserd_core.h"
			#include "utility.h"

	namespace android {		namespace android {
	namespace snapshot {		namespace snapshot {
	@@ -765,8 +766,8 @@ bool ReadAhead::RunThread() {

	InitializeIouring();		InitializeIouring();

	if (setpriority(PRIO_PROCESS, gettid(), kNiceValueForMergeThreads)) {		if (!SetThreadPriority(kNiceValueForMergeThreads)) {
	SNAP_PLOG(ERROR) << "Failed to set priority for TID: " << gettid();		SNAP_PLOG(ERROR) << "Failed to set thread priority";
	}		}

	while (!RAIterDone()) {		while (!RAIterDone()) {

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,7 @@
	#include "snapuserd_core.h"		#include "snapuserd_core.h"
	#include "testing/dm_user_harness.h"		#include "testing/dm_user_harness.h"
	#include "testing/temp_device.h"		#include "testing/temp_device.h"
			#include "utility.h"

	DEFINE_string(force_config, "", "Force testing mode with iouring disabled");		DEFINE_string(force_config, "", "Force testing mode with iouring disabled");