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

Commit 651d68ee authored Mar 16, 2024 by Chris Manton

main::shim Change Stack::LockForDumpsys return signature

Used for follow on flagged CL

Bug: 329685247
Test: atest net_test_main_dumpsys
Flag: EXEMPT, Mechanical refactor

Change-Id: I134b58d7dbdf39130be677e26e48b1b6a5668009

parent 5affd44f

system/main/shim/stack.cc

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -211,10 +211,13 @@ bool Stack::IsDumpsysModuleStarted() const {
	return GetStackManager()->IsStarted<Dumpsys>();		return GetStackManager()->IsStarted<Dumpsys>();
	}		}

	void Stack::LockForDumpsys(std::function<void()> dumpsys_callback) {		bool Stack::LockForDumpsys(std::function<void()> dumpsys_callback) {
	std::lock_guard<std::recursive_mutex> lock(mutex_);		std::lock_guard<std::recursive_mutex> lock(mutex_);
			if (is_running_) {
	dumpsys_callback();		dumpsys_callback();
	}		}
			return is_running_;
			}

	} // namespace shim		} // namespace shim
	} // namespace bluetooth		} // namespace bluetooth

system/main/shim/stack.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,7 @@ class Stack {
	Btm* GetBtm();		Btm* GetBtm();
	os::Handler* GetHandler();		os::Handler* GetHandler();

	void LockForDumpsys(std::function<void()> dumpsys_callback);		bool LockForDumpsys(std::function<void()> dumpsys_callback);

	// Start the list of modules with the given stack manager thread		// Start the list of modules with the given stack manager thread
	void StartModuleStack(const ModuleList* modules, const os::Thread* thread);		void StartModuleStack(const ModuleList* modules, const os::Thread* thread);