205679 2020-01-01 20:13:13 -0800 Reformat ProcessThrottler logging 2020-01-08 20:29:05 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=205680 https://bugs.webkit.org/show_bug.cgi?id=205683 https://bugs.webkit.org/show_bug.cgi?id=205691 https://bugs.webkit.org/show_bug.cgi?id=205705 https://bugs.webkit.org/show_bug.cgi?id=205869 https://bugs.webkit.org/show_bug.cgi?id=205882 https://bugs.webkit.org/show_bug.cgi?id=205884 https://bugs.webkit.org/show_bug.cgi?id=205984 InRadar P2 Normal --- 1 krollin krollin achristensen cdumez commit-queue webkit-bug-importer oldest_to_newest 1602123 0 krollin 2020-01-01 20:13:13 -0800 Update the format used by ProcessThrottler in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: <object-address> - [<values that help thread together operations>] <class>::<method>: <message and other useful values> So, for example: [PID: 0] 0x1145ce5e8 - ProcessThrottler::invalidateAllActivities() BEGIN becomes: 0x1145ce5e8 - [PID: 0] ProcessThrottler::invalidateAllActivities: BEGIN 1602124 1 webkit-bug-importer 2020-01-01 20:13:23 -0800 <rdar://problem/58265958> 1602125 2 386594 krollin 2020-01-01 20:15:31 -0800 Created attachment 386594 Patch 1602173 3 386594 achristensen 2020-01-02 10:53:13 -0800 Comment on attachment 386594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386594&action=review > Source/WebKit/UIProcess/ProcessThrottler.h:86 > + PROCESSTHROTTLER_ACTIVITY_RELEASE_LOG("invalidate: Ending %{public}s activity / '%{public}s'", Alternatively you could move these implementations to the cpp file and not have new macros named PROCESSTHROTTLER_ACTIVITY_RELEASE_LOG 1602203 4 krollin 2020-01-02 12:38:40 -0800 (In reply to Alex Christensen from comment #3) > Alternatively you could move these implementations to the cpp file and not > have new macros named PROCESSTHROTTLER_ACTIVITY_RELEASE_LOG Regardless of where the implementation is, I'd still have PROCESSTHROTTLER_ACTIVITY_RELEASE_LOG, since the point of that macro is to identify that the method is from ProcessThrottler::Activity. 1602215 5 commit-queue 2020-01-02 13:24:08 -0800 The commit-queue encountered the following flaky tests while processing attachment 386594: highlight/highlight-world-leak.html bug 205643 (author: megan_gardner@apple.com) The commit-queue is continuing to process your patch. 1602216 6 386594 commit-queue 2020-01-02 13:25:02 -0800 Comment on attachment 386594 Patch Clearing flags on attachment: 386594 Committed r253980: <https://trac.webkit.org/changeset/253980> 1602217 7 commit-queue 2020-01-02 13:25:03 -0800 All reviewed patches have been landed. Closing bug. 386594 2020-01-01 20:15:31 -0800 2020-01-02 13:25:02 -0800 Patch bug-205679-20200101201530.patch text/plain 11161 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzODg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc3YzQ2ZDdmNGY5ZDhjNTgy NzkzZTg2ZDlhMDBjNzQ4NTUwYWQ4MDAuLmVkMTBjNWQ2MDYyZWE1NjZlYWRiZjFmNmJlMmNhMzU5 YWViYWMzNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjAtMDEtMDEgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlZm9ybWF0IFByb2Nlc3NUaHJv dHRsZXIgbG9nZ2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA1Njc5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODI2NTk1OD4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIGZvcm1h dCB1c2VkIGJ5IFByb2Nlc3NUaHJvdHRsZXIgaW4gaXRzIFJFTEVBU0VfTE9HIGxvZ2dpbmcuCisg ICAgICAgIFVzZSB0aGUgZm9ybWF0IHVzZWQgYnkgV2ViUGFnZVByb3h5IGFuZCBOZXR3b3JrUmVz b3VyY2VMb2FkZXIsIHdoaWNoCisgICAgICAgIGlzIGdlbmVyYWxseSBvZiB0aGUgZm9ybToKKwor ICAgICAgICAgICAgPG9iamVjdC1hZGRyZXNzPiAtIFs8dmFsdWVzIHRoYXQgaGVscCB0aHJlYWQg dG9nZXRoZXIgb3BlcmF0aW9ucz5dIDxjbGFzcz46OjxtZXRob2Q+OiA8bWVzc2FnZSBhbmQgb3Ro ZXIgdXNlZnVsIHZhbHVlcz4KKworICAgICAgICBTbywgZm9yIGV4YW1wbGU6CisKKyAgICAgICAg ICAgIFtQSUQ6IDBdIDB4MTE0NWNlNWU4IC0gUHJvY2Vzc1Rocm90dGxlcjo6aW52YWxpZGF0ZUFs bEFjdGl2aXRpZXMoKSBCRUdJTgorCisgICAgICAgIGJlY29tZXM6CisKKyAgICAgICAgICAgIDB4 MTE0NWNlNWU4IC0gW1BJRDogMF0gUHJvY2Vzc1Rocm90dGxlcjo6aW52YWxpZGF0ZUFsbEFjdGl2 aXRpZXM6IEJFR0lOCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0gbm8gYWRkZWQgb3IgY2hhbmdl ZCBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIu Y3BwOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzVGhyb3R0bGVyOjppbnZhbGlkYXRlQWxsQWN0 aXZpdGllcyk6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NUaHJvdHRsZXI6OnNldEFzc2VydGlv blN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc1Rocm90dGxlcjo6dXBkYXRlQXNzZXJ0 aW9uSWZOZWVkZWQpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzVGhyb3R0bGVyOjpkaWRDb25u ZWN0VG9Qcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc1Rocm90dGxlcjo6cHJlcGFy ZVRvU3VzcGVuZFRpbWVvdXRUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc1Ro cm90dGxlcjo6cHJvY2Vzc1JlYWR5VG9TdXNwZW5kKToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vz c1Rocm90dGxlcjo6c2VuZFByZXBhcmVUb1N1c3BlbmRJUEMpOgorICAgICAgICAoV2ViS2l0OjpQ cm9jZXNzVGhyb3R0bGVyOjp1aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oOgorICAgICAgICAoV2ViS2l0OjpQcm9j ZXNzVGhyb3R0bGVyOjpBY3Rpdml0eTo6QWN0aXZpdHkpOgorICAgICAgICAoV2ViS2l0OjpQcm9j ZXNzVGhyb3R0bGVyOjpBY3Rpdml0eTo6aW52YWxpZGF0ZSk6CisKIDIwMTktMTItMjMgIEFsZXhl eSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgd2F0Y2hPUyBidWlsZCBm aXggYXR0ZW1wdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Ro cm90dGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNw cAppbmRleCA4MmQzZjE3MDdjNDcxOTljZDIyNWI0ZGJjMmYzMGQwNjA2ZmVmMmNjLi42OTBiMjQx NTUxOWRjNmEyNjNkZWU5YmVmOGJlNmRiNzEwZTgzN2Y4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcApAQCAtNzgsMTIgKzc4LDEyIEBAIHZvaWQgUHJv Y2Vzc1Rocm90dGxlcjo6cmVtb3ZlQWN0aXZpdHkoQmFja2dyb3VuZEFjdGl2aXR5JiBhY3Rpdml0 eSkKIAogdm9pZCBQcm9jZXNzVGhyb3R0bGVyOjppbnZhbGlkYXRlQWxsQWN0aXZpdGllcygpCiB7 Ci0gICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJbUElEOiAlZF0gJXAgLSBQcm9j ZXNzVGhyb3R0bGVyOjppbnZhbGlkYXRlQWxsQWN0aXZpdGllcygpIEJFR0lOIiwgbV9wcm9jZXNz SWRlbnRpZmllciwgdGhpcyk7CisgICAgUFJPQ0VTU1RIUk9UVExFUl9SRUxFQVNFX0xPRygiaW52 YWxpZGF0ZUFsbEFjdGl2aXRpZXM6IEJFR0lOIik7CiAgICAgd2hpbGUgKCFtX2ZvcmVncm91bmRB Y3Rpdml0aWVzLmlzRW1wdHkoKSkKICAgICAgICAgKCptX2ZvcmVncm91bmRBY3Rpdml0aWVzLmJl Z2luKCkpLT5pbnZhbGlkYXRlKCk7CiAgICAgd2hpbGUgKCFtX2JhY2tncm91bmRBY3Rpdml0aWVz LmlzRW1wdHkoKSkKICAgICAgICAgKCptX2JhY2tncm91bmRBY3Rpdml0aWVzLmJlZ2luKCkpLT5p bnZhbGlkYXRlKCk7Ci0gICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJbUElEOiAl ZF0gJXAgLSBQcm9jZXNzVGhyb3R0bGVyOjppbnZhbGlkYXRlQWxsQWN0aXZpdGllcygpIEVORCIs IG1fcHJvY2Vzc0lkZW50aWZpZXIsIHRoaXMpOworICAgIFBST0NFU1NUSFJPVFRMRVJfUkVMRUFT RV9MT0coImludmFsaWRhdGVBbGxBY3Rpdml0aWVzOiBFTkQiKTsKIH0KICAgICAKIEFzc2VydGlv blN0YXRlIFByb2Nlc3NUaHJvdHRsZXI6OmV4cGVjdGVkQXNzZXJ0aW9uU3RhdGUoKQpAQCAtMTA2 LDcgKzEwNiw3IEBAIHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6c2V0QXNzZXJ0aW9uU3RhdGUoQXNz ZXJ0aW9uU3RhdGUgbmV3U3RhdGUpCiAgICAgaWYgKG1fYXNzZXJ0aW9uLT5zdGF0ZSgpID09IG5l d1N0YXRlKQogICAgICAgICByZXR1cm47CiAKLSAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVu c2lvbiwgIltQSUQ6ICVkXSAlcCAtIFByb2Nlc3NUaHJvdHRsZXI6OnNldEFzc2VydGlvblN0YXRl KCkgVXBkYXRpbmcgcHJvY2VzcyBhc3NlcnRpb24gc3RhdGUgdG8gJXUgKGZvcmVncm91bmRBY3Rp dml0aWVzOiAldSwgYmFja2dyb3VuZEFjdGl2aXRpZXM6ICV1KSIsIG1fcHJvY2Vzc0lkZW50aWZp ZXIsIHRoaXMsIG5ld1N0YXRlLCBtX2ZvcmVncm91bmRBY3Rpdml0aWVzLnNpemUoKSwgbV9iYWNr Z3JvdW5kQWN0aXZpdGllcy5zaXplKCkpOworICAgIFBST0NFU1NUSFJPVFRMRVJfUkVMRUFTRV9M T0coInNldEFzc2VydGlvblN0YXRlOiBVcGRhdGluZyBwcm9jZXNzIGFzc2VydGlvbiBzdGF0ZSB0 byAldSAoZm9yZWdyb3VuZEFjdGl2aXRpZXM6ICV1LCBiYWNrZ3JvdW5kQWN0aXZpdGllczogJXUp IiwgbmV3U3RhdGUsIG1fZm9yZWdyb3VuZEFjdGl2aXRpZXMuc2l6ZSgpLCBtX2JhY2tncm91bmRB Y3Rpdml0aWVzLnNpemUoKSk7CiAgICAgbV9hc3NlcnRpb24tPnNldFN0YXRlKG5ld1N0YXRlKTsK ICAgICBtX3Byb2Nlc3MuZGlkU2V0QXNzZXJ0aW9uU3RhdGUobmV3U3RhdGUpOwogfQpAQCAtMTE5 LDkgKzExOSw5IEBAIHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6dXBkYXRlQXNzZXJ0aW9uSWZOZWVk ZWQoKQogICAgIGlmIChzaG91bGRCZVJ1bm5hYmxlKCkpIHsKICAgICAgICAgaWYgKG1fYXNzZXJ0 aW9uLT5zdGF0ZSgpID09IEFzc2VydGlvblN0YXRlOjpTdXNwZW5kZWQgfHwgbV9wZW5kaW5nUmVx dWVzdFRvU3VzcGVuZElEKSB7CiAgICAgICAgICAgICBpZiAobV9hc3NlcnRpb24tPnN0YXRlKCkg PT0gQXNzZXJ0aW9uU3RhdGU6OlN1c3BlbmRlZCkKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0xP RyhQcm9jZXNzU3VzcGVuc2lvbiwgIltQSUQ6ICVkXSAlcCAtIFByb2Nlc3NUaHJvdHRsZXI6OnVw ZGF0ZUFzc2VydGlvbklmTmVlZGVkKCkgc2VuZGluZyBQcm9jZXNzRGlkUmVzdW1lIElQQyBiZWNh dXNlIHRoZSBwcm9jZXNzIHdhcyBzdXNwZW5kZWQiLCBtX3Byb2Nlc3NJZGVudGlmaWVyLCB0aGlz KTsKKyAgICAgICAgICAgICAgICBQUk9DRVNTVEhST1RUTEVSX1JFTEVBU0VfTE9HKCJ1cGRhdGVB c3NlcnRpb25JZk5lZWRlZDogc2VuZGluZyBQcm9jZXNzRGlkUmVzdW1lIElQQyBiZWNhdXNlIHRo ZSBwcm9jZXNzIHdhcyBzdXNwZW5kZWQiKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAg ICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIltQSUQ6ICVkXSAlcCAtIFByb2Nl c3NUaHJvdHRsZXI6OnVwZGF0ZUFzc2VydGlvbklmTmVlZGVkKCkgc2VuZGluZyBQcm9jZXNzRGlk UmVzdW1lIElQQyBiZWNhdXNlIHRoZSBXZWJQcm9jZXNzIGlzIHN0aWxsIHByb2Nlc3NpbmcgcmVx dWVzdCB0byBzdXNwZW5kOiAlIiBQUkl1NjQsIG1fcHJvY2Vzc0lkZW50aWZpZXIsIHRoaXMsICpt X3BlbmRpbmdSZXF1ZXN0VG9TdXNwZW5kSUQpOworICAgICAgICAgICAgICAgIFBST0NFU1NUSFJP VFRMRVJfUkVMRUFTRV9MT0coInVwZGF0ZUFzc2VydGlvbklmTmVlZGVkOiBzZW5kaW5nIFByb2Nl c3NEaWRSZXN1bWUgSVBDIGJlY2F1c2UgdGhlIFdlYlByb2Nlc3MgaXMgc3RpbGwgcHJvY2Vzc2lu ZyByZXF1ZXN0IHRvIHN1c3BlbmQ6ICUiIFBSSXU2NCwgKm1fcGVuZGluZ1JlcXVlc3RUb1N1c3Bl bmRJRCk7CiAgICAgICAgICAgICBtX3Byb2Nlc3Muc2VuZFByb2Nlc3NEaWRSZXN1bWUoKTsKICAg ICAgICAgICAgIGNsZWFyUGVuZGluZ1JlcXVlc3RUb1N1c3BlbmQoKTsKICAgICAgICAgfQpAQCAt MTQxLDcgKzE0MSw3IEBAIHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6dXBkYXRlQXNzZXJ0aW9uSWZO ZWVkZWQoKQogCiB2b2lkIFByb2Nlc3NUaHJvdHRsZXI6OmRpZENvbm5lY3RUb1Byb2Nlc3MoUHJv Y2Vzc0lEIHBpZCkKIHsKLSAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIltQSUQ6 ICVkXSAlcCAtIFByb2Nlc3NUaHJvdHRsZXI6OmRpZENvbm5lY3RUb1Byb2Nlc3MoKSIsIHBpZCwg dGhpcyk7CisgICAgUFJPQ0VTU1RIUk9UVExFUl9SRUxFQVNFX0xPR19XSVRIX1BJRCgiZGlkQ29u bmVjdFRvUHJvY2VzczoiLCBwaWQpOwogICAgIFJFTEVBU0VfQVNTRVJUKCFtX2Fzc2VydGlvbik7 CiAKICAgICBpZiAobV9zaG91bGRUYWtlVUlCYWNrZ3JvdW5kQXNzZXJ0aW9uKQpAQCAtMTU2LDE0 ICsxNTYsMTQgQEAgdm9pZCBQcm9jZXNzVGhyb3R0bGVyOjpkaWRDb25uZWN0VG9Qcm9jZXNzKFBy b2Nlc3NJRCBwaWQpCiAgICAgCiB2b2lkIFByb2Nlc3NUaHJvdHRsZXI6OnByZXBhcmVUb1N1c3Bl bmRUaW1lb3V0VGltZXJGaXJlZCgpCiB7Ci0gICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNp b24sICJbUElEOiAlZF0gJXAgLSBQcm9jZXNzVGhyb3R0bGVyOjpwcmVwYXJlVG9TdXNwZW5kVGlt ZW91dFRpbWVyRmlyZWQoKSBVcGRhdGluZyBwcm9jZXNzIGFzc2VydGlvbiB0byBhbGxvdyBzdXNw ZW5zaW9uIiwgbV9wcm9jZXNzSWRlbnRpZmllciwgdGhpcyk7CisgICAgUFJPQ0VTU1RIUk9UVExF Ul9SRUxFQVNFX0xPRygicHJlcGFyZVRvU3VzcGVuZFRpbWVvdXRUaW1lckZpcmVkOiBVcGRhdGlu ZyBwcm9jZXNzIGFzc2VydGlvbiB0byBhbGxvdyBzdXNwZW5zaW9uIik7CiAgICAgUkVMRUFTRV9B U1NFUlQobV9wZW5kaW5nUmVxdWVzdFRvU3VzcGVuZElEKTsKICAgICB1cGRhdGVBc3NlcnRpb25T dGF0ZU5vdygpOwogfQogICAgIAogdm9pZCBQcm9jZXNzVGhyb3R0bGVyOjpwcm9jZXNzUmVhZHlU b1N1c3BlbmQoKQogewotICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiW1BJRDog JWRdICVwIC0gUHJvY2Vzc1Rocm90dGxlcjo6cHJvY2Vzc1JlYWR5VG9TdXNwZW5kKCkgVXBkYXRp bmcgcHJvY2VzcyBhc3NlcnRpb24gdG8gYWxsb3cgc3VzcGVuc2lvbiIsIG1fcHJvY2Vzc0lkZW50 aWZpZXIsIHRoaXMpOworICAgIFBST0NFU1NUSFJPVFRMRVJfUkVMRUFTRV9MT0coInByb2Nlc3NS ZWFkeVRvU3VzcGVuZDogVXBkYXRpbmcgcHJvY2VzcyBhc3NlcnRpb24gdG8gYWxsb3cgc3VzcGVu c2lvbiIpOwogCiAgICAgUkVMRUFTRV9BU1NFUlQobV9wZW5kaW5nUmVxdWVzdFRvU3VzcGVuZElE KTsKICAgICBjbGVhclBlbmRpbmdSZXF1ZXN0VG9TdXNwZW5kKCk7CkBAIC0xODAsMTQgKzE4MCwx NCBAQCB2b2lkIFByb2Nlc3NUaHJvdHRsZXI6OmNsZWFyUGVuZGluZ1JlcXVlc3RUb1N1c3BlbmQo KQogCiB2b2lkIFByb2Nlc3NUaHJvdHRsZXI6OnNlbmRQcmVwYXJlVG9TdXNwZW5kSVBDKElzU3Vz cGVuc2lvbkltbWluZW50IGlzU3VzcGVuc2lvbkltbWluZW50KQogewotICAgIFJFTEVBU0VfTE9H KFByb2Nlc3NTdXNwZW5zaW9uLCAiW1BJRDogJWRdICVwIC0gUHJvY2Vzc1Rocm90dGxlcjo6c2Vu ZFByZXBhcmVUb1N1c3BlbmRJUEMoKSBpc1N1c3BlbnNpb25JbW1pbmVudDogJWQiLCBtX3Byb2Nl c3NJZGVudGlmaWVyLCB0aGlzLCBpc1N1c3BlbnNpb25JbW1pbmVudCA9PSBJc1N1c3BlbnNpb25J bW1pbmVudDo6WWVzKTsKKyAgICBQUk9DRVNTVEhST1RUTEVSX1JFTEVBU0VfTE9HKCJzZW5kUHJl cGFyZVRvU3VzcGVuZElQQzogaXNTdXNwZW5zaW9uSW1taW5lbnQ6ICVkIiwgaXNTdXNwZW5zaW9u SW1taW5lbnQgPT0gSXNTdXNwZW5zaW9uSW1taW5lbnQ6Olllcyk7CiAgICAgaWYgKG1fcGVuZGlu Z1JlcXVlc3RUb1N1c3BlbmRJRCkgewogICAgICAgICAvLyBEbyBub3Qgc2VuZCBhIG5ldyBQcmVw YXJlVG9TdXNwZW5kIElQQyBmb3IgaW1taW5lbnQgc3VzcGVuc2lvbiBpZiB3ZSd2ZSBhbHJlYWR5 IHNlbnQgYSBub24taW1taW5lbnQgUHJlcGFyZVRvU3VzcGVuZCBJUEMuCiAgICAgICAgIFJFTEVB U0VfQVNTRVJUKGlzU3VzcGVuc2lvbkltbWluZW50ID09IElzU3VzcGVuc2lvbkltbWluZW50OjpZ ZXMpOwotICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIltQSUQ6ICVkXSAl cCAtIFByb2Nlc3NUaHJvdHRsZXI6OnNlbmRQcmVwYXJlVG9TdXNwZW5kSVBDKCkgTm90IHNlbmRp bmcgUHJlcGFyZVRvU3VzcGVuZCgpIElQQyBiZWNhdXNlIHRoZXJlIGlzIGFscmVhZHkgb25lIGlu IGZsaWdodCAoJSIgUFJJdTY0ICIpIiwgbV9wcm9jZXNzSWRlbnRpZmllciwgdGhpcywgKm1fcGVu ZGluZ1JlcXVlc3RUb1N1c3BlbmRJRCk7CisgICAgICAgIFBST0NFU1NUSFJPVFRMRVJfUkVMRUFT RV9MT0coInNlbmRQcmVwYXJlVG9TdXNwZW5kSVBDOiBOb3Qgc2VuZGluZyBQcmVwYXJlVG9TdXNw ZW5kKCkgSVBDIGJlY2F1c2UgdGhlcmUgaXMgYWxyZWFkeSBvbmUgaW4gZmxpZ2h0ICglIiBQUkl1 NjQgIikiLCAqbV9wZW5kaW5nUmVxdWVzdFRvU3VzcGVuZElEKTsKICAgICB9IGVsc2UgewogICAg ICAgICBtX3BlbmRpbmdSZXF1ZXN0VG9TdXNwZW5kSUQgPSBnZW5lcmF0ZVByZXBhcmVUb1N1c3Bl bmRSZXF1ZXN0SUQoKTsKLSAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJb UElEOiAlZF0gJXAgLSBQcm9jZXNzVGhyb3R0bGVyOjpzZW5kUHJlcGFyZVRvU3VzcGVuZElQQygp IFNlbmRpbmcgUHJlcGFyZVRvU3VzcGVuZCglIiBQUkl1NjQgIiwgaXNTdXNwZW5zaW9uSW1taW5l bnQ6ICVkKSBJUEMiLCBtX3Byb2Nlc3NJZGVudGlmaWVyLCB0aGlzLCAqbV9wZW5kaW5nUmVxdWVz dFRvU3VzcGVuZElELCBpc1N1c3BlbnNpb25JbW1pbmVudCA9PSBJc1N1c3BlbnNpb25JbW1pbmVu dDo6WWVzKTsKKyAgICAgICAgUFJPQ0VTU1RIUk9UVExFUl9SRUxFQVNFX0xPRygic2VuZFByZXBh cmVUb1N1c3BlbmRJUEM6IFNlbmRpbmcgUHJlcGFyZVRvU3VzcGVuZCglIiBQUkl1NjQgIiwgaXNT dXNwZW5zaW9uSW1taW5lbnQ6ICVkKSBJUEMiLCAqbV9wZW5kaW5nUmVxdWVzdFRvU3VzcGVuZElE LCBpc1N1c3BlbnNpb25JbW1pbmVudCA9PSBJc1N1c3BlbnNpb25JbW1pbmVudDo6WWVzKTsKICAg ICAgICAgbV9wcm9jZXNzLnNlbmRQcmVwYXJlVG9TdXNwZW5kKGlzU3VzcGVuc2lvbkltbWluZW50 LCBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyksIHJlcXVlc3RUb1N1c3BlbmRJ RCA9ICptX3BlbmRpbmdSZXF1ZXN0VG9TdXNwZW5kSURdKCkgbXV0YWJsZSB7CiAgICAgICAgICAg ICBpZiAod2Vha1RoaXMgJiYgbV9wZW5kaW5nUmVxdWVzdFRvU3VzcGVuZElEICYmICptX3BlbmRp bmdSZXF1ZXN0VG9TdXNwZW5kSUQgPT0gcmVxdWVzdFRvU3VzcGVuZElEKQogICAgICAgICAgICAg ICAgIHByb2Nlc3NSZWFkeVRvU3VzcGVuZCgpOwpAQCAtMTk5LDcgKzE5OSw3IEBAIHZvaWQgUHJv Y2Vzc1Rocm90dGxlcjo6c2VuZFByZXBhcmVUb1N1c3BlbmRJUEMoSXNTdXNwZW5zaW9uSW1taW5l bnQgaXNTdXNwZW5zaW9uCiAKIHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6dWlBc3NlcnRpb25XaWxs RXhwaXJlSW1taW5lbnRseSgpCiB7Ci0gICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24s ICJbUElEOiAlZF0gJXAgLSBQcm9jZXNzVGhyb3R0bGVyOjp1aUFzc2VydGlvbldpbGxFeHBpcmVJ bW1pbmVudGx5KCkiLCBtX3Byb2Nlc3NJZGVudGlmaWVyLCB0aGlzKTsKKyAgICBQUk9DRVNTVEhS T1RUTEVSX1JFTEVBU0VfTE9HKCJ1aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5OiIpOwog ICAgIHNlbmRQcmVwYXJlVG9TdXNwZW5kSVBDKElzU3VzcGVuc2lvbkltbWluZW50OjpZZXMpOwog ICAgIGludmFsaWRhdGVBbGxBY3Rpdml0aWVzKCk7CiAgICAgbV9wcmVwYXJlVG9TdXNwZW5kVGlt ZW91dFRpbWVyLnN0b3AoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1By b2Nlc3NUaHJvdHRsZXIuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRs ZXIuaAppbmRleCBlODdkYjc0NTYwZTY0ODg2MDQ3Mjg1ZTYzOGFiNTdlMGFkMjViNTNmLi5hNjM4 MGUyMDc2YWM2MTc5ZjcxMzc3MmJkZGEyNzJlMGI4YTRhZTJjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oCkBAIC0zNSw2ICszNSwxMCBAQAogI2luY2x1ZGUg PHd0Zi9WYXJpYW50Lmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KIAorI2RlZmluZSBQUk9D RVNTVEhST1RUTEVSX1JFTEVBU0VfTE9HKG1zZywgLi4uKSBSRUxFQVNFX0xPRyhQcm9jZXNzU3Vz cGVuc2lvbiwgIiVwIC0gW1BJRD0lZF0gUHJvY2Vzc1Rocm90dGxlcjo6IiBtc2csIHRoaXMsIG1f cHJvY2Vzc0lkZW50aWZpZXIsICMjX19WQV9BUkdTX18pCisjZGVmaW5lIFBST0NFU1NUSFJPVFRM RVJfUkVMRUFTRV9MT0dfV0lUSF9QSUQobXNnLCAuLi4pIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNw ZW5zaW9uLCAiJXAgLSBbUElEPSVkXSBQcm9jZXNzVGhyb3R0bGVyOjoiIG1zZywgdGhpcywgIyNf X1ZBX0FSR1NfXykKKyNkZWZpbmUgUFJPQ0VTU1RIUk9UVExFUl9BQ1RJVklUWV9SRUxFQVNFX0xP Ryhtc2csIC4uLikgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFtQSUQ9JWQs IHRocm90dGxlcj0lcF0gUHJvY2Vzc1Rocm90dGxlcjo6QWN0aXZpdHk6OiIgbXNnLCB0aGlzLCBt X3Rocm90dGxlci0+bV9wcm9jZXNzSWRlbnRpZmllciwgbV90aHJvdHRsZXIsICMjX19WQV9BUkdT X18pCisKIG5hbWVzcGFjZSBXZWJLaXQgewogICAgIAogZW51bSBVc2VyT2JzZXJ2YWJsZVBhZ2VD b3VudGVyVHlwZSB7IH07CkBAIC02MSw3ICs2NSw4IEBAIHB1YmxpYzoKICAgICAgICAgICAgICwg bV9uYW1lKG5hbWUpCiAgICAgICAgIHsKICAgICAgICAgICAgIHRocm90dGxlci5hZGRBY3Rpdml0 eSgqdGhpcyk7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIltQ SUQ6ICVkXSAlcCAtIFByb2Nlc3NUaHJvdHRsZXIgU3RhcnRpbmcgJXtwdWJsaWN9cyBhY3Rpdml0 eSAlcCAvICcle3B1YmxpY31zJyIsIG1fdGhyb3R0bGVyLT5tX3Byb2Nlc3NJZGVudGlmaWVyLCBt X3Rocm90dGxlciwgdHlwZSA9PSBBY3Rpdml0eVR5cGU6OkZvcmVncm91bmQgPyAiZm9yZWdyb3Vu ZCIgOiAiYmFja2dyb3VuZCIsIHRoaXMsIG1fbmFtZS5jaGFyYWN0ZXJzKCkpOworICAgICAgICAg ICAgUFJPQ0VTU1RIUk9UVExFUl9BQ1RJVklUWV9SRUxFQVNFX0xPRygiQWN0aXZpdHk6IFN0YXJ0 aW5nICV7cHVibGljfXMgYWN0aXZpdHkgLyAnJXtwdWJsaWN9cyciLAorICAgICAgICAgICAgICAg IHR5cGUgPT0gQWN0aXZpdHlUeXBlOjpGb3JlZ3JvdW5kID8gImZvcmVncm91bmQiIDogImJhY2tn cm91bmQiLCBtX25hbWUuY2hhcmFjdGVycygpKTsKICAgICAgICAgfQogCiAgICAgICAgIH5BY3Rp dml0eSgpCkBAIC03OCw3ICs4Myw4IEBAIHB1YmxpYzoKICAgICAgICAgdm9pZCBpbnZhbGlkYXRl KCkKICAgICAgICAgewogICAgICAgICAgICAgQVNTRVJUKGlzVmFsaWQoKSk7Ci0gICAgICAgICAg ICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIltQSUQ6ICVkXSAlcCAtIFByb2Nlc3NU aHJvdHRsZXIgRW5kaW5nICV7cHVibGljfXMgYWN0aXZpdHkgJXAgLyAnJXtwdWJsaWN9cyciLCBt X3Rocm90dGxlci0+bV9wcm9jZXNzSWRlbnRpZmllciwgbV90aHJvdHRsZXIsIHR5cGUgPT0gQWN0 aXZpdHlUeXBlOjpGb3JlZ3JvdW5kID8gImZvcmVncm91bmQiIDogImJhY2tncm91bmQiLCB0aGlz LCBtX25hbWUuY2hhcmFjdGVycygpKTsKKyAgICAgICAgICAgIFBST0NFU1NUSFJPVFRMRVJfQUNU SVZJVFlfUkVMRUFTRV9MT0coImludmFsaWRhdGU6IEVuZGluZyAle3B1YmxpY31zIGFjdGl2aXR5 IC8gJyV7cHVibGljfXMnIiwKKyAgICAgICAgICAgICAgICB0eXBlID09IEFjdGl2aXR5VHlwZTo6 Rm9yZWdyb3VuZCA/ICJmb3JlZ3JvdW5kIiA6ICJiYWNrZ3JvdW5kIiwgbV9uYW1lLmNoYXJhY3Rl cnMoKSk7CiAgICAgICAgICAgICBtX3Rocm90dGxlci0+cmVtb3ZlQWN0aXZpdHkoKnRoaXMpOwog ICAgICAgICAgICAgbV90aHJvdHRsZXIgPSBudWxscHRyOwogICAgICAgICB9Cg==