OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Clarify argument to net::io_context::async_wait

Browse Source 
Add a comment documenting the __w parameter of the private
ios_context::async_wait function. Add casts to callers, making the
conversions explicit.

libstdc++-v3/ChangeLog:

	* include/experimental/io_context (io_context::async_wait): Add
	comment.
	* include/experimental/socket (basic_socket::async_connect):
	Cast wait_type constant to int.
	(basic_datagram_socket::async_receive): Likewise.
	(basic_datagram_socket::async_receive_from): Likewise.
	(basic_datagram_socket::async_send): Likewise.
	(basic_datagram_socket::async_send_to): Likewise.
	(basic_stream_socket::async_receive): Likewise.
	(basic_stream_socket::async_send): Likewise. Use io_context
	parameter directly, instead of via an executor.
	(basic_socket_acceptor::async_accept): Likewise.
This commit is contained in:
Jonathan Wakely 2021-04-23 13:31:33 +01:00
parent a752a43073
commit 3517dfe05c
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/include/experimental/io_context
View File

@ -475,6 +475,9 @@ inline namespace v1
return 0; return 0;
} }
// The caller must know what the wait-type __w will be interpreted.
// In the current implementation the reactor is based on <poll.h>
// so the parameter must be one of POLLIN, POLLOUT or POLLERR.
template<typename _Op> template<typename _Op>
void void
async_wait(int __fd, int __w, _Op&& __op) async_wait(int __fd, int __w, _Op&& __op)

22
libstdc++-v3/include/experimental/socket
View File

@ -954,7 +954,7 @@ inline namespace v1
} }
get_executor().context().async_wait( native_handle(), get_executor().context().async_wait( native_handle(),
socket_base::wait_read, (int) socket_base::wait_read,
[__h = std::move(__init.completion_handler), [__h = std::move(__init.completion_handler),
__ep = std::move(__endpoint), __ep = std::move(__endpoint),
__fd = native_handle()] __fd = native_handle()]
@ -1165,7 +1165,7 @@ inline namespace v1
__init{__token}; __init{__token};
this->get_executor().context().async_wait(this->native_handle(), this->get_executor().context().async_wait(this->native_handle(),
socket_base::wait_read, (int) socket_base::wait_read,
[__h = std::move(__init.completion_handler), [__h = std::move(__init.completion_handler),
&__buffers, __flags = static_cast<int>(__flags), &__buffers, __flags = static_cast<int>(__flags),
__fd = this->native_handle()] __fd = this->native_handle()]
@ -1271,7 +1271,7 @@ inline namespace v1
__init{__token}; __init{__token};
this->get_executor().context().async_wait( this->native_handle(), this->get_executor().context().async_wait( this->native_handle(),
socket_base::wait_read, (int) socket_base::wait_read,
[__h = std::move(__init.completion_handler), [__h = std::move(__init.completion_handler),
&__buffers, __flags = static_cast<int>(__flags), &__buffers, __flags = static_cast<int>(__flags),
__sender = std::move(__sender), __sender = std::move(__sender),
@ -1366,7 +1366,7 @@ inline namespace v1
__init{__token}; __init{__token};
this->get_executor().context().async_wait( this->native_handle(), this->get_executor().context().async_wait( this->native_handle(),
socket_base::wait_write, (int) socket_base::wait_write,
[__h = std::move(__init.completion_handler), [__h = std::move(__init.completion_handler),
&__buffers, __flags = static_cast<int>(__flags), &__buffers, __flags = static_cast<int>(__flags),
__fd = this->native_handle()] __fd = this->native_handle()]
@ -1469,7 +1469,7 @@ inline namespace v1
__init{__token}; __init{__token};
this->get_executor().context().async_wait( this->native_handle(), this->get_executor().context().async_wait( this->native_handle(),
socket_base::wait_write, (int) socket_base::wait_write,
[__h = std::move(__init.completion_handler), [__h = std::move(__init.completion_handler),
&__buffers, __flags = static_cast<int>(__flags), &__buffers, __flags = static_cast<int>(__flags),
__recipient = std::move(__recipient), __recipient = std::move(__recipient),
@ -1634,7 +1634,7 @@ inline namespace v1
} }
this->get_executor().context().async_wait(this->native_handle(), this->get_executor().context().async_wait(this->native_handle(),
socket_base::wait_read, (int) socket_base::wait_read,
[__h = std::move(__init.completion_handler), [__h = std::move(__init.completion_handler),
&__buffers, __flags = static_cast<int>(__flags), &__buffers, __flags = static_cast<int>(__flags),
__fd = this->native_handle()] __fd = this->native_handle()]
@ -1741,7 +1741,7 @@ inline namespace v1
} }
this->get_executor().context().async_wait(this->native_handle(), this->get_executor().context().async_wait(this->native_handle(),
socket_base::wait_write, (int) socket_base::wait_write,
[__h = std::move(__init.completion_handler), [__h = std::move(__init.completion_handler),
&__buffers, __flags = static_cast<int>(__flags), &__buffers, __flags = static_cast<int>(__flags),
__fd = this->native_handle()] __fd = this->native_handle()]
@ -2098,8 +2098,8 @@ inline namespace v1
async_completion<_CompletionToken, void(error_code, socket_type)> async_completion<_CompletionToken, void(error_code, socket_type)>
__init{__token}; __init{__token};
__ctx.get_executor().context().async_wait(native_handle(), __ctx.async_wait(native_handle(),
socket_base::wait_read, (int) socket_base::wait_read,
[__h = std::move(__init.completion_handler), [__h = std::move(__init.completion_handler),
__connabort = enable_connection_aborted(), __connabort = enable_connection_aborted(),
__fd = native_handle(), __fd = native_handle(),
@ -2189,8 +2189,8 @@ inline namespace v1
async_completion<_CompletionToken, void(error_code, socket_type)> async_completion<_CompletionToken, void(error_code, socket_type)>
__init{__token}; __init{__token};
__ctx.get_executor().context().async_wait(native_handle(), __ctx.async_wait(native_handle(),
socket_base::wait_read, (int) socket_base::wait_read,
[__h = std::move(__init.completion_handler), [__h = std::move(__init.completion_handler),
__ep = std::move(__endpoint), __ep = std::move(__endpoint),
__connabort = enable_connection_aborted(), __connabort = enable_connection_aborted(),