From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id i2Q1ALtqL2JdUgAAWB0awg (envelope-from ) for ; Mon, 14 Mar 2022 12:18:03 -0400 Received: by simark.ca (Postfix, from userid 112) id D48281F3CE; Mon, 14 Mar 2022 12:18:02 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, NICE_REPLY_A autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 34D5D1EDF0 for ; Mon, 14 Mar 2022 12:18:02 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7CD4D3857C4D for ; Mon, 14 Mar 2022 16:18:01 +0000 (GMT) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by sourceware.org (Postfix) with ESMTPS id 524E43858D20 for ; Mon, 14 Mar 2022 16:17:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 524E43858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f51.google.com with SMTP id k24so24830378wrd.7 for ; Mon, 14 Mar 2022 09:17:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=3i38tqWgsIXAcRwyREWvzx1xMBTreJ/shO+OoH7dydA=; b=p0a2yqPI2CjgHjaJrwxievDJ5AR3Ya5GT5GsNEOpKdHhiP7J05xBctQairYxnSUG4h 5R6yMFU8PgXQmORIVCzNOavgwEWX7HNgd6Pu+o6MpaTvnbaBDGZ2X7G/TiDXMcXwQrU6 qtNbKRE3iSUbtlVlZXDFF7tgG36Nfpdm01F11Bx85bY6vFjNYF0meX4p17opIBsGdJiV 9d0t1PirsGkzthaBdhr9q5nWBxCenzOxfcMRBRqqTBUhpNfWBxXQiqAgi49AGQP73Xos RPp9YzCg/x9VKN378T4xpysIJrihT+l35RtqcCY6ew/EdPDmGiFlHpZQuC4Y4l+bgPNl LeVQ== X-Gm-Message-State: AOAM5307egMcWGiv3X/1qtEqzKbvYuXGDCFdhKncR9/VumS/pAYCC3d0 X9bBtoTqsEJEYHPA4ZtFbFoNh5Af6q0= X-Google-Smtp-Source: ABdhPJz5u+I45wqY4YptU2yfUdE+nDY2tmmPJcycf6hD3vgQGF/O7BWgTrb3tyDLDmqdWji9QY5Qpw== X-Received: by 2002:adf:ee4b:0:b0:1f6:3413:282b with SMTP id w11-20020adfee4b000000b001f63413282bmr17166860wro.354.1647274667008; Mon, 14 Mar 2022 09:17:47 -0700 (PDT) Received: from ?IPV6:2001:8a0:f924:2600:209d:85e2:409e:8726? ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id v14-20020a7bcb4e000000b0034492fa24c6sm15301077wmj.34.2022.03.14.09.17.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Mar 2022 09:17:45 -0700 (PDT) Message-ID: <8dda0fde-1dbf-256c-88bd-82910658857f@palves.net> Date: Mon, 14 Mar 2022 16:17:44 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH] Add a timeout parameter to gdb_do_one_event Content-Language: en-US To: Patrick Monnerat , gdb-patches@sourceware.org References: <20220314144927.172620-1-patrick@monnerat.net> From: Pedro Alves In-Reply-To: <20220314144927.172620-1-patrick@monnerat.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" On 2022-03-14 14:49, Patrick Monnerat via Gdb-patches wrote: > + try > + { > + if (mstimeout > 0) > + timer_id = create_timer (mstimeout, > + [] (gdb_client_data arg) > + { > + ((gdb::optional *) arg)->reset (); > + }, > + &timer_id); > + res = gdb_wait_for_event (1); > + if (timer_id.has_value ()) > + delete_timer (*timer_id); > + } > + catch (...) > + { > + if (timer_id.has_value ()) > + delete_timer (*timer_id); > + throw; > + } Instead of duplicated code on normal and exception exits, you can use a SCOPE_EXIT: gdb::optional timer_id; SCOPE_EXIT { if (timer_id.has_value ()) delete_timer (*timer_id); }; if (mstimeout > 0) timer_id = create_timer (mstimeout, [] (gdb_client_data arg) { ((gdb::optional *) arg)->reset (); }, &timer_id); return gdb_wait_for_event (1); I think you don't even need the "res" variable this way.