Merge "lshal: Fix timeout causes unexpected exits." am: 057e74631b (91a4bd9c) · Commits · e / os / android_frameworks_native-old

cmds/lshal/Lshal.cpp

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -469,9 +469,17 @@ int Lshal::main(int argc, char **argv) {
	return status;		return status;
	}		}

			void signalHandler(int sig) {
			if (sig == SIGINT) {
			int retVal;
			pthread_exit(&retVal);
			}
			}

	} // namespace lshal		} // namespace lshal
	} // namespace android		} // namespace android

	int main(int argc, char **argv) {		int main(int argc, char **argv) {
			signal(SIGINT, ::android::lshal::signalHandler);
	return ::android::lshal::Lshal{}.main(argc, argv);		return ::android::lshal::Lshal{}.main(argc, argv);
	}		}

cmds/lshal/Timeout.h

+24 −8

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,8 @@ static constexpr std::chrono::milliseconds IPC_CALL_WAIT{500};

	class BackgroundTaskState {		class BackgroundTaskState {
	public:		public:
	BackgroundTaskState(){}		BackgroundTaskState(std::function<void(void)> &&func)
			: mFunc(std::forward<decltype(func)>(func)) {}
	void notify() {		void notify() {
	std::unique_lock<std::mutex> lock(mMutex);		std::unique_lock<std::mutex> lock(mMutex);
	mFinished = true;		mFinished = true;
	@@ -42,22 +43,37 @@ public:
	mCondVar.wait_until(lock, end, [this](){ return this->mFinished; });		mCondVar.wait_until(lock, end, [this](){ return this->mFinished; });
	return mFinished;		return mFinished;
	}		}
			void operator()() {
			mFunc();
			}
	private:		private:
	std::mutex mMutex;		std::mutex mMutex;
	std::condition_variable mCondVar;		std::condition_variable mCondVar;
	bool mFinished = false;		bool mFinished = false;
			std::function<void(void)> mFunc;
	};		};

			void callAndNotify(void data) {
			BackgroundTaskState &state = static_cast<BackgroundTaskState >(data);
			state();
			state.notify();
			return NULL;
			}

	template<class R, class P>		template<class R, class P>
	bool timeout(std::chrono::duration<R, P> delay, const std::function<void(void)> &func) {		bool timeout(std::chrono::duration<R, P> delay, std::function<void(void)> &&func) {
	auto now = std::chrono::system_clock::now();		auto now = std::chrono::system_clock::now();
	BackgroundTaskState state{};		BackgroundTaskState state{std::forward<decltype(func)>(func)};
	std::thread t([&state, &func] {		pthread_t thread;
	func();		if (pthread_create(&thread, NULL, callAndNotify, &state)) {
	state.notify();		std::cerr << "FATAL: could not create background thread." << std::endl;
	});		return false;
	t.detach();		}
	bool success = state.wait(now + delay);		bool success = state.wait(now + delay);
			if (!success) {
			pthread_kill(thread, SIGINT);
			}
			pthread_join(thread, NULL);
	return success;		return success;
	}		}