From: "Marvin Häuser" <mhaeuser@posteo.de>
To: devel@edk2.groups.io, ianx.kuo@intel.com
Cc: amy.chan@intel.com, ray.ni@intel.com,
Jiewen Yao <jiewen.yao@intel.com>,
Jian J Wang <jian.j.wang@intel.com>,
Xiaoyu Lu <xiaoyux.lu@intel.com>,
Guomin Jiang <guomin.jiang@intel.com>
Subject: Re: [edk2-devel] [PATCH v2 2/3] CryptoPkg/CryptLib: Add QuickSort function on BaseLib
Date: Sat, 16 Oct 2021 14:59:38 +0000 [thread overview]
Message-ID: <0158c925-1354-4b5f-fce7-52fe4cc85e24@posteo.de> (raw)
In-Reply-To: <20211015232526.1839-3-ianx.kuo@intel.com>
Hey IanX,
On 16.10.21 01:25, IanX Kuo wrote:
> From: IanX Kuo <ianx.kuo@intel.com>
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3675
>
> Use QuickSort instead of QuickSortWorker
>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Signed-off-by: IanX Kuo <ianx.kuo@intel.com>
> ---
> .../Library/BaseCryptLib/SysCall/CrtWrapper.c | 92 +------------------
> 1 file changed, 2 insertions(+), 90 deletions(-)
>
> diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> index 42235ab96a..b10edaae5b 100644
> --- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> @@ -2,7 +2,7 @@
> C Run-Time Libraries (CRT) Wrapper Implementation for OpenSSL-based
> Cryptographic Library.
>
> -Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> @@ -22,91 +22,6 @@ int
> IN VOID *Buffer2
> );
>
> -//
> -// Duplicated from EDKII BaseSortLib for qsort() wrapper
> -//
> -STATIC
> -VOID
> -QuickSortWorker (
> - IN OUT VOID *BufferToSort,
> - IN CONST UINTN Count,
> - IN CONST UINTN ElementSize,
> - IN SORT_COMPARE CompareFunction,
> - IN VOID *Buffer
> - )
> -{
> - VOID *Pivot;
> - UINTN LoopCount;
> - UINTN NextSwapLocation;
> -
> - ASSERT(BufferToSort != NULL);
> - ASSERT(CompareFunction != NULL);
> - ASSERT(Buffer != NULL);
> -
> - if (Count < 2 || ElementSize < 1) {
> - return;
> - }
> -
> - NextSwapLocation = 0;
> -
> - //
> - // Pick a pivot (we choose last element)
> - //
> - Pivot = ((UINT8 *)BufferToSort + ((Count - 1) * ElementSize));
> -
> - //
> - // Now get the pivot such that all on "left" are below it
> - // and everything "right" are above it
> - //
> - for (LoopCount = 0; LoopCount < Count - 1; LoopCount++)
> - {
> - //
> - // If the element is less than the pivot
> - //
> - if (CompareFunction ((VOID *)((UINT8 *)BufferToSort + ((LoopCount) * ElementSize)), Pivot) <= 0) {
> - //
> - // Swap
> - //
> - CopyMem (Buffer, (UINT8 *)BufferToSort + (NextSwapLocation * ElementSize), ElementSize);
> - CopyMem ((UINT8 *)BufferToSort + (NextSwapLocation * ElementSize), (UINT8 *)BufferToSort + ((LoopCount) * ElementSize), ElementSize);
> - CopyMem ((UINT8 *)BufferToSort + ((LoopCount) * ElementSize), Buffer, ElementSize);
> -
> - //
> - // Increment NextSwapLocation
> - //
> - NextSwapLocation++;
> - }
> - }
> - //
> - // Swap pivot to its final position (NextSwapLocation)
> - //
> - CopyMem (Buffer, Pivot, ElementSize);
> - CopyMem (Pivot, (UINT8 *)BufferToSort + (NextSwapLocation * ElementSize), ElementSize);
> - CopyMem ((UINT8 *)BufferToSort + (NextSwapLocation * ElementSize), Buffer, ElementSize);
> -
> - //
> - // Now recurse on 2 partial lists. Neither of these will have the 'pivot' element.
> - // IE list is sorted left half, pivot element, sorted right half...
> - //
> - QuickSortWorker (
> - BufferToSort,
> - NextSwapLocation,
> - ElementSize,
> - CompareFunction,
> - Buffer
> - );
> -
> - QuickSortWorker (
> - (UINT8 *)BufferToSort + (NextSwapLocation + 1) * ElementSize,
> - Count - NextSwapLocation - 1,
> - ElementSize,
> - CompareFunction,
> - Buffer
> - );
> -
> - return;
> -}
> -
> //---------------------------------------------------------
> // Standard C Run-time Library Interface Wrapper
> //---------------------------------------------------------
> @@ -337,10 +252,7 @@ void qsort (void *base, size_t num, size_t width, int (*compare)(const void *, c
> Buffer = malloc (width);
> ASSERT (Buffer != NULL);
>
> - //
> - // Re-use PerformQuickSort() function Implementation in EDKII BaseSortLib.
> - //
> - QuickSortWorker (base, (UINTN)num, (UINTN)width, (SORT_COMPARE)compare, Buffer);
> + QuickSort (base, (UINTN)num, (UINTN)width, (BASE_SORT_COMPARE)compare, Buffer);
Same as the other occurrence, can this cast be dropped?
Best regards,
Marvin
>
> free (Buffer);
> return;
next prev parent reply other threads:[~2021-10-16 14:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 23:25 [PATCH v2 0/3] Add function QuickSort into MdePkg/BaseLib IanX Kuo
2021-10-15 23:25 ` [PATCH v2 1/3] MdeModulePkg/SortLib: Add QuickSort function on BaseLib IanX Kuo
2021-10-15 23:25 ` [PATCH v2 2/3] CryptoPkg/CryptLib: " IanX Kuo
2021-10-16 14:59 ` Marvin Häuser [this message]
2021-10-15 23:25 ` [PATCH v2 3/3] UefiCpuPkg/CpuCacheInfoLib: " IanX Kuo
2021-10-16 14:57 ` [edk2-devel] " Marvin Häuser
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=0158c925-1354-4b5f-fce7-52fe4cc85e24@posteo.de \
--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