From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27518 invoked by alias); 15 Dec 2011 18:15:35 -0000 Received: (qmail 27500 invoked by uid 22791); 15 Dec 2011 18:15:34 -0000 X-SWARE-Spam-Status: No, hits=-4.0 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RP_MATCHES_RCVD,TW_RV,TW_TR X-Spam-Check-By: sourceware.org Received: from mail-vw0-f41.google.com (HELO mail-vw0-f41.google.com) (209.85.212.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 15 Dec 2011 18:15:19 +0000 Received: by vbbfn1 with SMTP id fn1so2108088vbb.0 for ; Thu, 15 Dec 2011 10:15:18 -0800 (PST) Received: by 10.52.95.84 with SMTP id di20mr3993645vdb.63.1323972918199; Thu, 15 Dec 2011 10:15:18 -0800 (PST) MIME-Version: 1.0 Received: by 10.52.95.84 with SMTP id di20mr3993633vdb.63.1323972918060; Thu, 15 Dec 2011 10:15:18 -0800 (PST) Received: by 10.220.199.4 with HTTP; Thu, 15 Dec 2011 10:15:17 -0800 (PST) In-Reply-To: References: <20111214220625.31BFB2461AD@ruffy.mtv.corp.google.com> Date: Thu, 15 Dec 2011 18:45:00 -0000 Message-ID: Subject: Re: [patch] handle nested exceptions From: Doug Evans To: Tom Tromey Cc: gdb-patches@sourceware.org, cmtice@google.com X-System-Of-Record: true Content-Type: multipart/mixed; boundary=20cf307f361a79265204b425773f 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: 2011-12/txt/msg00506.txt.bz2 --20cf307f361a79265204b425773f Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-length: 1212 On Thu, Dec 15, 2011 at 6:58 AM, Tom Tromey wrote: >>>>>> "Doug" =3D=3D Doug Evans writes: > > Doug> I will check this in in a few days if there are no objections. > Doug> 2011-12-14 =A0Doug Evans =A0 > > Doug> =A0 * exceptions.c (catcher_list_size): New function. > Doug> =A0 (last_message): Delete. > Doug> =A0 (exception_messages, exception_messages_size): New static globa= ls. > Doug> =A0 (throw_it): Use exception_messages array to handle nested calls. > > It seems good to me. > > It was a little hard to understand why this was the right approach. > Actually I am not 100% sure I have convinced myself. > I think a comment explaining the motivating scenario would help. The motivating scenario is when we call throw_it instead a cleanup due to an earlier throw_it. [Actually, for the case at hand there were multiple calls to throw_it during the cleanup.] How's this? 2011-12-15 Doug Evans * exceptions.c (catcher_list_size): New function. (last_message): Delete. (exception_messages, exception_messages_size): New static globals. (throw_it): Use exception_messages array to handle nested calls. --20cf307f361a79265204b425773f Content-Type: text/plain; charset=US-ASCII; name="gdb-111215-nested-throw-it-3.patch.txt" Content-Disposition: attachment; filename="gdb-111215-nested-throw-it-3.patch.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gw839i960 Content-length: 4417 MjAxMS0xMi0xNSAgRG91ZyBFdmFucyAgPGRqZUBnb29nbGUuY29tPgoKCSog ZXhjZXB0aW9ucy5jIChjYXRjaGVyX2xpc3Rfc2l6ZSk6IE5ldyBmdW5jdGlv bi4KCShsYXN0X21lc3NhZ2UpOiBEZWxldGUuCgkoZXhjZXB0aW9uX21lc3Nh Z2VzLCBleGNlcHRpb25fbWVzc2FnZXNfc2l6ZSk6IE5ldyBzdGF0aWMgZ2xv YmFscy4KCSh0aHJvd19pdCk6IFVzZSBleGNlcHRpb25fbWVzc2FnZXMgYXJy YXkgdG8gaGFuZGxlIG5lc3RlZCBjYWxscy4KCkluZGV4OiBleGNlcHRpb25z LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9zcmMv c3JjL2dkYi9leGNlcHRpb25zLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEu NDgKZGlmZiAtdSAtcCAtcjEuNDggZXhjZXB0aW9ucy5jCi0tLSBleGNlcHRp b25zLmMJMjYgQXVnIDIwMTEgMjE6NDU6MjIgLTAwMDAJMS40OAorKysgZXhj ZXB0aW9ucy5jCTE1IERlYyAyMDExIDE3OjU4OjUxIC0wMDAwCkBAIC02OCw2 ICs2OCwyMiBAQCBzdHJ1Y3QgY2F0Y2hlcgogLyogV2hlcmUgdG8gZ28gZm9y IHRocm93X2V4Y2VwdGlvbigpLiAgKi8KIHN0YXRpYyBzdHJ1Y3QgY2F0Y2hl ciAqY3VycmVudF9jYXRjaGVyOwogCisvKiBSZXR1cm4gbGVuZ3RoIG9mIGN1 cnJlbnRfY2F0Y2hlciBsaXN0LiAgKi8KKworc3RhdGljIGludAorY2F0Y2hl cl9saXN0X3NpemUgKHZvaWQpCit7CisgIGludCBzaXplOworICBzdHJ1Y3Qg Y2F0Y2hlciAqY2F0Y2hlcjsKKworICBmb3IgKHNpemUgPSAwLCBjYXRjaGVy ID0gY3VycmVudF9jYXRjaGVyOworICAgICAgIGNhdGNoZXIgIT0gTlVMTDsK KyAgICAgICBjYXRjaGVyID0gY2F0Y2hlci0+cHJldikKKyAgICArK3NpemU7 CisKKyAgcmV0dXJuIHNpemU7Cit9CisKIEVYQ0VQVElPTlNfU0lHSk1QX0JV RiAqCiBleGNlcHRpb25zX3N0YXRlX21jX2luaXQgKHZvbGF0aWxlIHN0cnVj dCBnZGJfZXhjZXB0aW9uICpleGNlcHRpb24sCiAJCQkgIHJldHVybl9tYXNr IG1hc2spCkBAIC0yMjAsOCArMjM2LDYgQEAgdGhyb3dfZXhjZXB0aW9uIChz dHJ1Y3QgZ2RiX2V4Y2VwdGlvbiBleAogICBFWENFUFRJT05TX1NJR0xPTkdK TVAgKGN1cnJlbnRfY2F0Y2hlci0+YnVmLCBleGNlcHRpb24ucmVhc29uKTsK IH0KIAotc3RhdGljIGNoYXIgKmxhc3RfbWVzc2FnZTsKLQogdm9pZAogZGVw cmVjYXRlZF90aHJvd19yZWFzb24gKGVudW0gcmV0dXJuX3JlYXNvbiByZWFz b24pCiB7CkBAIC0zNTksMjMgKzM3Myw1MyBAQCBwcmludF9hbnlfZXhjZXB0 aW9uIChzdHJ1Y3QgdWlfZmlsZSAqZmlsCiAgICAgfQogfQogCisvKiBBIHN0 YWNrIG9mIGV4Y2VwdGlvbiBtZXNzYWdlcy4KKyAgIFRoaXMgaXMgbmVlZGVk IHRvIGhhbmRsZSBuZXN0ZWQgY2FsbHMgdG8gdGhyb3dfaXQ6IHdlIGRvbid0 IHdhbnQgdG8KKyAgIHhmcmVlIHNwYWNlIGZvciBhIG1lc3NhZ2UgYmVmb3Jl IGl0J3MgdXNlZC4KKyAgIFRoaXMgY2FuIGhhcHBlbiBpZiB3ZSB0aHJvdyBh biBleGNlcHRpb24gZHVyaW5nIGEgY2xlYW51cDoKKyAgIEFuIG91dGVyIFRS WV9DQVRDSCBtYXkgaGF2ZSBhbiBleGNlcHRpb24gbWVzc2FnZSBpdCB3YW50 cyB0byBwcmludCwKKyAgIGJ1dCB3aGlsZSBkb2luZyBjbGVhbnVwcyBmdXJ0 aGVyIGNhbGxzIHRvIHRocm93X2l0IGFyZSBtYWRlLgorCisgICBUaGlzIGlz IGluZGV4ZWQgYnkgdGhlIHNpemUgb2YgdGhlIGN1cnJlbnRfY2F0Y2hlciBs aXN0LgorICAgSXQgaXMgYSBkeW5hbWljYWxseSBhbGxvY2F0ZWQgYXJyYXkg c28gdGhhdCB3ZSBkb24ndCBjYXJlIGhvdyBkZWVwbHkKKyAgIEdEQiBuZXN0 cyBpdHMgVFJZX0NBVENIcy4gICovCitzdGF0aWMgY2hhciAqKmV4Y2VwdGlv bl9tZXNzYWdlczsKKworLyogVGhlIG51bWJlciBvZiBjdXJyZW50bHkgYWxs b2NhdGVkIGVudHJpZXMgaW4gZXhjZXB0aW9uX21lc3NhZ2VzLiAgKi8KK3N0 YXRpYyBpbnQgZXhjZXB0aW9uX21lc3NhZ2VzX3NpemU7CisKIHN0YXRpYyB2 b2lkIEFUVFJJQlVURV9OT1JFVFVSTiBBVFRSSUJVVEVfUFJJTlRGICgzLCAw KQogdGhyb3dfaXQgKGVudW0gcmV0dXJuX3JlYXNvbiByZWFzb24sIGVudW0g ZXJyb3JzIGVycm9yLCBjb25zdCBjaGFyICpmbXQsCiAJICB2YV9saXN0IGFw KQogewogICBzdHJ1Y3QgZ2RiX2V4Y2VwdGlvbiBlOwogICBjaGFyICpuZXdf bWVzc2FnZTsKKyAgaW50IGRlcHRoID0gY2F0Y2hlcl9saXN0X3NpemUgKCk7 CiAKLSAgLyogU2F2ZSB0aGUgbWVzc2FnZS4gIENyZWF0ZSB0aGUgbmV3IG1l c3NhZ2UgYmVmb3JlIGRlbGV0aW5nIHRoZQotICAgICBvbGQsIHRoZSBuZXcg bWVzc2FnZSBtYXkgaW5jbHVkZSB0aGUgb2xkIG1lc3NhZ2UgdGV4dC4gICov CisgIGdkYl9hc3NlcnQgKGRlcHRoID4gMCk7CisKKyAgLyogTm90ZTogVGhl IG5ldyBtZXNzYWdlIG1heSB1c2UgYW4gb2xkIG1lc3NhZ2UncyB0ZXh0LiAg Ki8KICAgbmV3X21lc3NhZ2UgPSB4c3RydnByaW50ZiAoZm10LCBhcCk7Ci0g IHhmcmVlIChsYXN0X21lc3NhZ2UpOwotICBsYXN0X21lc3NhZ2UgPSBuZXdf bWVzc2FnZTsKKworICBpZiAoZGVwdGggPiBleGNlcHRpb25fbWVzc2FnZXNf c2l6ZSkKKyAgICB7CisgICAgICBpbnQgb2xkX3NpemUgPSBleGNlcHRpb25f bWVzc2FnZXNfc2l6ZTsKKworICAgICAgZXhjZXB0aW9uX21lc3NhZ2VzX3Np emUgPSBkZXB0aCArIDEwOworICAgICAgZXhjZXB0aW9uX21lc3NhZ2VzID0g KGNoYXIgKiopIHhyZWFsbG9jIChleGNlcHRpb25fbWVzc2FnZXMsCisJCQkJ CSAgICAgICBleGNlcHRpb25fbWVzc2FnZXNfc2l6ZQorCQkJCQkgICAgICAg KiBzaXplb2YgKGNoYXIgKikpOworICAgICAgbWVtc2V0IChleGNlcHRpb25f bWVzc2FnZXMgKyBvbGRfc2l6ZSwgMCwKKwkgICAgICAoZXhjZXB0aW9uX21l c3NhZ2VzX3NpemUgLSBvbGRfc2l6ZSkgKiBzaXplb2YgKGNoYXIgKikpOwor ICAgIH0KKworICB4ZnJlZSAoZXhjZXB0aW9uX21lc3NhZ2VzW2RlcHRoIC0g MV0pOworICBleGNlcHRpb25fbWVzc2FnZXNbZGVwdGggLSAxXSA9IG5ld19t ZXNzYWdlOwogCiAgIC8qIENyZWF0ZSB0aGUgZXhjZXB0aW9uLiAgKi8KICAg ZS5yZWFzb24gPSByZWFzb247CiAgIGUuZXJyb3IgPSBlcnJvcjsKLSAgZS5t ZXNzYWdlID0gbGFzdF9tZXNzYWdlOworICBlLm1lc3NhZ2UgPSBuZXdfbWVz c2FnZTsKIAogICAvKiBUaHJvdyB0aGUgZXhjZXB0aW9uLiAgKi8KICAgdGhy b3dfZXhjZXB0aW9uIChlKTsK --20cf307f361a79265204b425773f--