From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jay Rolette Subject: Re: [PATCH] replaced O(n^2) sort in sort_by_physaddr() with qsort() from standard library Date: Wed, 17 Dec 2014 07:35:53 -0600 Message-ID: References: <2601191342CEEE43887BDE71AB977258213C1357@IRSMSX105.ger.corp.intel.com> <2601191342CEEE43887BDE71AB977258213C16E7@IRSMSX105.ger.corp.intel.com> <533710CFB86FA344BFBF2D6802E60286CA0963@SHSMSX101.ccr.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Dev To: "Qiu, Michael" Return-path: In-Reply-To: <533710CFB86FA344BFBF2D6802E60286CA0963-0J0gbvR4kThpB2pF5aRoyrfspsVTdybXVpNB7YpNyf8@public.gmane.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org Sender: "dev" Thanks to some help from Matthew Hall, it looks like I have it working now. I just resent the patch directly from git. Please let me know if it looks ok now? Sorry for the hassles. We use Mercurial internally, so while there is a lot of overlap, sending patches isn't something I have to worry about day-to-day. Appreciate the help getting things configured! Jay On Wed, Dec 17, 2014 at 7:08 AM, Qiu, Michael wrote= : > > On 12/17/2014 7:01 PM, Ananyev, Konstantin wrote: > > Hi Jay, > > > > From: Jay Rolette [mailto:rolette-bIuJOMs36aleGPcbtGPokg@public.gmane.org] > > Sent: Tuesday, December 16, 2014 7:21 PM > > To: Ananyev, Konstantin > > Cc: Dev > > Subject: Re: [dpdk-dev] [PATCH] replaced O(n^2) sort in > sort_by_physaddr() with qsort() from standard library > > > > Actually, I just relooked at the email I sent and it looks correct > (properly indented, etc.). Any suggestions for what might be going on? > > > > On Tue, Dec 16, 2014 at 1:18 PM, Jay Rolette > wrote: > > Thanks Konstantin. Yes, I'll resend. Not sure why gmail is removing > whitespace when I sent in Plain Text mode. > > > > Sorry, don=E2=80=99t know either. > > Wonder, did you see this: > > https://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html > > There is a section about different mailers, etc. > > Konstantin > > > > Ultimately I'll need to figure out how to properly configure git to sen= d > these directly instead of handling them more manually. The examples I saw > assumed you were using a gmail.com email rather than a > corporate email hosted via google apps. > Hi Jay, > > I was ever use git send-email with my gmail account, it works. > > So do you config your git send-email correctly? > > Thanks, > Michael > > > > Jay > > > > On Tue, Dec 16, 2014 at 12:39 PM, Ananyev, Konstantin < > konstantin.ananyev-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> wrote: > > > > Hi Jay, > > > >> -----Original Message----- > >> From: dev [mailto:dev-bounces-VfR2kkLFssw@public.gmane.org] > On Behalf Of Jay Rolette > >> Sent: Thursday, December 11, 2014 4:06 PM > >> To: Dev > >> Subject: [dpdk-dev] [PATCH] replaced O(n^2) sort in sort_by_physaddr() > with qsort() from standard library > >> > >> Signed-off-by: Jay Rolette rolette-bIuJOMs36aleGPcbtGPokg@public.gmane.org>> > > The patch itself looks good to me. > > Though it seems something wrong with formatting - all lines start with > offset 0. > > Probably your mail client? > > Konstantin > > > > > >> --- > >> lib/librte_eal/linuxapp/eal/eal_memory.c | 59 > >> +++++++++++--------------------- > >> 1 file changed, 20 insertions(+), 39 deletions(-) > >> > >> diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c > >> b/lib/librte_eal/linuxapp/eal/eal_memory.c > >> index bae2507..3656515 100644 > >> --- a/lib/librte_eal/linuxapp/eal/eal_memory.c > >> +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c > >> @@ -670,6 +670,25 @@ error: > >> return -1; > >> } > >> > >> +static int > >> +cmp_physaddr(const void *a, const void *b) > >> +{ > >> +#ifndef RTE_ARCH_PPC_64 > >> + const struct hugepage_file *p1 =3D (const struct hugepage_file *)a; > >> + const struct hugepage_file *p2 =3D (const struct hugepage_file *)b; > >> +#else > >> + // PowerPC needs memory sorted in reverse order from x86 > >> + const struct hugepage_file *p1 =3D (const struct hugepage_file *)b; > >> + const struct hugepage_file *p2 =3D (const struct hugepage_file *)a; > >> +#endif > >> + if (p1->physaddr < p2->physaddr) > >> + return -1; > >> + else if (p1->physaddr > p2->physaddr) > >> + return 1; > >> + else > >> + return 0; > >> +} > >> + > >> /* > >> * Sort the hugepg_tbl by physical address (lower addresses first on > x86, > >> * higher address first on powerpc). We use a slow algorithm, but we > won't > >> @@ -678,45 +697,7 @@ error: > >> static int > >> sort_by_physaddr(struct hugepage_file *hugepg_tbl, struct hugepage_in= fo > >> *hpi) > >> { > >> - unsigned i, j; > >> - int compare_idx; > >> - uint64_t compare_addr; > >> - struct hugepage_file tmp; > >> - > >> - for (i =3D 0; i < hpi->num_pages[0]; i++) { > >> - compare_addr =3D 0; > >> - compare_idx =3D -1; > >> - > >> - /* > >> - * browse all entries starting at 'i', and find the > >> - * entry with the smallest addr > >> - */ > >> - for (j=3Di; j< hpi->num_pages[0]; j++) { > >> - > >> - if (compare_addr =3D=3D 0 || > >> -#ifdef RTE_ARCH_PPC_64 > >> - hugepg_tbl[j].physaddr > compare_addr) { > >> -#else > >> - hugepg_tbl[j].physaddr < compare_addr) { > >> -#endif > >> - compare_addr =3D hugepg_tbl[j].physaddr; > >> - compare_idx =3D j; > >> - } > >> - } > >> - > >> - /* should not happen */ > >> - if (compare_idx =3D=3D -1) { > >> - RTE_LOG(ERR, EAL, "%s(): error in physaddr sorting\n", __func__); > >> - return -1; > >> - } > >> - > >> - /* swap the 2 entries in the table */ > >> - memcpy(&tmp, &hugepg_tbl[compare_idx], > >> - sizeof(struct hugepage_file)); > >> - memcpy(&hugepg_tbl[compare_idx], &hugepg_tbl[i], > >> - sizeof(struct hugepage_file)); > >> - memcpy(&hugepg_tbl[i], &tmp, sizeof(struct hugepage_file)); > >> - } > >> + qsort(hugepg_tbl, hpi->num_pages[0], sizeof(struct hugepage_file), > >> cmp_physaddr); > >> return 0; > >> } > >> > >> -- > >