Use std::function instead of base::function_ref (71ab6fd0) · Commits · e / os / android_frameworks_native

libs/binder/RpcState.cpp

+17 −18

Original line number	Diff line number	Diff line
		@@ -359,7 +359,7 @@ RpcState::CommandData::CommandData(size_t size) : mSize(size) {
		status_t RpcState::rpcSend(
		const sp<RpcSession::RpcConnection>& connection, const sp<RpcSession>& session,
		const char* what, iovec* iovs, int niovs,
		const std::optional<android::base::function_ref<status_t()>>& altPoll,
		const std::optional<SmallFunction<status_t()>>& altPoll,
		const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) {
		for (int i = 0; i < niovs; i++) {
		LOG_RPC_DETAIL("Sending %s (part %d of %d) on RpcTransport %p: %s",
		@@ -604,9 +604,7 @@ status_t RpcState::transactAddress(const sp<RpcSession::RpcConnection>& connecti
		{const_cast<uint8_t*>(data.data()), data.dataSize()},
		objectTableSpan.toIovec(),
		};
		if (status_t status = rpcSend(
		connection, session, "transaction", iovs, arraysize(iovs),
		[&] {
		auto altPoll = [&] {
		if (waitUs > kWaitLogUs) {
		ALOGE("Cannot send command, trying to process pending refcounts. Waiting "
		"%zuus. Too many oneway calls?",
		@@ -621,8 +619,9 @@ status_t RpcState::transactAddress(const sp<RpcSession::RpcConnection>& connecti
		}

		return drainCommands(connection, session, CommandType::CONTROL_ONLY);
		},
		rpcFields->mFds.get());
		};
		if (status_t status = rpcSend(connection, session, "transaction", iovs, arraysize(iovs),
		std::ref(altPoll), rpcFields->mFds.get());
		status != OK) {
		// rpcSend calls shutdownAndWait, so all refcounts should be reset. If we ever tolerate
		// errors here, then we may need to undo the binder-sent counts for the transaction as

libs/binder/RpcState.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#pragma once

		#include <android-base/unique_fd.h>
		#include <binder/Functional.h>
		#include <binder/IBinder.h>
		#include <binder/Parcel.h>
		#include <binder/RpcSession.h>
		@@ -190,7 +191,7 @@ private:
		[[nodiscard]] status_t rpcSend(
		const sp<RpcSession::RpcConnection>& connection, const sp<RpcSession>& session,
		const char* what, iovec* iovs, int niovs,
		const std::optional<android::base::function_ref<status_t()>>& altPoll,
		const std::optional<binder::impl::SmallFunction<status_t()>>& altPoll,
		const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds =
		nullptr);
		[[nodiscard]] status_t rpcRec(

libs/binder/RpcTransportRaw.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@

		namespace android {

		using namespace android::binder::impl;

		// RpcTransport with TLS disabled.
		class RpcTransportRaw : public RpcTransport {
		public:
		@@ -54,7 +56,7 @@ public:

		status_t interruptableWriteFully(
		FdTrigger* fdTrigger, iovec* iovs, int niovs,
		const std::optional<android::base::function_ref<status_t()>>& altPoll,
		const std::optional<SmallFunction<status_t()>>& altPoll,
		const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds)
		override {
		bool sentFds = false;
		@@ -70,7 +72,7 @@ public:

		status_t interruptableReadFully(
		FdTrigger* fdTrigger, iovec* iovs, int niovs,
		const std::optional<android::base::function_ref<status_t()>>& altPoll,
		const std::optional<SmallFunction<status_t()>>& altPoll,
		std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) override {
		auto recv = [&](iovec* iovs, int niovs) -> ssize_t {
		return binder::os::receiveMessageFromSocket(mSocket, iovs, niovs, ancillaryFds);

libs/binder/RpcTransportTipcAndroid.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include "RpcState.h"
		#include "RpcTransportUtils.h"

		using namespace android::binder::impl;
		using android::base::Error;
		using android::base::Result;

		@@ -75,7 +76,7 @@ public:

		status_t interruptableWriteFully(
		FdTrigger* fdTrigger, iovec* iovs, int niovs,
		const std::optional<android::base::function_ref<status_t()>>& altPoll,
		const std::optional<SmallFunction<status_t()>>& altPoll,
		const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds)
		override {
		auto writeFn = [&](iovec* iovs, size_t niovs) -> ssize_t {
		@@ -93,7 +94,7 @@ public:

		status_t interruptableReadFully(
		FdTrigger* fdTrigger, iovec* iovs, int niovs,
		const std::optional<android::base::function_ref<status_t()>>& altPoll,
		const std::optional<SmallFunction<status_t()>>& altPoll,
		std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* /ancillaryFds/)
		override {
		auto readFn = [&](iovec* iovs, size_t niovs) -> ssize_t {

libs/binder/RpcTransportTls.cpp

+11 −9

Original line number	Diff line number	Diff line
		@@ -38,6 +38,9 @@
		#endif

		namespace android {

		using namespace android::binder::impl;

		namespace {

		// Implement BIO for socket that ignores SIGPIPE.
		@@ -181,10 +184,9 @@ public:
		// \|sslError\| should be from Ssl::getError().
		// If \|sslError\| is WANT_READ / WANT_WRITE, poll for POLLIN / POLLOUT respectively. Otherwise
		// return error. Also return error if \|fdTrigger\| is triggered before or during poll().
		status_t pollForSslError(
		const android::RpcTransportFd& fd, int sslError, FdTrigger* fdTrigger,
		status_t pollForSslError(const android::RpcTransportFd& fd, int sslError, FdTrigger* fdTrigger,
		const char* fnString, int additionalEvent,
		const std::optional<android::base::function_ref<status_t()>>& altPoll) {
		const std::optional<SmallFunction<status_t()>>& altPoll) {
		switch (sslError) {
		case SSL_ERROR_WANT_READ:
		return handlePoll(POLLIN \| additionalEvent, fd, fdTrigger, fnString, altPoll);
		@@ -200,7 +202,7 @@ private:

		status_t handlePoll(int event, const android::RpcTransportFd& fd, FdTrigger* fdTrigger,
		const char* fnString,
		const std::optional<android::base::function_ref<status_t()>>& altPoll) {
		const std::optional<SmallFunction<status_t()>>& altPoll) {
		status_t ret;
		if (altPoll) {
		ret = (*altPoll)();
		@@ -284,12 +286,12 @@ public:
		status_t pollRead(void) override;
		status_t interruptableWriteFully(
		FdTrigger* fdTrigger, iovec* iovs, int niovs,
		const std::optional<android::base::function_ref<status_t()>>& altPoll,
		const std::optional<SmallFunction<status_t()>>& altPoll,
		const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds)
		override;
		status_t interruptableReadFully(
		FdTrigger* fdTrigger, iovec* iovs, int niovs,
		const std::optional<android::base::function_ref<status_t()>>& altPoll,
		const std::optional<SmallFunction<status_t()>>& altPoll,
		std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) override;

		bool isWaiting() override { return mSocket.isInPollingState(); };
		@@ -320,7 +322,7 @@ status_t RpcTransportTls::pollRead(void) {

		status_t RpcTransportTls::interruptableWriteFully(
		FdTrigger* fdTrigger, iovec* iovs, int niovs,
		const std::optional<android::base::function_ref<status_t()>>& altPoll,
		const std::optional<SmallFunction<status_t()>>& altPoll,
		const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) {
		(void)ancillaryFds;

		@@ -366,7 +368,7 @@ status_t RpcTransportTls::interruptableWriteFully(

		status_t RpcTransportTls::interruptableReadFully(
		FdTrigger* fdTrigger, iovec* iovs, int niovs,
		const std::optional<android::base::function_ref<status_t()>>& altPoll,
		const std::optional<SmallFunction<status_t()>>& altPoll,
		std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) {
		(void)ancillaryFds;