From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E82B8C32771 for ; Wed, 15 Jan 2020 18:34:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BCA34214AF for ; Wed, 15 Jan 2020 18:34:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCA34214AF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irnUw-0001Kg-R0 for qemu-devel@archiver.kernel.org; Wed, 15 Jan 2020 13:34:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55812) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irnU6-0000UF-0C for qemu-devel@nongnu.org; Wed, 15 Jan 2020 13:33:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irnU3-0004hB-DO for qemu-devel@nongnu.org; Wed, 15 Jan 2020 13:33:41 -0500 Received: from 1.mo4.mail-out.ovh.net ([178.33.248.196]:35545) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irnU3-0004gB-66 for qemu-devel@nongnu.org; Wed, 15 Jan 2020 13:33:39 -0500 Received: from player772.ha.ovh.net (unknown [10.108.1.219]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id DC15A21F96F for ; Wed, 15 Jan 2020 19:33:36 +0100 (CET) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player772.ha.ovh.net (Postfix) with ESMTPSA id 53518E51772A; Wed, 15 Jan 2020 18:33:14 +0000 (UTC) Date: Wed, 15 Jan 2020 19:33:12 +0100 From: Greg Kurz To: Vladimir Sementsov-Ogievskiy Subject: Re: [PATCH v6 02/11] error: auto propagated local_err Message-ID: <20200115193312.60e965ec@bahia.lan> In-Reply-To: <20200110194158.14190-3-vsementsov@virtuozzo.com> References: <20200110194158.14190-1-vsementsov@virtuozzo.com> <20200110194158.14190-3-vsementsov@virtuozzo.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 6557241061147122003 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedugedrtdefgdduudefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepfffhvffukfgjfhfogggtgfesthhqredtredtjeenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecukfhppedtrddtrddtrddtpdekvddrvdehfedrvddtkedrvdegkeenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrjeejvddrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehgrhhouhhgsehkrghougdrohhrghdprhgtphhtthhopehqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 178.33.248.196 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stefano Stabellini , Laszlo Ersek , qemu-block@nongnu.org, Paul Durrant , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , Cornelia Huck , qemu-devel@nongnu.org, Max Reitz , Gerd Hoffmann , Stefan Hajnoczi , Anthony Perard , xen-devel@lists.xenproject.org, Michael Roth , Markus Armbruster , Stefan Berger Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 10 Jan 2020 22:41:49 +0300 Vladimir Sementsov-Ogievskiy wrote: > Here is introduced ERRP_AUTO_PROPAGATE macro, to be used at start of > functions with errp OUT parameter. >=20 > It has three goals: >=20 > 1. Fix issue with error_fatal & error_prepend/error_append_hint: user > can't see this additional information, because exit() happens in > error_setg earlier than information is added. [Reported by Greg Kurz] >=20 > 2. Fix issue with error_abort & error_propagate: when we wrap > error_abort by local_err+error_propagate, resulting coredump will > refer to error_propagate and not to the place where error happened. > (the macro itself doesn't fix the issue, but it allows to [3.] drop all > local_err+error_propagate pattern, which will definitely fix the issue) > [Reported by Kevin Wolf] >=20 > 3. Drop local_err+error_propagate pattern, which is used to workaround > void functions with errp parameter, when caller wants to know resulting > status. (Note: actually these functions could be merely updated to > return int error code). >=20 > To achieve these goals, we need to add invocation of the macro at start > of functions, which needs error_prepend/error_append_hint (1.); add > invocation of the macro at start of functions which do > local_err+error_propagate scenario the check errors, drop local errors > from them and just use *errp instead (2., 3.). >=20 > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- >=20 LGTM Reviewed-by: Greg Kurz > CC: Cornelia Huck > CC: Eric Blake > CC: Kevin Wolf > CC: Max Reitz > CC: Greg Kurz > CC: Stefan Hajnoczi > CC: Stefano Stabellini > CC: Anthony Perard > CC: Paul Durrant > CC: "Philippe Mathieu-Daud=C3=A9" > CC: Laszlo Ersek > CC: Gerd Hoffmann > CC: Stefan Berger > CC: Markus Armbruster > CC: Michael Roth > CC: qemu-block@nongnu.org > CC: xen-devel@lists.xenproject.org >=20 > include/qapi/error.h | 84 +++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 83 insertions(+), 1 deletion(-) >=20 > diff --git a/include/qapi/error.h b/include/qapi/error.h > index fa8d51fd6d..532b9afb9e 100644 > --- a/include/qapi/error.h > +++ b/include/qapi/error.h > @@ -78,7 +78,7 @@ > * Call a function treating errors as fatal: > * foo(arg, &error_fatal); > * > - * Receive an error and pass it on to the caller: > + * Receive an error and pass it on to the caller (DEPRECATED*): > * Error *err =3D NULL; > * foo(arg, &err); > * if (err) { > @@ -98,6 +98,50 @@ > * foo(arg, errp); > * for readability. > * > + * DEPRECATED* This pattern is deprecated now, use ERRP_AUTO_PROPAGATE m= acro > + * instead (defined below). > + * It's deprecated because of two things: > + * > + * 1. Issue with error_abort & error_propagate: when we wrap error_abort= by > + * local_err+error_propagate, resulting coredump will refer to error_pro= pagate > + * and not to the place where error happened. > + * > + * 2. A lot of extra code of the same pattern > + * > + * How to update old code to use ERRP_AUTO_PROPAGATE? > + * > + * All you need is to add ERRP_AUTO_PROPAGATE() invocation at function s= tart, > + * than you may safely dereference errp to check errors and do not need = any > + * additional local Error variables or calls to error_propagate(). > + * > + * Example: > + * > + * old code > + * > + * void fn(..., Error **errp) { > + * Error *err =3D NULL; > + * foo(arg, &err); > + * if (err) { > + * handle the error... > + * error_propagate(errp, err); > + * return; > + * } > + * ... > + * } > + * > + * updated code > + * > + * void fn(..., Error **errp) { > + * ERRP_AUTO_PROPAGATE(); > + * foo(arg, errp); > + * if (*errp) { > + * handle the error... > + * return; > + * } > + * ... > + * } > + * > + * > * Receive and accumulate multiple errors (first one wins): > * Error *err =3D NULL, *local_err =3D NULL; > * foo(arg, &err); > @@ -348,6 +392,44 @@ void error_set_internal(Error **errp, > ErrorClass err_class, const char *fmt, ...) > GCC_FMT_ATTR(6, 7); > =20 > +typedef struct ErrorPropagator { > + Error *local_err; > + Error **errp; > +} ErrorPropagator; > + > +static inline void error_propagator_cleanup(ErrorPropagator *prop) > +{ > + error_propagate(prop->errp, prop->local_err); > +} > + > +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(ErrorPropagator, error_propagator_clean= up); > + > +/* > + * ERRP_AUTO_PROPAGATE > + * > + * This macro is created to be the first line of a function which use > + * Error **errp parameter to report error. It's needed only in cases whe= re we > + * want to use error_prepend, error_append_hint or dereference *errp. It= 's > + * still safe (but useless) in other cases. > + * > + * If errp is NULL or points to error_fatal, it is rewritten to point to= a > + * local Error object, which will be automatically propagated to the ori= ginal > + * errp on function exit (see error_propagator_cleanup). > + * > + * After invocation of this macro it is always safe to dereference errp > + * (as it's not NULL anymore) and to add information (by error_prepend or > + * error_append_hint) > + * (as, if it was error_fatal, we swapped it with a local_error to be > + * propagated on cleanup). > + * > + * Note: we don't wrap the error_abort case, as we want resulting coredu= mp > + * to point to the place where the error happened, not to error_propagat= e. > + */ > +#define ERRP_AUTO_PROPAGATE() \ > + g_auto(ErrorPropagator) _auto_errp_prop =3D {.errp =3D errp}; \ > + errp =3D ((errp =3D=3D NULL || *errp =3D=3D error_fatal) = \ > + ? &_auto_errp_prop.local_err : errp) > + > /* > * Special error destination to abort on error. > * See error_setg() and error_propagate() for details. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28C15C33CB3 for ; Wed, 15 Jan 2020 18:34:18 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0A7AC214AF for ; Wed, 15 Jan 2020 18:34:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0A7AC214AF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1irnUC-0000Vh-C0; Wed, 15 Jan 2020 18:33:48 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1irnUB-0000Vc-E8 for xen-devel@lists.xenproject.org; Wed, 15 Jan 2020 18:33:47 +0000 X-Inumbo-ID: 8b6709fc-37c5-11ea-a2eb-bc764e2007e4 Received: from 15.mo5.mail-out.ovh.net (unknown [178.33.107.29]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8b6709fc-37c5-11ea-a2eb-bc764e2007e4; Wed, 15 Jan 2020 18:33:38 +0000 (UTC) Received: from player772.ha.ovh.net (unknown [10.108.54.108]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 13C042674DD for ; Wed, 15 Jan 2020 19:33:36 +0100 (CET) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player772.ha.ovh.net (Postfix) with ESMTPSA id 53518E51772A; Wed, 15 Jan 2020 18:33:14 +0000 (UTC) Date: Wed, 15 Jan 2020 19:33:12 +0100 From: Greg Kurz To: Vladimir Sementsov-Ogievskiy Message-ID: <20200115193312.60e965ec@bahia.lan> In-Reply-To: <20200110194158.14190-3-vsementsov@virtuozzo.com> References: <20200110194158.14190-1-vsementsov@virtuozzo.com> <20200110194158.14190-3-vsementsov@virtuozzo.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-Ovh-Tracer-Id: 6557241061147122003 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedugedrtdefgdduudefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepfffhvffukfgjfhfogggtgfesthhqredtredtjeenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecukfhppedtrddtrddtrddtpdekvddrvdehfedrvddtkedrvdegkeenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrjeejvddrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehgrhhouhhgsehkrghougdrohhrghdprhgtphhtthhopeigvghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghenucevlhhushhtvghrufhiiigvpedt Subject: Re: [Xen-devel] [PATCH v6 02/11] error: auto propagated local_err X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stefano Stabellini , Laszlo Ersek , qemu-block@nongnu.org, Paul Durrant , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , Cornelia Huck , qemu-devel@nongnu.org, Max Reitz , Gerd Hoffmann , Stefan Hajnoczi , Anthony Perard , xen-devel@lists.xenproject.org, Eric Blake , Michael Roth , Markus Armbruster , Stefan Berger Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" T24gRnJpLCAxMCBKYW4gMjAyMCAyMjo0MTo0OSArMDMwMApWbGFkaW1pciBTZW1lbnRzb3YtT2dp ZXZza2l5IDx2c2VtZW50c292QHZpcnR1b3p6by5jb20+IHdyb3RlOgoKPiBIZXJlIGlzIGludHJv ZHVjZWQgRVJSUF9BVVRPX1BST1BBR0FURSBtYWNybywgdG8gYmUgdXNlZCBhdCBzdGFydCBvZgo+ IGZ1bmN0aW9ucyB3aXRoIGVycnAgT1VUIHBhcmFtZXRlci4KPiAKPiBJdCBoYXMgdGhyZWUgZ29h bHM6Cj4gCj4gMS4gRml4IGlzc3VlIHdpdGggZXJyb3JfZmF0YWwgJiBlcnJvcl9wcmVwZW5kL2Vy cm9yX2FwcGVuZF9oaW50OiB1c2VyCj4gY2FuJ3Qgc2VlIHRoaXMgYWRkaXRpb25hbCBpbmZvcm1h dGlvbiwgYmVjYXVzZSBleGl0KCkgaGFwcGVucyBpbgo+IGVycm9yX3NldGcgZWFybGllciB0aGFu IGluZm9ybWF0aW9uIGlzIGFkZGVkLiBbUmVwb3J0ZWQgYnkgR3JlZyBLdXJ6XQo+IAo+IDIuIEZp eCBpc3N1ZSB3aXRoIGVycm9yX2Fib3J0ICYgZXJyb3JfcHJvcGFnYXRlOiB3aGVuIHdlIHdyYXAK PiBlcnJvcl9hYm9ydCBieSBsb2NhbF9lcnIrZXJyb3JfcHJvcGFnYXRlLCByZXN1bHRpbmcgY29y ZWR1bXAgd2lsbAo+IHJlZmVyIHRvIGVycm9yX3Byb3BhZ2F0ZSBhbmQgbm90IHRvIHRoZSBwbGFj ZSB3aGVyZSBlcnJvciBoYXBwZW5lZC4KPiAodGhlIG1hY3JvIGl0c2VsZiBkb2Vzbid0IGZpeCB0 aGUgaXNzdWUsIGJ1dCBpdCBhbGxvd3MgdG8gWzMuXSBkcm9wIGFsbAo+IGxvY2FsX2VycitlcnJv cl9wcm9wYWdhdGUgcGF0dGVybiwgd2hpY2ggd2lsbCBkZWZpbml0ZWx5IGZpeCB0aGUgaXNzdWUp Cj4gW1JlcG9ydGVkIGJ5IEtldmluIFdvbGZdCj4gCj4gMy4gRHJvcCBsb2NhbF9lcnIrZXJyb3Jf cHJvcGFnYXRlIHBhdHRlcm4sIHdoaWNoIGlzIHVzZWQgdG8gd29ya2Fyb3VuZAo+IHZvaWQgZnVu Y3Rpb25zIHdpdGggZXJycCBwYXJhbWV0ZXIsIHdoZW4gY2FsbGVyIHdhbnRzIHRvIGtub3cgcmVz dWx0aW5nCj4gc3RhdHVzLiAoTm90ZTogYWN0dWFsbHkgdGhlc2UgZnVuY3Rpb25zIGNvdWxkIGJl IG1lcmVseSB1cGRhdGVkIHRvCj4gcmV0dXJuIGludCBlcnJvciBjb2RlKS4KPiAKPiBUbyBhY2hp ZXZlIHRoZXNlIGdvYWxzLCB3ZSBuZWVkIHRvIGFkZCBpbnZvY2F0aW9uIG9mIHRoZSBtYWNybyBh dCBzdGFydAo+IG9mIGZ1bmN0aW9ucywgd2hpY2ggbmVlZHMgZXJyb3JfcHJlcGVuZC9lcnJvcl9h cHBlbmRfaGludCAoMS4pOyBhZGQKPiBpbnZvY2F0aW9uIG9mIHRoZSBtYWNybyBhdCBzdGFydCBv ZiBmdW5jdGlvbnMgd2hpY2ggZG8KPiBsb2NhbF9lcnIrZXJyb3JfcHJvcGFnYXRlIHNjZW5hcmlv IHRoZSBjaGVjayBlcnJvcnMsIGRyb3AgbG9jYWwgZXJyb3JzCj4gZnJvbSB0aGVtIGFuZCBqdXN0 IHVzZSAqZXJycCBpbnN0ZWFkICgyLiwgMy4pLgo+IAo+IFNpZ25lZC1vZmYtYnk6IFZsYWRpbWly IFNlbWVudHNvdi1PZ2lldnNraXkgPHZzZW1lbnRzb3ZAdmlydHVvenpvLmNvbT4KPiAtLS0KPiAK CkxHVE0KClJldmlld2VkLWJ5OiBHcmVnIEt1cnogPGdyb3VnQGthb2Qub3JnPgoKPiBDQzogQ29y bmVsaWEgSHVjayA8Y29odWNrQHJlZGhhdC5jb20+Cj4gQ0M6IEVyaWMgQmxha2UgPGVibGFrZUBy ZWRoYXQuY29tPgo+IENDOiBLZXZpbiBXb2xmIDxrd29sZkByZWRoYXQuY29tPgo+IENDOiBNYXgg UmVpdHogPG1yZWl0ekByZWRoYXQuY29tPgo+IENDOiBHcmVnIEt1cnogPGdyb3VnQGthb2Qub3Jn Pgo+IENDOiBTdGVmYW4gSGFqbm9jemkgPHN0ZWZhbmhhQHJlZGhhdC5jb20+Cj4gQ0M6IFN0ZWZh bm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KPiBDQzogQW50aG9ueSBQZXJh cmQgPGFudGhvbnkucGVyYXJkQGNpdHJpeC5jb20+Cj4gQ0M6IFBhdWwgRHVycmFudCA8cGF1bEB4 ZW4ub3JnPgo+IENDOiAiUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kiIDxwaGlsbWRAcmVkaGF0LmNv bT4KPiBDQzogTGFzemxvIEVyc2VrIDxsZXJzZWtAcmVkaGF0LmNvbT4KPiBDQzogR2VyZCBIb2Zm bWFubiA8a3JheGVsQHJlZGhhdC5jb20+Cj4gQ0M6IFN0ZWZhbiBCZXJnZXIgPHN0ZWZhbmJAbGlu dXguaWJtLmNvbT4KPiBDQzogTWFya3VzIEFybWJydXN0ZXIgPGFybWJydUByZWRoYXQuY29tPgo+ IENDOiBNaWNoYWVsIFJvdGggPG1kcm90aEBsaW51eC52bmV0LmlibS5jb20+Cj4gQ0M6IHFlbXUt YmxvY2tAbm9uZ251Lm9yZwo+IENDOiB4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKPiAK PiAgaW5jbHVkZS9xYXBpL2Vycm9yLmggfCA4NCArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLQo+ICAxIGZpbGUgY2hhbmdlZCwgODMgaW5zZXJ0aW9ucygrKSwgMSBk ZWxldGlvbigtKQo+IAo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL3FhcGkvZXJyb3IuaCBiL2luY2x1 ZGUvcWFwaS9lcnJvci5oCj4gaW5kZXggZmE4ZDUxZmQ2ZC4uNTMyYjlhZmI5ZSAxMDA2NDQKPiAt LS0gYS9pbmNsdWRlL3FhcGkvZXJyb3IuaAo+ICsrKyBiL2luY2x1ZGUvcWFwaS9lcnJvci5oCj4g QEAgLTc4LDcgKzc4LDcgQEAKPiAgICogQ2FsbCBhIGZ1bmN0aW9uIHRyZWF0aW5nIGVycm9ycyBh cyBmYXRhbDoKPiAgICogICAgIGZvbyhhcmcsICZlcnJvcl9mYXRhbCk7Cj4gICAqCj4gLSAqIFJl Y2VpdmUgYW4gZXJyb3IgYW5kIHBhc3MgaXQgb24gdG8gdGhlIGNhbGxlcjoKPiArICogUmVjZWl2 ZSBhbiBlcnJvciBhbmQgcGFzcyBpdCBvbiB0byB0aGUgY2FsbGVyIChERVBSRUNBVEVEKik6Cj4g ICAqICAgICBFcnJvciAqZXJyID0gTlVMTDsKPiAgICogICAgIGZvbyhhcmcsICZlcnIpOwo+ICAg KiAgICAgaWYgKGVycikgewo+IEBAIC05OCw2ICs5OCw1MCBAQAo+ICAgKiAgICAgZm9vKGFyZywg ZXJycCk7Cj4gICAqIGZvciByZWFkYWJpbGl0eS4KPiAgICoKPiArICogREVQUkVDQVRFRCogVGhp cyBwYXR0ZXJuIGlzIGRlcHJlY2F0ZWQgbm93LCB1c2UgRVJSUF9BVVRPX1BST1BBR0FURSBtYWNy bwo+ICsgKiBpbnN0ZWFkIChkZWZpbmVkIGJlbG93KS4KPiArICogSXQncyBkZXByZWNhdGVkIGJl Y2F1c2Ugb2YgdHdvIHRoaW5nczoKPiArICoKPiArICogMS4gSXNzdWUgd2l0aCBlcnJvcl9hYm9y dCAmIGVycm9yX3Byb3BhZ2F0ZTogd2hlbiB3ZSB3cmFwIGVycm9yX2Fib3J0IGJ5Cj4gKyAqIGxv Y2FsX2VycitlcnJvcl9wcm9wYWdhdGUsIHJlc3VsdGluZyBjb3JlZHVtcCB3aWxsIHJlZmVyIHRv IGVycm9yX3Byb3BhZ2F0ZQo+ICsgKiBhbmQgbm90IHRvIHRoZSBwbGFjZSB3aGVyZSBlcnJvciBo YXBwZW5lZC4KPiArICoKPiArICogMi4gQSBsb3Qgb2YgZXh0cmEgY29kZSBvZiB0aGUgc2FtZSBw YXR0ZXJuCj4gKyAqCj4gKyAqIEhvdyB0byB1cGRhdGUgb2xkIGNvZGUgdG8gdXNlIEVSUlBfQVVU T19QUk9QQUdBVEU/Cj4gKyAqCj4gKyAqIEFsbCB5b3UgbmVlZCBpcyB0byBhZGQgRVJSUF9BVVRP X1BST1BBR0FURSgpIGludm9jYXRpb24gYXQgZnVuY3Rpb24gc3RhcnQsCj4gKyAqIHRoYW4geW91 IG1heSBzYWZlbHkgZGVyZWZlcmVuY2UgZXJycCB0byBjaGVjayBlcnJvcnMgYW5kIGRvIG5vdCBu ZWVkIGFueQo+ICsgKiBhZGRpdGlvbmFsIGxvY2FsIEVycm9yIHZhcmlhYmxlcyBvciBjYWxscyB0 byBlcnJvcl9wcm9wYWdhdGUoKS4KPiArICoKPiArICogRXhhbXBsZToKPiArICoKPiArICogb2xk IGNvZGUKPiArICoKPiArICogICAgIHZvaWQgZm4oLi4uLCBFcnJvciAqKmVycnApIHsKPiArICog ICAgICAgICBFcnJvciAqZXJyID0gTlVMTDsKPiArICogICAgICAgICBmb28oYXJnLCAmZXJyKTsK PiArICogICAgICAgICBpZiAoZXJyKSB7Cj4gKyAqICAgICAgICAgICAgIGhhbmRsZSB0aGUgZXJy b3IuLi4KPiArICogICAgICAgICAgICAgZXJyb3JfcHJvcGFnYXRlKGVycnAsIGVycik7Cj4gKyAq ICAgICAgICAgICAgIHJldHVybjsKPiArICogICAgICAgICB9Cj4gKyAqICAgICAgICAgLi4uCj4g KyAqICAgICB9Cj4gKyAqCj4gKyAqIHVwZGF0ZWQgY29kZQo+ICsgKgo+ICsgKiAgICAgdm9pZCBm biguLi4sIEVycm9yICoqZXJycCkgewo+ICsgKiAgICAgICAgIEVSUlBfQVVUT19QUk9QQUdBVEUo KTsKPiArICogICAgICAgICBmb28oYXJnLCBlcnJwKTsKPiArICogICAgICAgICBpZiAoKmVycnAp IHsKPiArICogICAgICAgICAgICAgaGFuZGxlIHRoZSBlcnJvci4uLgo+ICsgKiAgICAgICAgICAg ICByZXR1cm47Cj4gKyAqICAgICAgICAgfQo+ICsgKiAgICAgICAgIC4uLgo+ICsgKiAgICAgfQo+ ICsgKgo+ICsgKgo+ICAgKiBSZWNlaXZlIGFuZCBhY2N1bXVsYXRlIG11bHRpcGxlIGVycm9ycyAo Zmlyc3Qgb25lIHdpbnMpOgo+ICAgKiAgICAgRXJyb3IgKmVyciA9IE5VTEwsICpsb2NhbF9lcnIg PSBOVUxMOwo+ICAgKiAgICAgZm9vKGFyZywgJmVycik7Cj4gQEAgLTM0OCw2ICszOTIsNDQgQEAg dm9pZCBlcnJvcl9zZXRfaW50ZXJuYWwoRXJyb3IgKiplcnJwLAo+ICAgICAgICAgICAgICAgICAg ICAgICAgICBFcnJvckNsYXNzIGVycl9jbGFzcywgY29uc3QgY2hhciAqZm10LCAuLi4pCj4gICAg ICBHQ0NfRk1UX0FUVFIoNiwgNyk7Cj4gIAo+ICt0eXBlZGVmIHN0cnVjdCBFcnJvclByb3BhZ2F0 b3Igewo+ICsgICAgRXJyb3IgKmxvY2FsX2VycjsKPiArICAgIEVycm9yICoqZXJycDsKPiArfSBF cnJvclByb3BhZ2F0b3I7Cj4gKwo+ICtzdGF0aWMgaW5saW5lIHZvaWQgZXJyb3JfcHJvcGFnYXRv cl9jbGVhbnVwKEVycm9yUHJvcGFnYXRvciAqcHJvcCkKPiArewo+ICsgICAgZXJyb3JfcHJvcGFn YXRlKHByb3AtPmVycnAsIHByb3AtPmxvY2FsX2Vycik7Cj4gK30KPiArCj4gK0dfREVGSU5FX0FV VE9fQ0xFQU5VUF9DTEVBUl9GVU5DKEVycm9yUHJvcGFnYXRvciwgZXJyb3JfcHJvcGFnYXRvcl9j bGVhbnVwKTsKPiArCj4gKy8qCj4gKyAqIEVSUlBfQVVUT19QUk9QQUdBVEUKPiArICoKPiArICog VGhpcyBtYWNybyBpcyBjcmVhdGVkIHRvIGJlIHRoZSBmaXJzdCBsaW5lIG9mIGEgZnVuY3Rpb24g d2hpY2ggdXNlCj4gKyAqIEVycm9yICoqZXJycCBwYXJhbWV0ZXIgdG8gcmVwb3J0IGVycm9yLiBJ dCdzIG5lZWRlZCBvbmx5IGluIGNhc2VzIHdoZXJlIHdlCj4gKyAqIHdhbnQgdG8gdXNlIGVycm9y X3ByZXBlbmQsIGVycm9yX2FwcGVuZF9oaW50IG9yIGRlcmVmZXJlbmNlICplcnJwLiBJdCdzCj4g KyAqIHN0aWxsIHNhZmUgKGJ1dCB1c2VsZXNzKSBpbiBvdGhlciBjYXNlcy4KPiArICoKPiArICog SWYgZXJycCBpcyBOVUxMIG9yIHBvaW50cyB0byBlcnJvcl9mYXRhbCwgaXQgaXMgcmV3cml0dGVu IHRvIHBvaW50IHRvIGEKPiArICogbG9jYWwgRXJyb3Igb2JqZWN0LCB3aGljaCB3aWxsIGJlIGF1 dG9tYXRpY2FsbHkgcHJvcGFnYXRlZCB0byB0aGUgb3JpZ2luYWwKPiArICogZXJycCBvbiBmdW5j dGlvbiBleGl0IChzZWUgZXJyb3JfcHJvcGFnYXRvcl9jbGVhbnVwKS4KPiArICoKPiArICogQWZ0 ZXIgaW52b2NhdGlvbiBvZiB0aGlzIG1hY3JvIGl0IGlzIGFsd2F5cyBzYWZlIHRvIGRlcmVmZXJl bmNlIGVycnAKPiArICogKGFzIGl0J3Mgbm90IE5VTEwgYW55bW9yZSkgYW5kIHRvIGFkZCBpbmZv cm1hdGlvbiAoYnkgZXJyb3JfcHJlcGVuZCBvcgo+ICsgKiBlcnJvcl9hcHBlbmRfaGludCkKPiAr ICogKGFzLCBpZiBpdCB3YXMgZXJyb3JfZmF0YWwsIHdlIHN3YXBwZWQgaXQgd2l0aCBhIGxvY2Fs X2Vycm9yIHRvIGJlCj4gKyAqIHByb3BhZ2F0ZWQgb24gY2xlYW51cCkuCj4gKyAqCj4gKyAqIE5v dGU6IHdlIGRvbid0IHdyYXAgdGhlIGVycm9yX2Fib3J0IGNhc2UsIGFzIHdlIHdhbnQgcmVzdWx0 aW5nIGNvcmVkdW1wCj4gKyAqIHRvIHBvaW50IHRvIHRoZSBwbGFjZSB3aGVyZSB0aGUgZXJyb3Ig aGFwcGVuZWQsIG5vdCB0byBlcnJvcl9wcm9wYWdhdGUuCj4gKyAqLwo+ICsjZGVmaW5lIEVSUlBf QVVUT19QUk9QQUdBVEUoKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCj4gKyAg ICBnX2F1dG8oRXJyb3JQcm9wYWdhdG9yKSBfYXV0b19lcnJwX3Byb3AgPSB7LmVycnAgPSBlcnJw fTsgIFwKPiArICAgIGVycnAgPSAoKGVycnAgPT0gTlVMTCB8fCAqZXJycCA9PSBlcnJvcl9mYXRh bCkgICAgICAgICAgICAgXAo+ICsgICAgICAgICAgICA/ICZfYXV0b19lcnJwX3Byb3AubG9jYWxf ZXJyIDogZXJycCkKPiArCj4gIC8qCj4gICAqIFNwZWNpYWwgZXJyb3IgZGVzdGluYXRpb24gdG8g YWJvcnQgb24gZXJyb3IuCj4gICAqIFNlZSBlcnJvcl9zZXRnKCkgYW5kIGVycm9yX3Byb3BhZ2F0 ZSgpIGZvciBkZXRhaWxzLgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2pl Y3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4t ZGV2ZWw=