From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16119 invoked by alias); 24 Feb 2012 15:23:35 -0000 Received: (qmail 16110 invoked by uid 22791); 24 Feb 2012 15:23:33 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 24 Feb 2012 15:23:20 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1S0wzN-0004UV-UB from Luis_Gustavo@mentor.com ; Fri, 24 Feb 2012 07:23:17 -0800 Received: from NA1-MAIL.mgc.mentorg.com ([147.34.98.181]) by svr-orw-fem-01.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 24 Feb 2012 07:23:17 -0800 Received: from [0.0.0.0] ([172.16.63.104]) by NA1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 24 Feb 2012 07:23:16 -0800 Message-ID: <4F47AB82.5080502@mentor.com> Date: Fri, 24 Feb 2012 15:24:00 -0000 From: Luis Gustavo Reply-To: "Gustavo, Luis" User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.23) Gecko/20110922 Lightning/1.0b2 Thunderbird/3.1.15 MIME-Version: 1.0 To: Pedro Alves CC: Jan Kratochvil , Joel Brobecker , gdb-patches@sourceware.org Subject: Re: [patch] update_global_location_list my comment fix [Re: [PATCH] Fix breakpoint updates for multi-inferior] References: <4F20610B.5010403@mentor.com> <4F3291D9.80705@redhat.com> <4F329468.3020307@mentor.com> <4F32990B.7060203@redhat.com> <20120208172728.GA6951@host2.jankratochvil.net> <4F3302F5.1030809@mentor.com> <20120208233211.GC19247@adacore.com> <4F3307BE.2050909@mentor.com> <20120209082230.GB10358@host2.jankratochvil.net> <4F33A85A.4090404@mentor.com> <4F33AE8C.5000400@redhat.com> In-Reply-To: <4F33AE8C.5000400@redhat.com> Content-Type: multipart/mixed; boundary="------------030304040801080606090709" X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-02/txt/msg00572.txt.bz2 This is a multi-part message in MIME format. --------------030304040801080606090709 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1582 On 02/09/2012 09:31 AM, Pedro Alves wrote: > On 02/09/2012 11:04 AM, Luis Gustavo wrote: >> On 02/09/2012 06:22 AM, Jan Kratochvil wrote: >>> On Thu, 09 Feb 2012 00:39:42 +0100, Luis Gustavo wrote: >>>> + /* Sort by pspace. This effectively sorts locations by inferior in >>>> + a multi-inferior environment. */ >>>> + >>>> + if (a->pspace != b->pspace) >>>> + return (a->pspace> b->pspace) - (a->pspace< b->pspace); >>> >>> This does not follow the comment I made: >>> >>> /* Make the internal GDB representation stable across GDB runs >>> where A and B memory inside GDB can differ. >>> >>> I would prefer there (and it will not fit on a single line :-) ): >>> >>> return (a->pspace->num> b->pspace->num) - (a->pspace->num< b->pspace->num); >>> >>> NUM should be the same on each GDB run for the same inferior / command file. >> >> I would still like to keep an appropriate comment regarding multi-inferiors next to the pspace comparison, like the following... maybe it would've been best to keep the change above your new comment. Here's a new version. >> >> What do you think? > > We need to sort by pspace even before that, before: > > /* Sort permanent breakpoints first. */ > if (a_perm != b_perm) > return (a_perm< b_perm) - (a_perm> b_perm); > > So that you don't get: > > #1 PSPACE1 ADDR1 PERM > #2 PSPACE2 ADDR1 PERM > #3 PSPACE1 ADDR1 > #4 PSPACE2 ADDR1 > > But instead: > > #1 PSPACE1 ADDR1 PERM > #2 PSPACE1 ADDR1 > #3 PSPACE2 ADDR1 PERM > #4 PSPACE2 ADDR1 > I've checked the following in... Luis --------------030304040801080606090709 Content-Type: text/x-patch; name="0001-fix_multiprocess_breaks.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-fix_multiprocess_breaks.diff" Content-length: 947 2012-02-24 Luis Machado * breakpoint.c (bp_location_compare): Sort by pspace before sorting by number. Index: gdb/gdb/breakpoint.c =================================================================== --- gdb.orig/gdb/breakpoint.c 2012-02-24 12:44:27.582553984 -0200 +++ gdb/gdb/breakpoint.c 2012-02-24 12:44:59.210553984 -0200 @@ -10609,6 +10609,14 @@ bp_location_compare (const void *ap, con if (a->address != b->address) return (a->address > b->address) - (a->address < b->address); + /* Sort locations at the same address by their pspace number, keeping + locations of the same inferior (in a multi-inferior environment) + grouped. */ + + if (a->pspace->num != b->pspace->num) + return ((a->pspace->num > b->pspace->num) + - (a->pspace->num < b->pspace->num)); + /* Sort permanent breakpoints first. */ if (a_perm != b_perm) return (a_perm < b_perm) - (a_perm > b_perm); --------------030304040801080606090709--