From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32289 invoked by alias); 14 Mar 2017 01:02:45 -0000 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 Received: (qmail 32216 invoked by uid 89); 14 Mar 2017 01:02:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.2 spammy=5469, H*F:D*nz, difficulty, H*F:D*co.nz X-HELO: mail-vk0-f46.google.com Received: from mail-vk0-f46.google.com (HELO mail-vk0-f46.google.com) (209.85.213.46) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 14 Mar 2017 01:02:38 +0000 Received: by mail-vk0-f46.google.com with SMTP id x75so44598145vke.2 for ; Mon, 13 Mar 2017 18:02:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=IaMweh3BmtfOHKb0IhUdNQplEPL2ZpD5dYnQDnWOoyQ=; b=OASTTJemCcdC++OVXshglssgj+KDGot8a4YqvuNIAGvFLx5M3duO0prBDpmJTX5Trc np5Uo2ovw45P/4iVgA3T8BuWIwqp9eXnGrbv23qWxznkxP6BYsHyiRiszqgkYFkn5dEM J6zg4NJSttV6KjuLw/8cGI/RHUd2kwJcBJ+cQYyopGbGANmL7NdeQwwmXti2KPxqxZN4 HAAuoyl4udZNd5WOOypm21Hflh01BD8cvY6T71AjQA4nnCLw5WFHv6E4ShpeOENqWAMr KIWU+Xfc5aXHVGFKcwIUN1QiMjJtLOnPC2eYjUZclsZHOSio/7hz+LiV5cbCFtOuFjbS Lq1A== X-Gm-Message-State: AMke39nySnrpFbb6XPd39dKAz4wkbf6DKwLGKa4/FtRZWQnTCIPobCztqqcvZ0bAeqP23V/Co+hcmwy1gd0APw== X-Received: by 10.31.93.66 with SMTP id r63mr16531042vkb.126.1489453357301; Mon, 13 Mar 2017 18:02:37 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.102.68 with HTTP; Mon, 13 Mar 2017 18:02:16 -0700 (PDT) In-Reply-To: <630aafbb-8684-5aea-0fa1-f0f538b4eb02@ericsson.com> References: <630aafbb-8684-5aea-0fa1-f0f538b4eb02@ericsson.com> From: Gareth McMullin Date: Tue, 14 Mar 2017 01:02:00 -0000 Message-ID: Subject: Re: [PATCH] PR remote/21188: Fix remote serial timeout To: Simon Marchi Cc: gdb-patches@sourceware.org Content-Type: multipart/mixed; boundary=001a114e005c45c2e7054aa662b4 X-IsSubscribed: yes X-SW-Source: 2017-03/txt/msg00213.txt.bz2 --001a114e005c45c2e7054aa662b4 Content-Type: text/plain; charset=UTF-8 Content-length: 833 On Fri, Mar 3, 2017 at 5:14 AM, Simon Marchi wrote: > I think I understand the problem you describe by inspecting the code. However, > I have some difficulty understanding the current and proposed code, so I can't > say if the patch looks correct. It just looks more complicated than necessary. > > For example, what's the point of the timeout_remaining field in struct serial? It > seems to ever only be used in this function. If we can remove it, it will be one > less thing to consider. We can probably have just the timeout variable that we > decrement until it's done. Thank you, Simon. I only made the smallest change needed to fix the problem. I've attached an updated patch to replace the timeout_remaining field with a local variable, and remove the unused current_timeout field. Gareth --001a114e005c45c2e7054aa662b4 Content-Type: text/x-patch; charset=US-ASCII; name="serial_timeout.patch" Content-Disposition: attachment; filename="serial_timeout.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j08txvvd0 Content-length: 3709 ZGlmZiAtLWdpdCBhL2dkYi9DaGFuZ2VMb2cgYi9nZGIvQ2hhbmdlTG9nCmlu ZGV4IDYwODUwMWIuLjExMWNmNGQgMTAwNjQ0Ci0tLSBhL2dkYi9DaGFuZ2VM b2cKKysrIGIvZ2RiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDkgQEAKKzIwMTct MDMtMTQgR2FyZXRoIE1jTXVsbGluICA8Z2FyZXRoQGJsYWNrc3BoZXJlLmNv Lm56PgorCisJUFIgcmVtb3RlLzIxMTg4CisJKiBzZXItdW5peC5jIChkb19o YXJkd2lyZV9yZWFkY2hhcik6IFdhaXQgZm9yIGZ1bGwgdGltZW91dCB0byBl bGFwc2UuCisJKiBzZXJpYWwuaCAoc2VyaWFsX3QpOiBSZW1vdmUgZmllbGRz IGN1cnJlbnRfdGltZW91dCBhbmQgdGltZW91dF9yZW1haW5pbmcuCisKIDIw MTctMDMtMTQgIFBlZHJvIEFsdmVzICA8cGFsdmVzQHJlZGhhdC5jb20+Cgog CSogY3AtbmFtZS1wYXJzZXIueSAoY3BfZGVtYW5nbGVkX25hbWVfdG9fY29t cCk6IFVwZGF0ZSBjb21tZW50LgpkaWZmIC0tZ2l0IGEvZ2RiL3Nlci11bml4 LmMgYi9nZGIvc2VyLXVuaXguYwppbmRleCBiOWU1NWYwLi43ZjczYWY4IDEw MDY0NAotLS0gYS9nZGIvc2VyLXVuaXguYworKysgYi9nZGIvc2VyLXVuaXgu YwpAQCAtNDQxLDggKzQ0MSw2IEBAIGhhcmR3aXJlX3JhdyAoc3RydWN0IHNl cmlhbCAqc2NiKQogICBzdGF0ZS5zZ3R0eWIuc2dfZmxhZ3MgJj0gfihDQlJF QUsgfCBFQ0hPKTsKICNlbmRpZgoKLSAgc2NiLT5jdXJyZW50X3RpbWVvdXQg PSAwOwotCiAgIGlmIChzZXRfdHR5X3N0YXRlIChzY2IsICZzdGF0ZSkpCiAg ICAgZnByaW50Zl91bmZpbHRlcmVkIChnZGJfc3RkZXJyLCAic2V0X3R0eV9z dGF0ZSBmYWlsZWQ6ICVzXG4iLAogCQkJc2FmZV9zdHJlcnJvciAoZXJybm8p KTsKQEAgLTU0Niw5ICs1NDQsMjEgQEAgZG9faGFyZHdpcmVfcmVhZGNoYXIg KHN0cnVjdCBzZXJpYWwgKnNjYiwgaW50IHRpbWVvdXQpCiAgICAgICBpZiAo ZGV0YWNoKQogCXJldHVybiBTRVJJQUxfVElNRU9VVDsKCi0gICAgICBzY2It PnRpbWVvdXRfcmVtYWluaW5nID0gKHRpbWVvdXQgPCAwID8gdGltZW91dCA6 IHRpbWVvdXQgLSBkZWx0YSk7CisgICAgICBpbnQgdGltZW91dF9yZW1haW5p bmcgPSAodGltZW91dCA8IDAgPyB0aW1lb3V0IDogdGltZW91dCAtIGRlbHRh KTsKICAgICAgIHN0YXR1cyA9IHdhaXRfZm9yIChzY2IsIGRlbHRhKTsKCisg ICAgICBpZiAoc3RhdHVzID09IFNFUklBTF9USU1FT1VUKSB7CisJaWYgKHRp bWVvdXRfcmVtYWluaW5nID4gMCkKKwkgIHsKKwkgICAgdGltZW91dCA9IHRp bWVvdXRfcmVtYWluaW5nOworCSAgICBjb250aW51ZTsKKwkgIH0KKwkgIGVs c2UgaWYgKHRpbWVvdXRfcmVtYWluaW5nIDwgMCkKKwkgICAgY29udGludWU7 CisJICBlbHNlCisJICAgIHJldHVybiBTRVJJQUxfVElNRU9VVDsKKyAgICAg IH0KKwogICAgICAgaWYgKHN0YXR1cyA8IDApCiAJcmV0dXJuIHN0YXR1czsK CkBAIC01NTYsMjEgKzU2Niw3IEBAIGRvX2hhcmR3aXJlX3JlYWRjaGFyIChz dHJ1Y3Qgc2VyaWFsICpzY2IsIGludCB0aW1lb3V0KQoKICAgICAgIGlmIChz dGF0dXMgPD0gMCkKIAl7Ci0JICBpZiAoc3RhdHVzID09IDApCi0JICAgIHsK LQkgICAgICAvKiBaZXJvIGNoYXJhY3RlcnMgbWVhbnMgdGltZW91dCAoaXQg Y291bGQgYWxzbyBiZSBFT0YsIGJ1dAotCSAgICAgICAgIHdlIGRvbid0ICh5 ZXQgYXQgbGVhc3QpIGRpc3Rpbmd1aXNoKS4gICovCi0JICAgICAgaWYgKHNj Yi0+dGltZW91dF9yZW1haW5pbmcgPiAwKQotCQl7Ci0JCSAgdGltZW91dCA9 IHNjYi0+dGltZW91dF9yZW1haW5pbmc7Ci0JCSAgY29udGludWU7Ci0JCX0K LQkgICAgICBlbHNlIGlmIChzY2ItPnRpbWVvdXRfcmVtYWluaW5nIDwgMCkK LQkJY29udGludWU7Ci0JICAgICAgZWxzZQotCQlyZXR1cm4gU0VSSUFMX1RJ TUVPVVQ7Ci0JICAgIH0KLQkgIGVsc2UgaWYgKGVycm5vID09IEVJTlRSKQor CSAgaWYgKGVycm5vID09IEVJTlRSKQogCSAgICBjb250aW51ZTsKIAkgIGVs c2UKIAkgICAgcmV0dXJuIFNFUklBTF9FUlJPUjsJLyogR290IGFuIGVycm9y IGZyb20gcmVhZC4gICovCmRpZmYgLS1naXQgYS9nZGIvc2VyaWFsLmggYi9n ZGIvc2VyaWFsLmgKaW5kZXggY2Y0ZTY1OS4uMjkwMDUwNyAxMDA2NDQKLS0t IGEvZ2RiL3NlcmlhbC5oCisrKyBiL2dkYi9zZXJpYWwuaApAQCAtMjUwLDEx ICsyNTAsNiBAQCBzdHJ1Y3Qgc2VyaWFsCiAJCQkJICAgYnVmZmVyLiAgLXZl IGZvciBzdGlja3kgZXJyb3JzLiAgKi8KICAgICB1bnNpZ25lZCBjaGFyICpi dWZwOwkvKiBDdXJyZW50IGJ5dGUgKi8KICAgICB1bnNpZ25lZCBjaGFyIGJ1 ZltCVUZTSVpdOwkvKiBEYSBidWZmZXIgaXRzZWxmICovCi0gICAgaW50IGN1 cnJlbnRfdGltZW91dDsJLyogKHNlci11bml4LmMgdGVybWlveyxzfSBvbmx5 KSwgbGFzdAotCQkJCSAgIHZhbHVlIG9mIFZUSU1FICovCi0gICAgaW50IHRp bWVvdXRfcmVtYWluaW5nOwkvKiAoc2VyLXVuaXguYyB0ZXJtaW97LHN9IG9u bHkpLCB3ZQotCQkJCSAgIHN0aWxsIG5lZWQgdG8gd2FpdCBmb3IgdGhpcyBt YW55Ci0JCQkJICAgbW9yZSBzZWNvbmRzLiAgKi8KICAgICBzdHJ1Y3Qgc2Vy aWFsICpuZXh0OwkvKiBQb2ludGVyIHRvIHRoZSBuZXh0IGBzdHJ1Y3Qgc2Vy aWFsIConICovCiAgICAgaW50IGRlYnVnX3A7CQkvKiBUcmFjZSB0aGlzIHNl cmlhbCBkZXZpY2VzIG9wZXJhdGlvbi4gICovCiAgICAgaW50IGFzeW5jX3N0 YXRlOwkJLyogQXN5bmMgaW50ZXJuYWwgc3RhdGUuICAqLwo= --001a114e005c45c2e7054aa662b4--