From: "Wu, Jiaxin" <jiaxin.wu@intel.com>
To: "Fu, Siyuan" <siyuan.fu@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Ye, Ting" <ting.ye@intel.com>
Subject: Re: [Patch] MdeModulePkg/TcpIoLib: Check input Timeout before calling CheckEvent() service.
Date: Tue, 12 Dec 2017 06:22:12 +0000 [thread overview]
Message-ID: <895558F6EA4E3B41AC93A00D163B7274163529CC@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <20171205063255.6652-1-siyuan.fu@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
> -----Original Message-----
> From: Fu Siyuan [mailto:siyuan.fu@intel.com]
> Sent: Tuesday, December 5, 2017 2:33 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Ye, Ting <ting.ye@intel.com>
> Subject: [Patch] MdeModulePkg/TcpIoLib: Check input Timeout before
> calling CheckEvent() service.
>
> For TcpIoConnect() and TcpIoAccept(), this patch adds the check for Timeout
> event
> before calling CheckEvent() service so as to avoid the unnecessary function
> call.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> Cc: Ye Ting <ting.ye@intel.com>
> ---
> MdeModulePkg/Include/Library/TcpIoLib.h | 14 +++++++-------
> MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c | 20 ++++++++++--------
> --
> 2 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/MdeModulePkg/Include/Library/TcpIoLib.h
> b/MdeModulePkg/Include/Library/TcpIoLib.h
> index 2871f6747e..22629dbcd5 100644
> --- a/MdeModulePkg/Include/Library/TcpIoLib.h
> +++ b/MdeModulePkg/Include/Library/TcpIoLib.h
> @@ -2,7 +2,7 @@
> This library is used to share code between UEFI network stack modules.
> It provides the helper routines to access TCP service.
>
> -Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD
> License
> which accompanies this distribution. The full text of the license may be
> found at<BR>
> @@ -144,7 +144,7 @@ TcpIoDestroySocket (
> Connect to the other endpoint of the TCP socket.
>
> @param[in, out] TcpIo The TcpIo wrapping the TCP socket.
> - @param[in] Timeout The time to wait for connection done.
> + @param[in] Timeout The time to wait for connection done. Set to
> NULL for infinite wait.
>
> @retval EFI_SUCCESS Connect to the other endpoint of the TCP
> socket
> successfully.
> @@ -160,14 +160,14 @@ EFI_STATUS
> EFIAPI
> TcpIoConnect (
> IN OUT TCP_IO *TcpIo,
> - IN EFI_EVENT Timeout
> + IN EFI_EVENT Timeout OPTIONAL
> );
>
> /**
> Accept the incomding request from the other endpoint of the TCP socket.
>
> @param[in, out] TcpIo The TcpIo wrapping the TCP socket.
> - @param[in] Timeout The time to wait for connection done.
> + @param[in] Timeout The time to wait for connection done. Set to
> NULL for infinite wait.
>
>
> @retval EFI_SUCCESS Connect to the other endpoint of the TCP
> socket
> @@ -185,7 +185,7 @@ EFI_STATUS
> EFIAPI
> TcpIoAccept (
> IN OUT TCP_IO *TcpIo,
> - IN EFI_EVENT Timeout
> + IN EFI_EVENT Timeout OPTIONAL
> );
>
> /**
> @@ -229,7 +229,7 @@ TcpIoTransmit (
> @param[in] Packet The buffer to hold the data copy from the socket
> rx buffer.
> @param[in] AsyncMode Is this receive asyncronous or not.
> @param[in] Timeout The time to wait for receiving the amount of data
> the Packet
> - can hold.
> + can hold. Set to NULL for infinite wait.
>
> @retval EFI_SUCCESS The required amount of data is received from
> the socket.
> @retval EFI_INVALID_PARAMETER One or more parameters are invalid.
> @@ -246,7 +246,7 @@ TcpIoReceive (
> IN OUT TCP_IO *TcpIo,
> IN NET_BUF *Packet,
> IN BOOLEAN AsyncMode,
> - IN EFI_EVENT Timeout
> + IN EFI_EVENT Timeout OPTIONAL
> );
>
> #endif
> diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
> b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
> index 17183e1a6c..a7637579f2 100644
> --- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
> +++ b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
> @@ -2,7 +2,7 @@
> This library is used to share code between UEFI network stack modules.
> It provides the helper routines to access TCP service.
>
> -Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD
> License
> which accompanies this distribution. The full text of the license may be
> found at<BR>
> @@ -530,7 +530,7 @@ TcpIoDestroySocket (
> Connect to the other endpoint of the TCP socket.
>
> @param[in, out] TcpIo The TcpIo wrapping the TCP socket.
> - @param[in] Timeout The time to wait for connection done.
> + @param[in] Timeout The time to wait for connection done. Set to
> NULL for infinite wait.
>
> @retval EFI_SUCCESS Connect to the other endpoint of the TCP
> socket
> successfully.
> @@ -546,7 +546,7 @@ EFI_STATUS
> EFIAPI
> TcpIoConnect (
> IN OUT TCP_IO *TcpIo,
> - IN EFI_EVENT Timeout
> + IN EFI_EVENT Timeout OPTIONAL
> )
> {
> EFI_TCP4_PROTOCOL *Tcp4;
> @@ -576,7 +576,7 @@ TcpIoConnect (
> return Status;
> }
>
> - while (!TcpIo->IsConnDone && EFI_ERROR (gBS->CheckEvent (Timeout))) {
> + while (!TcpIo->IsConnDone && ((Timeout == NULL) || EFI_ERROR (gBS-
> >CheckEvent (Timeout)))) {
> if (TcpIo->TcpVersion == TCP_VERSION_4) {
> Tcp4->Poll (Tcp4);
> } else {
> @@ -597,7 +597,7 @@ TcpIoConnect (
> Accept the incomding request from the other endpoint of the TCP socket.
>
> @param[in, out] TcpIo The TcpIo wrapping the TCP socket.
> - @param[in] Timeout The time to wait for connection done.
> + @param[in] Timeout The time to wait for connection done. Set to
> NULL for infinite wait.
>
>
> @retval EFI_SUCCESS Connect to the other endpoint of the TCP
> socket
> @@ -607,7 +607,7 @@ TcpIoConnect (
> supported in the implementation.
>
> @retval EFI_TIMEOUT Failed to connect to the other endpoint of the
> - TCP socket in the specified time period.
> + TCP socket in the specified time period.
> @retval Others Other errors as indicated.
>
> **/
> @@ -615,7 +615,7 @@ EFI_STATUS
> EFIAPI
> TcpIoAccept (
> IN OUT TCP_IO *TcpIo,
> - IN EFI_EVENT Timeout
> + IN EFI_EVENT Timeout OPTIONAL
> )
> {
> EFI_STATUS Status;
> @@ -646,7 +646,7 @@ TcpIoAccept (
> return Status;
> }
>
> - while (!TcpIo->IsListenDone && EFI_ERROR (gBS->CheckEvent (Timeout)))
> {
> + while (!TcpIo->IsListenDone && ((Timeout == NULL) || EFI_ERROR (gBS-
> >CheckEvent (Timeout)))) {
> if (TcpIo->TcpVersion == TCP_VERSION_4) {
> Tcp4->Poll (Tcp4);
> } else {
> @@ -860,7 +860,7 @@ ON_EXIT:
> @param[in] Packet The buffer to hold the data copy from the socket
> rx buffer.
> @param[in] AsyncMode Is this receive asyncronous or not.
> @param[in] Timeout The time to wait for receiving the amount of data
> the Packet
> - can hold.
> + can hold. Set to NULL for infinite wait.
>
> @retval EFI_SUCCESS The required amount of data is received from
> the socket.
> @retval EFI_INVALID_PARAMETER One or more parameters are invalid.
> @@ -877,7 +877,7 @@ TcpIoReceive (
> IN OUT TCP_IO *TcpIo,
> IN NET_BUF *Packet,
> IN BOOLEAN AsyncMode,
> - IN EFI_EVENT Timeout
> + IN EFI_EVENT Timeout OPTIONAL
> )
> {
> EFI_TCP4_PROTOCOL *Tcp4;
> --
> 2.13.0.windows.1
next prev parent reply other threads:[~2017-12-12 6:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-05 6:32 [Patch] MdeModulePkg/TcpIoLib: Check input Timeout before calling CheckEvent() service Fu Siyuan
2017-12-12 6:22 ` Wu, Jiaxin [this message]
2017-12-12 7:29 ` Ye, Ting
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=895558F6EA4E3B41AC93A00D163B7274163529CC@SHSMSX103.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox