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

Commit bfc54991 authored Dec 06, 2023 by Yifan Hong Committed by Automerger Merge Worker Dec 06, 2023

Merge "lshal: do not pthread_kill" into main am: c2d75ce4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858054

Change-Id: I93ce45c354dfa63a5d3f030ef1e3ace318ece056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 06bef953 c2d75ce4

cmds/lshal/Timeout.h

+7 −3

Original line number	Diff line number	Diff line
		@@ -72,10 +72,14 @@ bool timeout(std::chrono::duration<R, P> delay, std::function<void(void)> &&func
		return false;
		}
		bool success = state.wait(now + delay);
		if (!success) {
		pthread_kill(thread, SIGINT);
		}
		if (success) {
		pthread_join(thread, nullptr);
		} else {
		// b/311143089: Abandon this background thread. Resources for a detached
		// thread are cleaned up when it is terminated. If the background thread
		// is stalled, it will be terminated when returning from main().
		pthread_detach(thread);
		}
		return success;
		}

cmds/lshal/main.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,5 +18,6 @@

		int main(int argc, char **argv) {
		using namespace ::android::lshal;
		// Background pthreads from timeout() are destroyed upon returning from main().
		return Lshal{}.main(Arg{argc, argv});
		}