From a8f130693dff20e18c74467f68b7c6bcf93340d7 Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Tue, 18 Jun 2024 22:20:43 +0000 Subject: [PATCH] Revert "reupload: libsnapshot: set thread priority" This reverts commit 00e1b61bb92b7a9905fdb5c00aba9ffd47a36dbf. Reason for revert: DroidMonitor: Potential culprit for b/348041418 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Change-Id: Ib7422cc7bfb7815ede814fb5f0ee1d4537fe52d2 --- .../libsnapshot/snapuserd/user-space-merge/merge_worker.cpp | 4 +--- .../libsnapshot/snapuserd/user-space-merge/read_worker.cpp | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp index 4afc312e3..bd7eaca74 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp @@ -577,10 +577,8 @@ bool MergeWorker::Run() { SNAP_LOG(ERROR) << "Merge terminated early..."; return true; } - auto merge_thread_priority = android::base::GetUintProperty( - "ro.virtual_ab.merge_thread_priority", ANDROID_PRIORITY_BACKGROUND); - if (!SetThreadPriority(merge_thread_priority)) { + if (!SetThreadPriority(ANDROID_PRIORITY_BACKGROUND)) { SNAP_PLOG(ERROR) << "Failed to set thread priority"; } diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp index 7191f1f74..d40b6d11d 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp @@ -17,10 +17,8 @@ #include #include -#include "android-base/properties.h" #include "read_worker.h" #include "snapuserd_core.h" -#include "user-space-merge/worker.h" #include "utility.h" namespace android { @@ -261,10 +259,8 @@ bool ReadWorker::Run() { SNAP_LOG(INFO) << "Processing snapshot I/O requests...."; pthread_setname_np(pthread_self(), "ReadWorker"); - auto worker_thread_priority = android::base::GetUintProperty( - "ro.virtual_ab.worker_thread_priority", ANDROID_PRIORITY_NORMAL); - if (!SetThreadPriority(worker_thread_priority)) { + if (!SetThreadPriority(ANDROID_PRIORITY_NORMAL)) { SNAP_PLOG(ERROR) << "Failed to set thread priority"; }