pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge changes I71b34181,Ibd05137a 

* changes:
  init: Document the locking strategy used in class PropWaiterState
  init: Document the locking strategy in class ShutdownState
This commit is contained in:
Bart Van Assche 2023-02-21 23:15:14 +00:00 committed by Gerrit Code Review
parent 16ab2b67f7 b6b7ccc24f
commit 8f09cb5ba6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
init/init.cpp
View File

@ -51,6 +51,7 @@
#include <android-base/properties.h> #include <android-base/properties.h>
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <android-base/thread_annotations.h>
#include <fs_avb/fs_avb.h> #include <fs_avb/fs_avb.h>
#include <fs_mgr_vendor_overlay.h> #include <fs_mgr_vendor_overlay.h>
#include <keyutils.h> #include <keyutils.h>
@ -211,16 +212,16 @@ static class PropWaiterState {
} }
private: private:
void ResetWaitForPropLocked() { void ResetWaitForPropLocked() EXCLUSIVE_LOCKS_REQUIRED(lock_) {
wait_prop_name_.clear(); wait_prop_name_.clear();
wait_prop_value_.clear(); wait_prop_value_.clear();
waiting_for_prop_.reset(); waiting_for_prop_.reset();
} }
std::mutex lock_; std::mutex lock_;
std::unique_ptr<Timer> waiting_for_prop_{nullptr}; GUARDED_BY(lock_) std::unique_ptr<Timer> waiting_for_prop_{nullptr};
std::string wait_prop_name_; GUARDED_BY(lock_) std::string wait_prop_name_;
std::string wait_prop_value_; GUARDED_BY(lock_) std::string wait_prop_value_;
} prop_waiter_state; } prop_waiter_state;
@ -259,7 +260,7 @@ static class ShutdownState {
private: private:
std::mutex shutdown_command_lock_; std::mutex shutdown_command_lock_;
std::string shutdown_command_; std::string shutdown_command_ GUARDED_BY(shutdown_command_lock_);
bool do_shutdown_ = false; bool do_shutdown_ = false;
} shutdown_state; } shutdown_state;