116191 2013-05-15 15:55:05 -0700 Web Inspector: InspectorInstrumentation::willEvaluateScript should include column number 2019-01-22 20:51:53 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck hi commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 889561 0 joepeck 2013-05-15 15:55:05 -0700 This will likely be necessary for jump to location to work as expected with minified code in the Scripts timeline. 889562 1 webkit-bug-importer 2013-05-15 15:55:18 -0700 <rdar://problem/13905910> 966637 2 timothy 2014-01-10 15:37:16 -0800 Moving to the right component. 1217051 3 bburg 2016-08-03 11:52:58 -0700 This certainly works now. 1217052 4 bburg 2016-08-03 11:53:48 -0700 Oh, just kidding. But we only use these instrumentations in the overview afaik. 1492991 5 358715 hi 2019-01-09 10:25:12 -0800 Created attachment 358715 Patch EWS check 1492993 6 ews-watchlist 2019-01-09 10:27:15 -0800 Attachment 358715 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:9: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 1492998 7 358715 joepeck 2019-01-09 11:03:58 -0800 Comment on attachment 358715 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358715&action=review Nice! r=me. We don't have any tests on Timeline events right now, we should tackle that at some point. > Source/WebCore/ChangeLog:9 > + No new tests (OOPS!). Seems we can have a test. > Source/WebCore/inspector/TimelineRecordFactory.cpp:107 > -Ref<JSON::Object> TimelineRecordFactory::createEvaluateScriptData(const String& url, double lineNumber) > +Ref<JSON::Object> TimelineRecordFactory::createEvaluateScriptData(const String& url, double lineNumber, double columnNumber) Hmm, why are these doubles? Maybe we can convert them to ints up the chain. JSON::Object::setInteger implicitly converts it to an int anyways. 1497159 8 359835 hi 2019-01-22 19:14:58 -0800 Created attachment 359835 Patch 1497201 9 359835 commit-queue 2019-01-22 20:51:51 -0800 Comment on attachment 359835 Patch Clearing flags on attachment: 359835 Committed r240323: <https://trac.webkit.org/changeset/240323> 1497202 10 commit-queue 2019-01-22 20:51:53 -0800 All reviewed patches have been landed. Closing bug. 358715 2019-01-09 10:25:12 -0800 2019-01-22 19:14:57 -0800 Patch 116191.diff text/plain 21257 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2NjNmNWY3NWY0MC4uOWI0MGIzNjU4MGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MCBAQAorMjAxOS0wMS0wOSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxs RXZhbHVhdGVTY3JpcHQgc2hvdWxkIGluY2x1ZGUgY29sdW1uIG51bWJlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MTkxCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xMzkwNTkxMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIGJpbmRpbmdz L2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJv bGxlcjo6ZXZhbHVhdGVJbldvcmxkKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xs ZXI6OmV2YWx1YXRlTW9kdWxlKToKKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRXhlY1N0YXRl SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpKU0V4ZWNTdGF0ZTo6aW5zdHJ1 bWVudEZ1bmN0aW9uSW50ZXJuYWwpOgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvcklu c3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjp3aWxsQ2FsbEZ1bmN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6d2lsbENhbGxGdW5jdGlvbkltcGwpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsRXZhbHVhdGVTY3JpcHRJbXBsKToKKworICAg ICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oOgorICAgICAg ICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsQ2FsbEZ1bmN0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxFdmFsdWF0ZVNjcmlw dCk6CisKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5Lmg6CisgICAg ICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUZ1bmN0aW9uQ2FsbERhdGEpOgorICAg ICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlw dERhdGEpOgorCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0U291cmNlQ29kZS5oOgorICAg ICAgICAoV2ViQ29yZTo6U2NyaXB0U291cmNlQ29kZTo6c3RhcnRDb2x1bW4gY29uc3QpOiBBZGRl ZC4KKwogMjAxOS0wMS0wOSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogUHJvdG9jb2wgTG9nZ2luZzogbG9nIG1lc3NhZ2VzIGFzIG9i amVjdHMgaWYgaW5zcGVjdG9yXjIgaXMgb3BlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNFeGVjU3RhdGVJbnN0cnVtZW50YXRpb24uaCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTRXhlY1N0YXRlSW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggN2E2NTNlNTQ3 OGYuLjU1M2RjM2RhYzk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0V4ZWNTdGF0ZUluc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTRXhlY1N0YXRlSW5zdHJ1bWVudGF0aW9uLmgKQEAgLTM5LDEyICszOSwxNCBAQCBpbmxp bmUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIEpTRXhlY1N0YXRlOjppbnN0cnVtZW50 RnVuY3Rpb25JbnRlcm5hbChTYwogICAgICAgICByZXR1cm4gSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uQ29va2llKCk7CiAgICAgU3RyaW5nIHJlc291cmNlTmFtZTsKICAgICBpbnQgbGluZU51bWJl ciA9IDE7CisgICAgaW50IGNvbHVtbk51bWJlciA9IDE7CiAgICAgaWYgKGNhbGxUeXBlID09IGpz VHlwZSkgewogICAgICAgICByZXNvdXJjZU5hbWUgPSBjYWxsRGF0YS5qcy5mdW5jdGlvbkV4ZWN1 dGFibGUtPnNvdXJjZVVSTCgpOwogICAgICAgICBsaW5lTnVtYmVyID0gY2FsbERhdGEuanMuZnVu Y3Rpb25FeGVjdXRhYmxlLT5maXJzdExpbmUoKTsKKyAgICAgICAgY29sdW1uTnVtYmVyID0gY2Fs bERhdGEuanMuZnVuY3Rpb25FeGVjdXRhYmxlLT5zdGFydENvbHVtbigpOwogICAgIH0gZWxzZQog ICAgICAgICByZXNvdXJjZU5hbWUgPSAidW5kZWZpbmVkIjsKLSAgICByZXR1cm4gSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjp3aWxsQ2FsbEZ1bmN0aW9uKGNvbnRleHQsIHJlc291cmNlTmFtZSwg bGluZU51bWJlcik7CisgICAgcmV0dXJuIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbENh bGxGdW5jdGlvbihjb250ZXh0LCByZXNvdXJjZU5hbWUsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJl cik7CiB9CiAKIGlubGluZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgSlNFeGVjU3Rh dGU6Omluc3RydW1lbnRGdW5jdGlvbkNhbGwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4 dCwgSlNDOjpDYWxsVHlwZSB0eXBlLCBjb25zdCBKU0M6OkNhbGxEYXRhJiBkYXRhKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAppbmRleCA3ODVj NjZlYzQ3YS4uNzg0YWU1NDA2MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L1NjcmlwdENvbnRyb2xsZXIuY3BwCkBAIC0xMjUsNyArMTI1LDcgQEAgSlNWYWx1ZSBTY3JpcHRD b250cm9sbGVyOjpldmFsdWF0ZUluV29ybGQoY29uc3QgU2NyaXB0U291cmNlQ29kZSYgc291cmNl Q29kZSwgRE8KIAogICAgIFJlZjxGcmFtZT4gcHJvdGVjdG9yKG1fZnJhbWUpOwogCi0gICAgSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0KG1fZnJhbWUsIHNvdXJjZVVSTCwgc291cmNlQ29kZS5z dGFydExpbmUoKSk7CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIGNvb2tpZSA9 IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0KG1fZnJhbWUsIHNv dXJjZVVSTCwgc291cmNlQ29kZS5zdGFydExpbmUoKSwgc291cmNlQ29kZS5zdGFydENvbHVtbigp KTsKIAogICAgIE5ha2VkUHRyPEpTQzo6RXhjZXB0aW9uPiBldmFsdWF0aW9uRXhjZXB0aW9uOwog ICAgIEpTVmFsdWUgcmV0dXJuVmFsdWUgPSBKU0V4ZWNTdGF0ZTo6cHJvZmlsZWRFdmFsdWF0ZSgm ZXhlYywgSlNDOjpQcm9maWxpbmdSZWFzb246Ok90aGVyLCBqc1NvdXJjZUNvZGUsICZwcm94eSwg ZXZhbHVhdGlvbkV4Y2VwdGlvbik7CkBAIC0yMTgsNyArMjE4LDcgQEAgSlNDOjpKU1ZhbHVlIFNj cmlwdENvbnRyb2xsZXI6OmV2YWx1YXRlTW9kdWxlKGNvbnN0IFVSTCYgc291cmNlVVJMLCBKU01v ZHVsZVJlY28KIAogICAgIFJlZjxGcmFtZT4gcHJvdGVjdG9yKG1fZnJhbWUpOwogCi0gICAgYXV0 byBjb29raWUgPSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxFdmFsdWF0ZVNjcmlwdCht X2ZyYW1lLCBzb3VyY2VVUkwsIGpzU291cmNlQ29kZS5maXJzdExpbmUoKS5vbmVCYXNlZEludCgp KTsKKyAgICBhdXRvIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbEV2YWx1 YXRlU2NyaXB0KG1fZnJhbWUsIHNvdXJjZVVSTCwganNTb3VyY2VDb2RlLmZpcnN0TGluZSgpLm9u ZUJhc2VkSW50KCksIGpzU291cmNlQ29kZS5zdGFydENvbHVtbigpLm9uZUJhc2VkSW50KCkpOwog CiAgICAgYXV0byByZXR1cm5WYWx1ZSA9IG1vZHVsZVJlY29yZC5ldmFsdWF0ZSgmc3RhdGUpOwog ICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRXZhbHVhdGVTY3JpcHQoY29va2llLCBt X2ZyYW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFNv dXJjZUNvZGUuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFNvdXJjZUNvZGUu aAppbmRleCAyODZhMzQ0ZjIyZS4uZmNhNTc0Y2ZkYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL1NjcmlwdFNvdXJjZUNvZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9TY3JpcHRTb3VyY2VDb2RlLmgKQEAgLTcwLDYgKzcwLDcgQEAgcHVibGljOgog ICAgIFN0cmluZ1ZpZXcgc291cmNlKCkgY29uc3QgeyByZXR1cm4gbV9wcm92aWRlci0+c291cmNl KCk7IH0KIAogICAgIGludCBzdGFydExpbmUoKSBjb25zdCB7IHJldHVybiBtX2NvZGUuZmlyc3RM aW5lKCkub25lQmFzZWRJbnQoKTsgfQorICAgIGludCBzdGFydENvbHVtbigpIGNvbnN0IHsgcmV0 dXJuIG1fY29kZS5zdGFydENvbHVtbigpLm9uZUJhc2VkSW50KCk7IH0KIAogICAgIENhY2hlZFNj cmlwdCogY2FjaGVkU2NyaXB0KCkgY29uc3QgeyByZXR1cm4gbV9jYWNoZWRTY3JpcHQuZ2V0KCk7 IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3Ry dW1lbnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uLmNwcAppbmRleCBjYzhmMWYwMzNiMC4uYjUwMzAzYzc2ZTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw CkBAIC0zNjgsMTEgKzM2OCwxMSBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlk RGlzcGF0Y2hQb3N0TWVzc2FnZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYgaQogICAgICAgICBw YWdlRGVidWdnZXJBZ2VudC0+ZGlkRGlzcGF0Y2hQb3N0TWVzc2FnZSh0aW1lcik7CiB9CiAKLUlu c3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Ondp bGxDYWxsRnVuY3Rpb25JbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnRpbmdBZ2Vu dHMsIGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50IHNjcmlwdExpbmUsIFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqIGNvbnRleHQpCitJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsQ2FsbEZ1bmN0aW9uSW1wbChJbnN0cnVtZW50aW5n QWdlbnRzJiBpbnN0cnVtZW50aW5nQWdlbnRzLCBjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGlu dCBzY3JpcHRMaW5lLCBpbnQgc2NyaXB0Q29sdW1uLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBj b250ZXh0KQogewogICAgIGludCB0aW1lbGluZUFnZW50SWQgPSAwOwogICAgIGlmIChJbnNwZWN0 b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy5pbnNw ZWN0b3JUaW1lbGluZUFnZW50KCkpIHsKLSAgICAgICAgdGltZWxpbmVBZ2VudC0+d2lsbENhbGxG dW5jdGlvbihzY3JpcHROYW1lLCBzY3JpcHRMaW5lLCBmcmFtZUZvclNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoY29udGV4dCkpOworICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsQ2FsbEZ1bmN0aW9u KHNjcmlwdE5hbWUsIHNjcmlwdExpbmUsIHNjcmlwdENvbHVtbiwgZnJhbWVGb3JTY3JpcHRFeGVj dXRpb25Db250ZXh0KGNvbnRleHQpKTsKICAgICAgICAgdGltZWxpbmVBZ2VudElkID0gdGltZWxp bmVBZ2VudC0+aWQoKTsKICAgICB9CiAgICAgcmV0dXJuIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bkNvb2tpZShpbnN0cnVtZW50aW5nQWdlbnRzLCB0aW1lbGluZUFnZW50SWQpOwpAQCAtNDQxLDEx ICs0NDEsMTEgQEAgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmV2ZW50RGlkUmVzZXRB ZnRlckRpc3BhdGNoSW1wbChJbnN0cnVtZW50aW5nQWdlbnQKICAgICAgICAgZG9tQWdlbnQtPmV2 ZW50RGlkUmVzZXRBZnRlckRpc3BhdGNoKGV2ZW50KTsKIH0KIAotSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uQ29va2llIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0 SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50aW5nQWdlbnRzLCBGcmFtZSYgZnJh bWUsIGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgbGluZU51bWJlcikKK0luc3BlY3Rvckluc3RydW1l bnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxFdmFsdWF0ZVNjcmlw dEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYgaW5zdHJ1bWVudGluZ0FnZW50cywgRnJhbWUmIGZy YW1lLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IGxpbmVOdW1iZXIsIGludCBjb2x1bW5OdW1iZXIp CiB7CiAgICAgaW50IHRpbWVsaW5lQWdlbnRJZCA9IDA7CiAgICAgaWYgKEluc3BlY3RvclRpbWVs aW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLmluc3BlY3RvclRp bWVsaW5lQWdlbnQoKSkgewotICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsRXZhbHVhdGVTY3Jp cHQodXJsLCBsaW5lTnVtYmVyLCBmcmFtZSk7CisgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxF dmFsdWF0ZVNjcmlwdCh1cmwsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgZnJhbWUpOwogICAg ICAgICB0aW1lbGluZUFnZW50SWQgPSB0aW1lbGluZUFnZW50LT5pZCgpOwogICAgIH0KICAgICBy ZXR1cm4gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llKGluc3RydW1lbnRpbmdBZ2VudHMs IHRpbWVsaW5lQWdlbnRJZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggZmRhZWE2MjE2NGEuLmQ1NTljODYxYTU1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRh dGlvbi5oCkBAIC0xNDYsNyArMTQ2LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIHdpbGxE aXNwYXRjaFBvc3RNZXNzYWdlKEZyYW1lJiwgVGltZXJCYXNlJik7CiAgICAgc3RhdGljIHZvaWQg ZGlkRGlzcGF0Y2hQb3N0TWVzc2FnZShGcmFtZSYsIFRpbWVyQmFzZSYpOwogCi0gICAgc3RhdGlj IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsQ2FsbEZ1bmN0aW9uKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqLCBjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5l KTsKKyAgICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIHdpbGxDYWxsRnVu Y3Rpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSwg aW50IHNjcmlwdExpbmUsIGludCBzY3JpcHRDb2x1bW4pOwogICAgIHN0YXRpYyB2b2lkIGRpZENh bGxGdW5jdGlvbihjb25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmLCBTY3JpcHRF eGVjdXRpb25Db250ZXh0Kik7CiAgICAgc3RhdGljIHZvaWQgZGlkQWRkRXZlbnRMaXN0ZW5lcihF dmVudFRhcmdldCYsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBFdmVudExpc3RlbmVy JiwgYm9vbCBjYXB0dXJlKTsKICAgICBzdGF0aWMgdm9pZCB3aWxsUmVtb3ZlRXZlbnRMaXN0ZW5l cihFdmVudFRhcmdldCYsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBFdmVudExpc3Rl bmVyJiwgYm9vbCBjYXB0dXJlKTsKQEAgLTE1OCw3ICsxNTgsNyBAQCBwdWJsaWM6CiAgICAgc3Rh dGljIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsRGlzcGF0Y2hFdmVudE9uV2lu ZG93KEZyYW1lKiwgY29uc3QgRXZlbnQmLCBET01XaW5kb3cmKTsKICAgICBzdGF0aWMgdm9pZCBk aWREaXNwYXRjaEV2ZW50T25XaW5kb3coY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29v a2llJik7CiAgICAgc3RhdGljIHZvaWQgZXZlbnREaWRSZXNldEFmdGVyRGlzcGF0Y2goY29uc3Qg RXZlbnQmKTsKLSAgICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIHdpbGxF dmFsdWF0ZVNjcmlwdChGcmFtZSYsIGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgbGluZU51bWJlcik7 CisgICAgc3RhdGljIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsRXZhbHVhdGVT Y3JpcHQoRnJhbWUmLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IGxpbmVOdW1iZXIsIGludCBjb2x1 bW5OdW1iZXIpOwogICAgIHN0YXRpYyB2b2lkIGRpZEV2YWx1YXRlU2NyaXB0KGNvbnN0IEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYsIEZyYW1lJik7CiAgICAgc3RhdGljIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsRmlyZVRpbWVyKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQmLCBpbnQgdGltZXJJZCwgYm9vbCBvbmVTaG90KTsKICAgICBzdGF0aWMgdm9pZCBkaWRGaXJl VGltZXIoY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJik7CkBAIC0zMzgsNyAr MzM4LDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCB3aWxsRGlzcGF0Y2hQb3N0TWVzc2Fn ZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIGNvbnN0IFRpbWVyQmFzZSYpOwogICAgIHN0YXRp YyB2b2lkIGRpZERpc3BhdGNoUG9zdE1lc3NhZ2VJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBj b25zdCBUaW1lckJhc2UmKTsKIAotICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25D b29raWUgd2lsbENhbGxGdW5jdGlvbkltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIGNvbnN0IFN0 cmluZyYgc2NyaXB0TmFtZSwgaW50IHNjcmlwdExpbmUsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQq KTsKKyAgICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIHdpbGxDYWxsRnVu Y3Rpb25JbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUs IGludCBzY3JpcHRMaW5lLCBpbnQgc2NyaXB0Q29sdW1uLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0 Kik7CiAgICAgc3RhdGljIHZvaWQgZGlkQ2FsbEZ1bmN0aW9uSW1wbChjb25zdCBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb25Db29raWUmLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAgICAgc3Rh dGljIHZvaWQgZGlkQWRkRXZlbnRMaXN0ZW5lckltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIEV2 ZW50VGFyZ2V0JiwgY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIEV2ZW50TGlzdGVuZXIm LCBib29sIGNhcHR1cmUpOwogICAgIHN0YXRpYyB2b2lkIHdpbGxSZW1vdmVFdmVudExpc3RlbmVy SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgRXZlbnRUYXJnZXQmLCBjb25zdCBBdG9taWNTdHJp bmcmIGV2ZW50VHlwZSwgRXZlbnRMaXN0ZW5lciYsIGJvb2wgY2FwdHVyZSk7CkBAIC0zNTAsNyAr MzUwLDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29v a2llIHdpbGxEaXNwYXRjaEV2ZW50T25XaW5kb3dJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBj b25zdCBFdmVudCYsIERPTVdpbmRvdyYpOwogICAgIHN0YXRpYyB2b2lkIGRpZERpc3BhdGNoRXZl bnRPbldpbmRvd0ltcGwoY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJik7CiAg ICAgc3RhdGljIHZvaWQgZXZlbnREaWRSZXNldEFmdGVyRGlzcGF0Y2hJbXBsKEluc3RydW1lbnRp bmdBZ2VudHMmLCBjb25zdCBFdmVudCYpOwotICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb25Db29raWUgd2lsbEV2YWx1YXRlU2NyaXB0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwg RnJhbWUmLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IGxpbmVOdW1iZXIpOworICAgIHN0YXRpYyBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgd2lsbEV2YWx1YXRlU2NyaXB0SW1wbChJbnN0 cnVtZW50aW5nQWdlbnRzJiwgRnJhbWUmLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IGxpbmVOdW1i ZXIsIGludCBjb2x1bW5OdW1iZXIpOwogICAgIHN0YXRpYyB2b2lkIGRpZEV2YWx1YXRlU2NyaXB0 SW1wbChjb25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmLCBGcmFtZSYpOwogICAg IHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgd2lsbEZpcmVUaW1lckltcGwo SW5zdHJ1bWVudGluZ0FnZW50cyYsIGludCB0aW1lcklkLCBib29sIG9uZVNob3QsIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQmKTsKICAgICBzdGF0aWMgdm9pZCBkaWRGaXJlVGltZXJJbXBsKGNvbnN0 IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYpOwpAQCAtNzY4LDExICs3NjgsMTEgQEAg aW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWREaXNwYXRjaFBvc3RNZXNz YWdlKEZyYW1lJiBmcmFtZSwgVGltZXIKICAgICAgICAgZGlkRGlzcGF0Y2hQb3N0TWVzc2FnZUlt cGwoKmluc3RydW1lbnRpbmdBZ2VudHMsIHRpbWVyKTsKIH0KIAotaW5saW5lIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxDYWxsRnVu Y3Rpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgY29uc3QgU3RyaW5nJiBzY3Jp cHROYW1lLCBpbnQgc2NyaXB0TGluZSkKK2lubGluZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25D b29raWUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsQ2FsbEZ1bmN0aW9uKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50IHNj cmlwdExpbmUsIGludCBzY3JpcHRDb2x1bW4pCiB7CiAgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJP TlRFTkRTKEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSgpKTsKICAgICBpZiAoSW5zdHJ1 bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHNG b3JDb250ZXh0KGNvbnRleHQpKQotICAgICAgICByZXR1cm4gd2lsbENhbGxGdW5jdGlvbkltcGwo Kmluc3RydW1lbnRpbmdBZ2VudHMsIHNjcmlwdE5hbWUsIHNjcmlwdExpbmUsIGNvbnRleHQpOwor ICAgICAgICByZXR1cm4gd2lsbENhbGxGdW5jdGlvbkltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMs IHNjcmlwdE5hbWUsIHNjcmlwdExpbmUsIHNjcmlwdENvbHVtbiwgY29udGV4dCk7CiAgICAgcmV0 dXJuIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSgpOwogfQogCkBAIC04MzksMTEgKzgz OSwxMSBAQCBpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmV2ZW50RGlkUmVz ZXRBZnRlckRpc3BhdGNoKGNvbnN0IEV2ZW50JiBldgogICAgICAgICByZXR1cm4gZXZlbnREaWRS ZXNldEFmdGVyRGlzcGF0Y2hJbXBsKCppbnN0cnVtZW50aW5nQWdlbnRzLCBldmVudCk7CiB9CiAK LWlubGluZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjp3aWxsRXZhbHVhdGVTY3JpcHQoRnJhbWUmIGZyYW1lLCBjb25zdCBTdHJpbmcmIHVy bCwgaW50IGxpbmVOdW1iZXIpCitpbmxpbmUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2ll IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0KEZyYW1lJiBmcmFt ZSwgY29uc3QgU3RyaW5nJiB1cmwsIGludCBsaW5lTnVtYmVyLCBpbnQgY29sdW1uTnVtYmVyKQog ewogICAgIEZBU1RfUkVUVVJOX0lGX05PX0ZST05URU5EUyhJbnNwZWN0b3JJbnN0cnVtZW50YXRp b25Db29raWUoKSk7CiAgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdB Z2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRnJhbWUoZnJhbWUpKQotICAgICAgICByZXR1 cm4gd2lsbEV2YWx1YXRlU2NyaXB0SW1wbCgqaW5zdHJ1bWVudGluZ0FnZW50cywgZnJhbWUsIHVy bCwgbGluZU51bWJlcik7CisgICAgICAgIHJldHVybiB3aWxsRXZhbHVhdGVTY3JpcHRJbXBsKCpp bnN0cnVtZW50aW5nQWdlbnRzLCBmcmFtZSwgdXJsLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIp OwogICAgIHJldHVybiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUoKTsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcApp bmRleCAwY2FiNDU0ZmMxMC4uY2IzNGNiZTEyNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwCkBAIC01NywxMSArNTcsMTIgQEAg UmVmPEpTT046Ok9iamVjdD4gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVj b3JkKGRvdWJsZSBzdGFydFRpbWUsIGkKICAgICByZXR1cm4gcmVjb3JkOwogfQogCi1SZWY8SlNP Tjo6T2JqZWN0PiBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUZ1bmN0aW9uQ2FsbERhdGEo Y29uc3QgU3RyaW5nJiBzY3JpcHROYW1lLCBpbnQgc2NyaXB0TGluZSkKK1JlZjxKU09OOjpPYmpl Y3Q+IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRnVuY3Rpb25DYWxsRGF0YShjb25zdCBT dHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lLCBpbnQgc2NyaXB0Q29sdW1uKQogewog ICAgIFJlZjxKU09OOjpPYmplY3Q+IGRhdGEgPSBKU09OOjpPYmplY3Q6OmNyZWF0ZSgpOwogICAg IGRhdGEtPnNldFN0cmluZygic2NyaXB0TmFtZSJfcywgc2NyaXB0TmFtZSk7CiAgICAgZGF0YS0+ c2V0SW50ZWdlcigic2NyaXB0TGluZSJfcywgc2NyaXB0TGluZSk7CisgICAgZGF0YS0+c2V0SW50 ZWdlcigic2NyaXB0Q29sdW1uIl9zLCBzY3JpcHRDb2x1bW4pOwogICAgIHJldHVybiBkYXRhOwog fQogCkBAIC0xMDMsMTEgKzEwNCwxMiBAQCBSZWY8SlNPTjo6T2JqZWN0PiBUaW1lbGluZVJlY29y ZEZhY3Rvcnk6OmNyZWF0ZVRpbWVySW5zdGFsbERhdGEoaW50IHRpbWVySWQsIFNlYwogICAgIHJl dHVybiBkYXRhOwogfQogCi1SZWY8SlNPTjo6T2JqZWN0PiBUaW1lbGluZVJlY29yZEZhY3Rvcnk6 OmNyZWF0ZUV2YWx1YXRlU2NyaXB0RGF0YShjb25zdCBTdHJpbmcmIHVybCwgZG91YmxlIGxpbmVO dW1iZXIpCitSZWY8SlNPTjo6T2JqZWN0PiBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2 YWx1YXRlU2NyaXB0RGF0YShjb25zdCBTdHJpbmcmIHVybCwgZG91YmxlIGxpbmVOdW1iZXIsIGRv dWJsZSBjb2x1bW5OdW1iZXIpCiB7CiAgICAgUmVmPEpTT046Ok9iamVjdD4gZGF0YSA9IEpTT046 Ok9iamVjdDo6Y3JlYXRlKCk7CiAgICAgZGF0YS0+c2V0U3RyaW5nKCJ1cmwiX3MsIHVybCk7CiAg ICAgZGF0YS0+c2V0SW50ZWdlcigibGluZU51bWJlciJfcywgbGluZU51bWJlcik7CisgICAgZGF0 YS0+c2V0SW50ZWdlcigiY29sdW1uTnVtYmVyIl9zLCBjb2x1bW5OdW1iZXIpOwogICAgIHJldHVy biBkYXRhOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxp bmVSZWNvcmRGYWN0b3J5LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNv cmRGYWN0b3J5LmgKaW5kZXggZDVjMTNmZjc2NGQuLmE1MjE2ZTFkNmM5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCkBAIC00OSwxMyAr NDksMTMgQEAgY2xhc3MgVGltZWxpbmVSZWNvcmRGYWN0b3J5IHsKIHB1YmxpYzoKICAgICBzdGF0 aWMgUmVmPEpTT046Ok9iamVjdD4gY3JlYXRlR2VuZXJpY1JlY29yZChkb3VibGUgc3RhcnRUaW1l LCBpbnQgbWF4Q2FsbFN0YWNrRGVwdGgpOwogCi0gICAgc3RhdGljIFJlZjxKU09OOjpPYmplY3Q+ IGNyZWF0ZUZ1bmN0aW9uQ2FsbERhdGEoY29uc3QgU3RyaW5nJiBzY3JpcHROYW1lLCBpbnQgc2Ny aXB0TGluZSk7CisgICAgc3RhdGljIFJlZjxKU09OOjpPYmplY3Q+IGNyZWF0ZUZ1bmN0aW9uQ2Fs bERhdGEoY29uc3QgU3RyaW5nJiBzY3JpcHROYW1lLCBpbnQgc2NyaXB0TGluZSwgaW50IHNjcmlw dENvbHVtbik7CiAgICAgc3RhdGljIFJlZjxKU09OOjpPYmplY3Q+IGNyZWF0ZUNvbnNvbGVQcm9m aWxlRGF0YShjb25zdCBTdHJpbmcmIHRpdGxlKTsKICAgICBzdGF0aWMgUmVmPEpTT046Ok9iamVj dD4gY3JlYXRlUHJvYmVTYW1wbGVEYXRhKGNvbnN0IEluc3BlY3Rvcjo6U2NyaXB0QnJlYWtwb2lu dEFjdGlvbiYsIHVuc2lnbmVkIHNhbXBsZUlkKTsKICAgICBzdGF0aWMgUmVmPEpTT046Ok9iamVj dD4gY3JlYXRlRXZlbnREaXNwYXRjaERhdGEoY29uc3QgRXZlbnQmKTsKICAgICBzdGF0aWMgUmVm PEpTT046Ok9iamVjdD4gY3JlYXRlR2VuZXJpY1RpbWVyRGF0YShpbnQgdGltZXJJZCk7CiAgICAg c3RhdGljIFJlZjxKU09OOjpPYmplY3Q+IGNyZWF0ZVRpbWVySW5zdGFsbERhdGEoaW50IHRpbWVy SWQsIFNlY29uZHMgdGltZW91dCwgYm9vbCBzaW5nbGVTaG90KTsKLSAgICBzdGF0aWMgUmVmPEpT T046Ok9iamVjdD4gY3JlYXRlRXZhbHVhdGVTY3JpcHREYXRhKGNvbnN0IFN0cmluZyYsIGRvdWJs ZSBsaW5lTnVtYmVyKTsKKyAgICBzdGF0aWMgUmVmPEpTT046Ok9iamVjdD4gY3JlYXRlRXZhbHVh dGVTY3JpcHREYXRhKGNvbnN0IFN0cmluZyYsIGRvdWJsZSBsaW5lTnVtYmVyLCBkb3VibGUgY29s dW1uTnVtYmVyKTsKICAgICBzdGF0aWMgUmVmPEpTT046Ok9iamVjdD4gY3JlYXRlVGltZVN0YW1w RGF0YShjb25zdCBTdHJpbmcmKTsKICAgICBzdGF0aWMgUmVmPEpTT046Ok9iamVjdD4gY3JlYXRl QW5pbWF0aW9uRnJhbWVEYXRhKGludCBjYWxsYmFja0lkKTsKICAgICBzdGF0aWMgUmVmPEpTT046 Ok9iamVjdD4gY3JlYXRlT2JzZXJ2ZXJDYWxsYmFja0RhdGEoY29uc3QgU3RyaW5nJiBjYWxsYmFj a1R5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNw ZWN0b3JUaW1lbGluZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMv SW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKaW5kZXggYmUwMjY2MTYzNjEuLjJlMjcwZDQ2YTgy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRp bWVsaW5lQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5z cGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKQEAgLTI5Myw5ICsyOTMsOSBAQCB2b2lkIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OnN0b3BGcm9tQ29uc29sZShKU0M6OkV4ZWNTdGF0ZSosIGNvbnN0IFN0 cmluZyYgdGl0bAogICAgIH0KIH0KIAotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxs Q2FsbEZ1bmN0aW9uKGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50IHNjcmlwdExpbmUsIEZy YW1lKiBmcmFtZSkKK3ZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbENhbGxGdW5jdGlv bihjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lLCBpbnQgc2NyaXB0Q29s dW1uLCBGcmFtZSogZnJhbWUpCiB7Ci0gICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNv cmRGYWN0b3J5OjpjcmVhdGVGdW5jdGlvbkNhbGxEYXRhKHNjcmlwdE5hbWUsIHNjcmlwdExpbmUp LCBUaW1lbGluZVJlY29yZFR5cGU6OkZ1bmN0aW9uQ2FsbCwgdHJ1ZSwgZnJhbWUpOworICAgIHB1 c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRnVuY3Rpb25DYWxs RGF0YShzY3JpcHROYW1lLCBzY3JpcHRMaW5lLCBzY3JpcHRDb2x1bW4pLCBUaW1lbGluZVJlY29y ZFR5cGU6OkZ1bmN0aW9uQ2FsbCwgdHJ1ZSwgZnJhbWUpOwogfQogCiB2b2lkIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OmRpZENhbGxGdW5jdGlvbihGcmFtZSopCkBAIC00MDIsOSArNDAyLDkgQEAg dm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRGaXJlVGltZXIoKQogICAgIGRpZENvbXBs ZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZFR5cGU6OlRpbWVyRmlyZSk7CiB9CiAKLXZv aWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbEV2YWx1YXRlU2NyaXB0KGNvbnN0IFN0cmlu ZyYgdXJsLCBpbnQgbGluZU51bWJlciwgRnJhbWUmIGZyYW1lKQordm9pZCBJbnNwZWN0b3JUaW1l bGluZUFnZW50Ojp3aWxsRXZhbHVhdGVTY3JpcHQoY29uc3QgU3RyaW5nJiB1cmwsIGludCBsaW5l TnVtYmVyLCBpbnQgY29sdW1uTnVtYmVyLCBGcmFtZSYgZnJhbWUpCiB7Ci0gICAgcHVzaEN1cnJl bnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdERhdGEo dXJsLCBsaW5lTnVtYmVyKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpFdmFsdWF0ZVNjcmlwdCwgdHJ1 ZSwgJmZyYW1lKTsKKyAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6 OmNyZWF0ZUV2YWx1YXRlU2NyaXB0RGF0YSh1cmwsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciks IFRpbWVsaW5lUmVjb3JkVHlwZTo6RXZhbHVhdGVTY3JpcHQsIHRydWUsICZmcmFtZSk7CiB9CiAK IHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRXZhbHVhdGVTY3JpcHQoRnJhbWUmKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JUaW1l bGluZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRp bWVsaW5lQWdlbnQuaAppbmRleCBjZjI2MzVlZTI1OC4uNDAzM2NkZmUxNzEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVB Z2VudC5oCkBAIC0xMTgsMTEgKzExOCwxMSBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWRSZW1vdmVU aW1lcihpbnQgdGltZXJJZCwgRnJhbWUqKTsKICAgICB2b2lkIHdpbGxGaXJlVGltZXIoaW50IHRp bWVySWQsIEZyYW1lKik7CiAgICAgdm9pZCBkaWRGaXJlVGltZXIoKTsKLSAgICB2b2lkIHdpbGxD YWxsRnVuY3Rpb24oY29uc3QgU3RyaW5nJiBzY3JpcHROYW1lLCBpbnQgc2NyaXB0TGluZSwgRnJh bWUqKTsKKyAgICB2b2lkIHdpbGxDYWxsRnVuY3Rpb24oY29uc3QgU3RyaW5nJiBzY3JpcHROYW1l LCBpbnQgc2NyaXB0TGluZSwgaW50IHNjcmlwdENvbHVtbiwgRnJhbWUqKTsKICAgICB2b2lkIGRp ZENhbGxGdW5jdGlvbihGcmFtZSopOwogICAgIHZvaWQgd2lsbERpc3BhdGNoRXZlbnQoY29uc3Qg RXZlbnQmLCBGcmFtZSopOwogICAgIHZvaWQgZGlkRGlzcGF0Y2hFdmVudCgpOwotICAgIHZvaWQg d2lsbEV2YWx1YXRlU2NyaXB0KGNvbnN0IFN0cmluZyYsIGludCwgRnJhbWUmKTsKKyAgICB2b2lk IHdpbGxFdmFsdWF0ZVNjcmlwdChjb25zdCBTdHJpbmcmLCBpbnQgbGluZU51bWJlciwgaW50IGNv bHVtbk51bWJlciwgRnJhbWUmKTsKICAgICB2b2lkIGRpZEV2YWx1YXRlU2NyaXB0KEZyYW1lJik7 CiAgICAgdm9pZCBkaWRJbnZhbGlkYXRlTGF5b3V0KEZyYW1lJik7CiAgICAgdm9pZCB3aWxsTGF5 b3V0KEZyYW1lJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2Y2E2Njg0ZmYxNS4uMTFk YTIzMDEyYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5 LTAxLTA5ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxFdmFsdWF0ZVNjcmlwdCBz aG91bGQgaW5jbHVkZSBjb2x1bW4gbnVtYmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYxOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzOTA1 OTEwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChX SS5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLl9wcm9jZXNzUmVjb3JkKToKKwogMjAxOS0wMS0w OSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogUHJvdG9jb2wgTG9nZ2luZzogbG9nIG1lc3NhZ2VzIGFzIG9iamVjdHMgaWYgaW5zcGVj dG9yXjIgaXMgb3BlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCmluZGV4IGEy NTRmMDA1OWYyLi5kZjhkMDRmOGMwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdl ci5qcwpAQCAtNTMyLDEwICs1MzIsOSBAQCBXSS5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1l bGluZU1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgICAgICB2YXIgc2NyaXB0 UmVzb3VyY2UgPSBtYWluRnJhbWUudXJsID09PSByZWNvcmRQYXlsb2FkLmRhdGEudXJsID8gbWFp bkZyYW1lLm1haW5SZXNvdXJjZSA6IG1haW5GcmFtZS5yZXNvdXJjZUZvclVSTChyZWNvcmRQYXls b2FkLmRhdGEudXJsLCB0cnVlKTsKICAgICAgICAgICAgICAgICBpZiAoc2NyaXB0UmVzb3VyY2Up IHsKICAgICAgICAgICAgICAgICAgICAgLy8gVGhlIGxpbmVOdW1iZXIgaXMgMS1iYXNlZCwgYnV0 IHdlIGV4cGVjdCAwLWJhc2VkLgotICAgICAgICAgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9 IHJlY29yZFBheWxvYWQuZGF0YS5saW5lTnVtYmVyIC0gMTsKLQotICAgICAgICAgICAgICAgICAg ICAvLyBGSVhNRTogTm8gY29sdW1uIG51bWJlciBpcyBwcm92aWRlZC4KLSAgICAgICAgICAgICAg ICAgICAgc291cmNlQ29kZUxvY2F0aW9uID0gc2NyaXB0UmVzb3VyY2UuY3JlYXRlU291cmNlQ29k ZUxvY2F0aW9uKGxpbmVOdW1iZXIsIDApOworICAgICAgICAgICAgICAgICAgICBsZXQgbGluZU51 bWJlciA9IHJlY29yZFBheWxvYWQuZGF0YS5saW5lTnVtYmVyIC0gMTsKKyAgICAgICAgICAgICAg ICAgICAgbGV0IGNvbHVtbk51bWJlciA9ICJjb2x1bW5OdW1iZXIiIGluIHJlY29yZFBheWxvYWQu ZGF0YSA/IHJlY29yZFBheWxvYWQuZGF0YS5jb2x1bW5OdW1iZXIgLSAxIDogMDsKKyAgICAgICAg ICAgICAgICAgICAgc291cmNlQ29kZUxvY2F0aW9uID0gc2NyaXB0UmVzb3VyY2UuY3JlYXRlU291 cmNlQ29kZUxvY2F0aW9uKGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcik7CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfQogCkBAIC01ODYsMTAgKzU4NSw5IEBAIFdJLlRpbWVsaW5lTWFu YWdlciA9IGNsYXNzIFRpbWVsaW5lTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAg ICAgICAgIHZhciBzY3JpcHRSZXNvdXJjZSA9IG1haW5GcmFtZS51cmwgPT09IHJlY29yZFBheWxv YWQuZGF0YS5zY3JpcHROYW1lID8gbWFpbkZyYW1lLm1haW5SZXNvdXJjZSA6IG1haW5GcmFtZS5y ZXNvdXJjZUZvclVSTChyZWNvcmRQYXlsb2FkLmRhdGEuc2NyaXB0TmFtZSwgdHJ1ZSk7CiAgICAg ICAgICAgICAgICAgaWYgKHNjcmlwdFJlc291cmNlKSB7CiAgICAgICAgICAgICAgICAgICAgIC8v IFRoZSBsaW5lTnVtYmVyIGlzIDEtYmFzZWQsIGJ1dCB3ZSBleHBlY3QgMC1iYXNlZC4KLSAgICAg ICAgICAgICAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSByZWNvcmRQYXlsb2FkLmRhdGEuc2NyaXB0 TGluZSAtIDE7Ci0KLSAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IE5vIGNvbHVtbiBudW1i ZXIgaXMgcHJvdmlkZWQuCi0gICAgICAgICAgICAgICAgICAgIHNvdXJjZUNvZGVMb2NhdGlvbiA9 IHNjcmlwdFJlc291cmNlLmNyZWF0ZVNvdXJjZUNvZGVMb2NhdGlvbihsaW5lTnVtYmVyLCAwKTsK KyAgICAgICAgICAgICAgICAgICAgbGV0IGxpbmVOdW1iZXIgPSByZWNvcmRQYXlsb2FkLmRhdGEu c2NyaXB0TGluZSAtIDE7CisgICAgICAgICAgICAgICAgICAgIGxldCBjb2x1bW5OdW1iZXIgPSAi c2NyaXB0Q29sdW1uIiBpbiByZWNvcmRQYXlsb2FkLmRhdGEgPyByZWNvcmRQYXlsb2FkLmRhdGEu c2NyaXB0Q29sdW1uIC0gMSA6IDA7CisgICAgICAgICAgICAgICAgICAgIHNvdXJjZUNvZGVMb2Nh dGlvbiA9IHNjcmlwdFJlc291cmNlLmNyZWF0ZVNvdXJjZUNvZGVMb2NhdGlvbihsaW5lTnVtYmVy LCBjb2x1bW5OdW1iZXIpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KIAo= 359835 2019-01-22 19:14:58 -0800 2019-01-22 20:51:51 -0800 Patch bug-116191-20190122191457.patch text/plain 32521 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkOWVmNDUzZjQ4NjY1Yzk4NzM0ZWY5YWZiNTNjZGRkM2RiNGZiYWI0Li4w NDgyMDliZDljOTQyMWRiOGM2NDMzOTJlYzQyZGM4YTUzMjMwOGJkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsNDAgQEAKKzIwMTktMDEtMjIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2ls bEV2YWx1YXRlU2NyaXB0IHNob3VsZCBpbmNsdWRlIGNvbHVtbiBudW1iZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjE5MQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMTM5MDU5MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29y YXJvLgorCisgICAgICAgIFRlc3QgaW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLmh0bWwK KworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZXZhbHVhdGVJbldvcmxkKToKKyAgICAgICAgKFdl YkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6OmV2YWx1YXRlTW9kdWxlKToKKworICAgICAgICAqIGJp bmRpbmdzL2pzL0pTRXhlY1N0YXRlSW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXZWJDb3Jl OjpKU0V4ZWNTdGF0ZTo6aW5zdHJ1bWVudEZ1bmN0aW9uSW50ZXJuYWwpOgorCisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsQ2FsbEZ1bmN0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbENhbGxGdW5jdGlvbkltcGwp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsRXZhbHVh dGVTY3JpcHRJbXBsKToKKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxp bmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3 aWxsQ2FsbEZ1bmN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OndpbGxFdmFsdWF0ZVNjcmlwdCk6CisKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVS ZWNvcmRGYWN0b3J5Lmg6CisgICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9y eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUZ1 bmN0aW9uQ2FsbERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5 OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdERhdGEpOgorCisgICAgICAgICogYmluZGluZ3MvanMvU2Ny aXB0U291cmNlQ29kZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0U291cmNlQ29kZTo6c3Rh cnRDb2x1bW4gY29uc3QpOiBBZGRlZC4KKwogMjAxOS0wMS0yMiAgQWxleCBDaHJpc3RlbnNlbiAg PGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBtb3JlIGJ1aWxkcy4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDY3Y2RkYTNlYzNhOTY0NTAxNDBkNjY2NzQ0Njg5Yzc2 ZTRmOTExZTUuLjUzNWRjYzc4YTQ4NDlkNmNjODQwOThkMTlkYmI4ZThiZThmZmZhY2MgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTAxLTIyICBEZXZpbiBS b3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxFdmFsdWF0ZVNjcmlwdCBzaG91bGQgaW5jbHVkZSBj b2x1bW4gbnVtYmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTYxOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzOTA1OTEwPgorCisgICAgICAg IFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Q29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzOgorICAgICAgICAoV0kuVGltZWxpbmVNYW5h Z2VyLnByb3RvdHlwZS5fcHJvY2Vzc1JlY29yZCk6CisKIDIwMTktMDEtMjIgIEpvc2VwaCBQZWNv cmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXR3 b3JrIFRhYmxlIGFwcGVhcnMgYnJva2VuIGFmdGVyIGZpbHRlciAtIHJvd3MgbG9vayBjb2xsYXBz ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXhlY1N0YXRlSW5z dHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V4ZWNTdGF0ZUlu c3RydW1lbnRhdGlvbi5oCmluZGV4IDdhNjUzZTU0NzhmZjk0MmZhZTE4ZWI5YTgxMGIxNjAxNjEw NDFkMzUuLjU1M2RjM2RhYzk1Mjg0ODY0ZjgwNjNkNzNkMmUxNzQ4OGVmOWQ4YjEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXhlY1N0YXRlSW5zdHJ1bWVudGF0aW9u LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFeGVjU3RhdGVJbnN0cnVtZW50 YXRpb24uaApAQCAtMzksMTIgKzM5LDE0IEBAIGlubGluZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b25Db29raWUgSlNFeGVjU3RhdGU6Omluc3RydW1lbnRGdW5jdGlvbkludGVybmFsKFNjCiAgICAg ICAgIHJldHVybiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUoKTsKICAgICBTdHJpbmcg cmVzb3VyY2VOYW1lOwogICAgIGludCBsaW5lTnVtYmVyID0gMTsKKyAgICBpbnQgY29sdW1uTnVt YmVyID0gMTsKICAgICBpZiAoY2FsbFR5cGUgPT0ganNUeXBlKSB7CiAgICAgICAgIHJlc291cmNl TmFtZSA9IGNhbGxEYXRhLmpzLmZ1bmN0aW9uRXhlY3V0YWJsZS0+c291cmNlVVJMKCk7CiAgICAg ICAgIGxpbmVOdW1iZXIgPSBjYWxsRGF0YS5qcy5mdW5jdGlvbkV4ZWN1dGFibGUtPmZpcnN0TGlu ZSgpOworICAgICAgICBjb2x1bW5OdW1iZXIgPSBjYWxsRGF0YS5qcy5mdW5jdGlvbkV4ZWN1dGFi bGUtPnN0YXJ0Q29sdW1uKCk7CiAgICAgfSBlbHNlCiAgICAgICAgIHJlc291cmNlTmFtZSA9ICJ1 bmRlZmluZWQiOwotICAgIHJldHVybiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxDYWxs RnVuY3Rpb24oY29udGV4dCwgcmVzb3VyY2VOYW1lLCBsaW5lTnVtYmVyKTsKKyAgICByZXR1cm4g SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsQ2FsbEZ1bmN0aW9uKGNvbnRleHQsIHJlc291 cmNlTmFtZSwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyKTsKIH0KIAogaW5saW5lIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbkNvb2tpZSBKU0V4ZWNTdGF0ZTo6aW5zdHJ1bWVudEZ1bmN0aW9uQ2Fs bChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBKU0M6OkNhbGxUeXBlIHR5cGUsIGNv bnN0IEpTQzo6Q2FsbERhdGEmIGRhdGEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L1NjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IDc4NWM2NmVjNDdhMjdhMzEzYjhjYjBlNGYyZGY4 MzY2MzRkYmUyNTUuLjc4NGFlNTQwNjM1YTBjZmI0MmJhMDI1NzE1ZjUyMDM1N2QwYzhlZjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCkBA IC0xMjUsNyArMTI1LDcgQEAgSlNWYWx1ZSBTY3JpcHRDb250cm9sbGVyOjpldmFsdWF0ZUluV29y bGQoY29uc3QgU2NyaXB0U291cmNlQ29kZSYgc291cmNlQ29kZSwgRE8KIAogICAgIFJlZjxGcmFt ZT4gcHJvdGVjdG9yKG1fZnJhbWUpOwogCi0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29v a2llIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0 KG1fZnJhbWUsIHNvdXJjZVVSTCwgc291cmNlQ29kZS5zdGFydExpbmUoKSk7CisgICAgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6d2lsbEV2YWx1YXRlU2NyaXB0KG1fZnJhbWUsIHNvdXJjZVVSTCwgc291cmNlQ29kZS5zdGFy dExpbmUoKSwgc291cmNlQ29kZS5zdGFydENvbHVtbigpKTsKIAogICAgIE5ha2VkUHRyPEpTQzo6 RXhjZXB0aW9uPiBldmFsdWF0aW9uRXhjZXB0aW9uOwogICAgIEpTVmFsdWUgcmV0dXJuVmFsdWUg PSBKU0V4ZWNTdGF0ZTo6cHJvZmlsZWRFdmFsdWF0ZSgmZXhlYywgSlNDOjpQcm9maWxpbmdSZWFz b246Ok90aGVyLCBqc1NvdXJjZUNvZGUsICZwcm94eSwgZXZhbHVhdGlvbkV4Y2VwdGlvbik7CkBA IC0yMTgsNyArMjE4LDcgQEAgSlNDOjpKU1ZhbHVlIFNjcmlwdENvbnRyb2xsZXI6OmV2YWx1YXRl TW9kdWxlKGNvbnN0IFVSTCYgc291cmNlVVJMLCBKU01vZHVsZVJlY28KIAogICAgIFJlZjxGcmFt ZT4gcHJvdGVjdG9yKG1fZnJhbWUpOwogCi0gICAgYXV0byBjb29raWUgPSBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OndpbGxFdmFsdWF0ZVNjcmlwdChtX2ZyYW1lLCBzb3VyY2VVUkwsIGpzU291 cmNlQ29kZS5maXJzdExpbmUoKS5vbmVCYXNlZEludCgpKTsKKyAgICBhdXRvIGNvb2tpZSA9IElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0KG1fZnJhbWUsIHNvdXJj ZVVSTCwganNTb3VyY2VDb2RlLmZpcnN0TGluZSgpLm9uZUJhc2VkSW50KCksIGpzU291cmNlQ29k ZS5zdGFydENvbHVtbigpLm9uZUJhc2VkSW50KCkpOwogCiAgICAgYXV0byByZXR1cm5WYWx1ZSA9 IG1vZHVsZVJlY29yZC5ldmFsdWF0ZSgmc3RhdGUpOwogICAgIEluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6ZGlkRXZhbHVhdGVTY3JpcHQoY29va2llLCBtX2ZyYW1lKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFNvdXJjZUNvZGUuaCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL1NjcmlwdFNvdXJjZUNvZGUuaAppbmRleCAyODZhMzQ0ZjIyZTk5YmY4 M2U1OWI5N2FlYTJkMGY0MmI3YTUxMjczLi5mY2E1NzRjZmRhYWM0OWJhZGY0ZDgyOWYxOTIwMDIx MTE0MzcxOThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRT b3VyY2VDb2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0U291cmNl Q29kZS5oCkBAIC03MCw2ICs3MCw3IEBAIHB1YmxpYzoKICAgICBTdHJpbmdWaWV3IHNvdXJjZSgp IGNvbnN0IHsgcmV0dXJuIG1fcHJvdmlkZXItPnNvdXJjZSgpOyB9CiAKICAgICBpbnQgc3RhcnRM aW5lKCkgY29uc3QgeyByZXR1cm4gbV9jb2RlLmZpcnN0TGluZSgpLm9uZUJhc2VkSW50KCk7IH0K KyAgICBpbnQgc3RhcnRDb2x1bW4oKSBjb25zdCB7IHJldHVybiBtX2NvZGUuc3RhcnRDb2x1bW4o KS5vbmVCYXNlZEludCgpOyB9CiAKICAgICBDYWNoZWRTY3JpcHQqIGNhY2hlZFNjcmlwdCgpIGNv bnN0IHsgcmV0dXJuIG1fY2FjaGVkU2NyaXB0LmdldCgpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKaW5kZXggY2M4 ZjFmMDMzYjBjNDIwYzA1NmIzNGE2MTNkOTZlZTYwNzQxNDQ2NC4uYjUwMzAzYzc2ZTYyNDRhODNl OTYyNjFhM2YxMjk2YWQyNGVkN2NhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKQEAgLTM2OCwxMSArMzY4LDExIEBA IHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWREaXNwYXRjaFBvc3RNZXNzYWdlSW1w bChJbnN0cnVtZW50aW5nQWdlbnRzJiBpCiAgICAgICAgIHBhZ2VEZWJ1Z2dlckFnZW50LT5kaWRE aXNwYXRjaFBvc3RNZXNzYWdlKHRpbWVyKTsKIH0KIAotSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u Q29va2llIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbENhbGxGdW5jdGlvbkltcGwoSW5z dHJ1bWVudGluZ0FnZW50cyYgaW5zdHJ1bWVudGluZ0FnZW50cywgY29uc3QgU3RyaW5nJiBzY3Jp cHROYW1lLCBpbnQgc2NyaXB0TGluZSwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCkK K0luc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OndpbGxDYWxsRnVuY3Rpb25JbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnRpbmdB Z2VudHMsIGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50IHNjcmlwdExpbmUsIGludCBzY3Jp cHRDb2x1bW4sIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQpCiB7CiAgICAgaW50IHRp bWVsaW5lQWdlbnRJZCA9IDA7CiAgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVs aW5lQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkg ewotICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsQ2FsbEZ1bmN0aW9uKHNjcmlwdE5hbWUsIHNj cmlwdExpbmUsIGZyYW1lRm9yU2NyaXB0RXhlY3V0aW9uQ29udGV4dChjb250ZXh0KSk7CisgICAg ICAgIHRpbWVsaW5lQWdlbnQtPndpbGxDYWxsRnVuY3Rpb24oc2NyaXB0TmFtZSwgc2NyaXB0TGlu ZSwgc2NyaXB0Q29sdW1uLCBmcmFtZUZvclNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoY29udGV4dCkp OwogICAgICAgICB0aW1lbGluZUFnZW50SWQgPSB0aW1lbGluZUFnZW50LT5pZCgpOwogICAgIH0K ICAgICByZXR1cm4gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llKGluc3RydW1lbnRpbmdB Z2VudHMsIHRpbWVsaW5lQWdlbnRJZCk7CkBAIC00NDEsMTEgKzQ0MSwxMSBAQCB2b2lkIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6ZXZlbnREaWRSZXNldEFmdGVyRGlzcGF0Y2hJbXBsKEluc3Ry dW1lbnRpbmdBZ2VudAogICAgICAgICBkb21BZ2VudC0+ZXZlbnREaWRSZXNldEFmdGVyRGlzcGF0 Y2goZXZlbnQpOwogfQogCi1JbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjp3aWxsRXZhbHVhdGVTY3JpcHRJbXBsKEluc3RydW1lbnRpbmdBZ2Vu dHMmIGluc3RydW1lbnRpbmdBZ2VudHMsIEZyYW1lJiBmcmFtZSwgY29uc3QgU3RyaW5nJiB1cmws IGludCBsaW5lTnVtYmVyKQorSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0SW1wbChJbnN0cnVtZW50aW5nQWdl bnRzJiBpbnN0cnVtZW50aW5nQWdlbnRzLCBGcmFtZSYgZnJhbWUsIGNvbnN0IFN0cmluZyYgdXJs LCBpbnQgbGluZU51bWJlciwgaW50IGNvbHVtbk51bWJlcikKIHsKICAgICBpbnQgdGltZWxpbmVB Z2VudElkID0gMDsKICAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2Vu dCA9IGluc3RydW1lbnRpbmdBZ2VudHMuaW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKSB7Ci0gICAg ICAgIHRpbWVsaW5lQWdlbnQtPndpbGxFdmFsdWF0ZVNjcmlwdCh1cmwsIGxpbmVOdW1iZXIsIGZy YW1lKTsKKyAgICAgICAgdGltZWxpbmVBZ2VudC0+d2lsbEV2YWx1YXRlU2NyaXB0KHVybCwgbGlu ZU51bWJlciwgY29sdW1uTnVtYmVyLCBmcmFtZSk7CiAgICAgICAgIHRpbWVsaW5lQWdlbnRJZCA9 IHRpbWVsaW5lQWdlbnQtPmlkKCk7CiAgICAgfQogICAgIHJldHVybiBJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb25Db29raWUoaW5zdHJ1bWVudGluZ0FnZW50cywgdGltZWxpbmVBZ2VudElkKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRp b24uaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24u aAppbmRleCBmZGFlYTYyMTY0YWQ0MWE2NThjMWMwMzM4YTU5ZDg0NGE0YzllNmIwLi5kNTU5Yzg2 MWE1NTA3M2NjY2VhZWFlNDg1OWVhM2QwMzEwMGUyMThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCkBAIC0xNDYsNyArMTQ2 LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIHdpbGxEaXNwYXRjaFBvc3RNZXNzYWdlKEZy YW1lJiwgVGltZXJCYXNlJik7CiAgICAgc3RhdGljIHZvaWQgZGlkRGlzcGF0Y2hQb3N0TWVzc2Fn ZShGcmFtZSYsIFRpbWVyQmFzZSYpOwogCi0gICAgc3RhdGljIEluc3BlY3Rvckluc3RydW1lbnRh dGlvbkNvb2tpZSB3aWxsQ2FsbEZ1bmN0aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBjb25z dCBTdHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lKTsKKyAgICBzdGF0aWMgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIHdpbGxDYWxsRnVuY3Rpb24oU2NyaXB0RXhlY3V0aW9u Q29udGV4dCosIGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50IHNjcmlwdExpbmUsIGludCBz Y3JpcHRDb2x1bW4pOwogICAgIHN0YXRpYyB2b2lkIGRpZENhbGxGdW5jdGlvbihjb25zdCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAg ICAgc3RhdGljIHZvaWQgZGlkQWRkRXZlbnRMaXN0ZW5lcihFdmVudFRhcmdldCYsIGNvbnN0IEF0 b21pY1N0cmluZyYgZXZlbnRUeXBlLCBFdmVudExpc3RlbmVyJiwgYm9vbCBjYXB0dXJlKTsKICAg ICBzdGF0aWMgdm9pZCB3aWxsUmVtb3ZlRXZlbnRMaXN0ZW5lcihFdmVudFRhcmdldCYsIGNvbnN0 IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBFdmVudExpc3RlbmVyJiwgYm9vbCBjYXB0dXJlKTsK QEAgLTE1OCw3ICsxNTgsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbkNvb2tpZSB3aWxsRGlzcGF0Y2hFdmVudE9uV2luZG93KEZyYW1lKiwgY29uc3QgRXZl bnQmLCBET01XaW5kb3cmKTsKICAgICBzdGF0aWMgdm9pZCBkaWREaXNwYXRjaEV2ZW50T25XaW5k b3coY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJik7CiAgICAgc3RhdGljIHZv aWQgZXZlbnREaWRSZXNldEFmdGVyRGlzcGF0Y2goY29uc3QgRXZlbnQmKTsKLSAgICBzdGF0aWMg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIHdpbGxFdmFsdWF0ZVNjcmlwdChGcmFtZSYs IGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgbGluZU51bWJlcik7CisgICAgc3RhdGljIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsRXZhbHVhdGVTY3JpcHQoRnJhbWUmLCBjb25zdCBT dHJpbmcmIHVybCwgaW50IGxpbmVOdW1iZXIsIGludCBjb2x1bW5OdW1iZXIpOwogICAgIHN0YXRp YyB2b2lkIGRpZEV2YWx1YXRlU2NyaXB0KGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNv b2tpZSYsIEZyYW1lJik7CiAgICAgc3RhdGljIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tp ZSB3aWxsRmlyZVRpbWVyKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBpbnQgdGltZXJJZCwgYm9v bCBvbmVTaG90KTsKICAgICBzdGF0aWMgdm9pZCBkaWRGaXJlVGltZXIoY29uc3QgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uQ29va2llJik7CkBAIC0zMzgsNyArMzM4LDcgQEAgcHJpdmF0ZToKICAg ICBzdGF0aWMgdm9pZCB3aWxsRGlzcGF0Y2hQb3N0TWVzc2FnZUltcGwoSW5zdHJ1bWVudGluZ0Fn ZW50cyYsIGNvbnN0IFRpbWVyQmFzZSYpOwogICAgIHN0YXRpYyB2b2lkIGRpZERpc3BhdGNoUG9z dE1lc3NhZ2VJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBjb25zdCBUaW1lckJhc2UmKTsKIAot ICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgd2lsbENhbGxGdW5jdGlv bkltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50 IHNjcmlwdExpbmUsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKKyAgICBzdGF0aWMgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIHdpbGxDYWxsRnVuY3Rpb25JbXBsKEluc3RydW1lbnRp bmdBZ2VudHMmLCBjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lLCBpbnQg c2NyaXB0Q29sdW1uLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAgICAgc3RhdGljIHZvaWQg ZGlkQ2FsbEZ1bmN0aW9uSW1wbChjb25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUm LCBTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAgICAgc3RhdGljIHZvaWQgZGlkQWRkRXZlbnRM aXN0ZW5lckltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIEV2ZW50VGFyZ2V0JiwgY29uc3QgQXRv bWljU3RyaW5nJiBldmVudFR5cGUsIEV2ZW50TGlzdGVuZXImLCBib29sIGNhcHR1cmUpOwogICAg IHN0YXRpYyB2b2lkIHdpbGxSZW1vdmVFdmVudExpc3RlbmVySW1wbChJbnN0cnVtZW50aW5nQWdl bnRzJiwgRXZlbnRUYXJnZXQmLCBjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgRXZlbnRM aXN0ZW5lciYsIGJvb2wgY2FwdHVyZSk7CkBAIC0zNTAsNyArMzUwLDcgQEAgcHJpdmF0ZToKICAg ICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIHdpbGxEaXNwYXRjaEV2ZW50 T25XaW5kb3dJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBjb25zdCBFdmVudCYsIERPTVdpbmRv dyYpOwogICAgIHN0YXRpYyB2b2lkIGRpZERpc3BhdGNoRXZlbnRPbldpbmRvd0ltcGwoY29uc3Qg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJik7CiAgICAgc3RhdGljIHZvaWQgZXZlbnRE aWRSZXNldEFmdGVyRGlzcGF0Y2hJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBjb25zdCBFdmVu dCYpOwotICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgd2lsbEV2YWx1 YXRlU2NyaXB0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgRnJhbWUmLCBjb25zdCBTdHJpbmcm IHVybCwgaW50IGxpbmVOdW1iZXIpOworICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b25Db29raWUgd2lsbEV2YWx1YXRlU2NyaXB0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgRnJh bWUmLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IGxpbmVOdW1iZXIsIGludCBjb2x1bW5OdW1iZXIp OwogICAgIHN0YXRpYyB2b2lkIGRpZEV2YWx1YXRlU2NyaXB0SW1wbChjb25zdCBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb25Db29raWUmLCBGcmFtZSYpOwogICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb25Db29raWUgd2lsbEZpcmVUaW1lckltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYs IGludCB0aW1lcklkLCBib29sIG9uZVNob3QsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmKTsKICAg ICBzdGF0aWMgdm9pZCBkaWRGaXJlVGltZXJJbXBsKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRh dGlvbkNvb2tpZSYpOwpAQCAtNzY4LDExICs3NjgsMTEgQEAgaW5saW5lIHZvaWQgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpkaWREaXNwYXRjaFBvc3RNZXNzYWdlKEZyYW1lJiBmcmFtZSwgVGlt ZXIKICAgICAgICAgZGlkRGlzcGF0Y2hQb3N0TWVzc2FnZUltcGwoKmluc3RydW1lbnRpbmdBZ2Vu dHMsIHRpbWVyKTsKIH0KIAotaW5saW5lIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxDYWxsRnVuY3Rpb24oU2NyaXB0RXhlY3V0aW9u Q29udGV4dCogY29udGV4dCwgY29uc3QgU3RyaW5nJiBzY3JpcHROYW1lLCBpbnQgc2NyaXB0TGlu ZSkKK2lubGluZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjp3aWxsQ2FsbEZ1bmN0aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRl eHQsIGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50IHNjcmlwdExpbmUsIGludCBzY3JpcHRD b2x1bW4pCiB7CiAgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRTKEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbkNvb2tpZSgpKTsKICAgICBpZiAoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1 bWVudGluZ0FnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHNGb3JDb250ZXh0KGNvbnRleHQpKQot ICAgICAgICByZXR1cm4gd2lsbENhbGxGdW5jdGlvbkltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMs IHNjcmlwdE5hbWUsIHNjcmlwdExpbmUsIGNvbnRleHQpOworICAgICAgICByZXR1cm4gd2lsbENh bGxGdW5jdGlvbkltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMsIHNjcmlwdE5hbWUsIHNjcmlwdExp bmUsIHNjcmlwdENvbHVtbiwgY29udGV4dCk7CiAgICAgcmV0dXJuIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbkNvb2tpZSgpOwogfQogCkBAIC04MzksMTEgKzgzOSwxMSBAQCBpbmxpbmUgdm9pZCBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmV2ZW50RGlkUmVzZXRBZnRlckRpc3BhdGNoKGNvbnN0 IEV2ZW50JiBldgogICAgICAgICByZXR1cm4gZXZlbnREaWRSZXNldEFmdGVyRGlzcGF0Y2hJbXBs KCppbnN0cnVtZW50aW5nQWdlbnRzLCBldmVudCk7CiB9CiAKLWlubGluZSBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb25Db29raWUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsRXZhbHVhdGVT Y3JpcHQoRnJhbWUmIGZyYW1lLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IGxpbmVOdW1iZXIpCitp bmxpbmUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIEluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0KEZyYW1lJiBmcmFtZSwgY29uc3QgU3RyaW5nJiB1cmws IGludCBsaW5lTnVtYmVyLCBpbnQgY29sdW1uTnVtYmVyKQogewogICAgIEZBU1RfUkVUVVJOX0lG X05PX0ZST05URU5EUyhJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUoKSk7CiAgICAgaWYg KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5n QWdlbnRzRm9yRnJhbWUoZnJhbWUpKQotICAgICAgICByZXR1cm4gd2lsbEV2YWx1YXRlU2NyaXB0 SW1wbCgqaW5zdHJ1bWVudGluZ0FnZW50cywgZnJhbWUsIHVybCwgbGluZU51bWJlcik7CisgICAg ICAgIHJldHVybiB3aWxsRXZhbHVhdGVTY3JpcHRJbXBsKCppbnN0cnVtZW50aW5nQWdlbnRzLCBm cmFtZSwgdXJsLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOwogICAgIHJldHVybiBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb25Db29raWUoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcAppbmRleCAwY2FiNDU0ZmMxMGZiMzk5 YThmM2E4MmFjYmRiYjhjNmQ2ZGYwMjQ4Li5jYzQ1YjFmNGMyYjExMjZkYWExZTIwZGUxNmI4N2Ey YzY2Yjc5MmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVS ZWNvcmRGYWN0b3J5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVS ZWNvcmRGYWN0b3J5LmNwcApAQCAtNTcsMTEgKzU3LDEyIEBAIFJlZjxKU09OOjpPYmplY3Q+IFRp bWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChkb3VibGUgc3RhcnRUaW1l LCBpCiAgICAgcmV0dXJuIHJlY29yZDsKIH0KIAotUmVmPEpTT046Ok9iamVjdD4gVGltZWxpbmVS ZWNvcmRGYWN0b3J5OjpjcmVhdGVGdW5jdGlvbkNhbGxEYXRhKGNvbnN0IFN0cmluZyYgc2NyaXB0 TmFtZSwgaW50IHNjcmlwdExpbmUpCitSZWY8SlNPTjo6T2JqZWN0PiBUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZUZ1bmN0aW9uQ2FsbERhdGEoY29uc3QgU3RyaW5nJiBzY3JpcHROYW1lLCBp bnQgc2NyaXB0TGluZSwgaW50IHNjcmlwdENvbHVtbikKIHsKICAgICBSZWY8SlNPTjo6T2JqZWN0 PiBkYXRhID0gSlNPTjo6T2JqZWN0OjpjcmVhdGUoKTsKICAgICBkYXRhLT5zZXRTdHJpbmcoInNj cmlwdE5hbWUiX3MsIHNjcmlwdE5hbWUpOwogICAgIGRhdGEtPnNldEludGVnZXIoInNjcmlwdExp bmUiX3MsIHNjcmlwdExpbmUpOworICAgIGRhdGEtPnNldEludGVnZXIoInNjcmlwdENvbHVtbiJf cywgc2NyaXB0Q29sdW1uKTsKICAgICByZXR1cm4gZGF0YTsKIH0KIApAQCAtMTAzLDExICsxMDQs MTIgQEAgUmVmPEpTT046Ok9iamVjdD4gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVUaW1l ckluc3RhbGxEYXRhKGludCB0aW1lcklkLCBTZWMKICAgICByZXR1cm4gZGF0YTsKIH0KIAotUmVm PEpTT046Ok9iamVjdD4gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlw dERhdGEoY29uc3QgU3RyaW5nJiB1cmwsIGRvdWJsZSBsaW5lTnVtYmVyKQorUmVmPEpTT046Ok9i amVjdD4gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdERhdGEoY29u c3QgU3RyaW5nJiB1cmwsIGludCBsaW5lTnVtYmVyLCBpbnQgY29sdW1uTnVtYmVyKQogewogICAg IFJlZjxKU09OOjpPYmplY3Q+IGRhdGEgPSBKU09OOjpPYmplY3Q6OmNyZWF0ZSgpOwogICAgIGRh dGEtPnNldFN0cmluZygidXJsIl9zLCB1cmwpOwogICAgIGRhdGEtPnNldEludGVnZXIoImxpbmVO dW1iZXIiX3MsIGxpbmVOdW1iZXIpOworICAgIGRhdGEtPnNldEludGVnZXIoImNvbHVtbk51bWJl ciJfcywgY29sdW1uTnVtYmVyKTsKICAgICByZXR1cm4gZGF0YTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCmluZGV4IGQ1YzEzZmY3 NjRkZGUzYjc5OTRhN2YxM2Q2OWY3OGExZDA0ZGE4NTYuLjUzMDc1NTg3NTlhMzgzODViYjhiODVl OWI5Y2RkMTcwYjEzZDgyODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9U aW1lbGluZVJlY29yZEZhY3RvcnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGlt ZWxpbmVSZWNvcmRGYWN0b3J5LmgKQEAgLTQ5LDEzICs0OSwxMyBAQCBjbGFzcyBUaW1lbGluZVJl Y29yZEZhY3RvcnkgewogcHVibGljOgogICAgIHN0YXRpYyBSZWY8SlNPTjo6T2JqZWN0PiBjcmVh dGVHZW5lcmljUmVjb3JkKGRvdWJsZSBzdGFydFRpbWUsIGludCBtYXhDYWxsU3RhY2tEZXB0aCk7 CiAKLSAgICBzdGF0aWMgUmVmPEpTT046Ok9iamVjdD4gY3JlYXRlRnVuY3Rpb25DYWxsRGF0YShj b25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lKTsKKyAgICBzdGF0aWMgUmVm PEpTT046Ok9iamVjdD4gY3JlYXRlRnVuY3Rpb25DYWxsRGF0YShjb25zdCBTdHJpbmcmIHNjcmlw dE5hbWUsIGludCBzY3JpcHRMaW5lLCBpbnQgc2NyaXB0Q29sdW1uKTsKICAgICBzdGF0aWMgUmVm PEpTT046Ok9iamVjdD4gY3JlYXRlQ29uc29sZVByb2ZpbGVEYXRhKGNvbnN0IFN0cmluZyYgdGl0 bGUpOwogICAgIHN0YXRpYyBSZWY8SlNPTjo6T2JqZWN0PiBjcmVhdGVQcm9iZVNhbXBsZURhdGEo Y29uc3QgSW5zcGVjdG9yOjpTY3JpcHRCcmVha3BvaW50QWN0aW9uJiwgdW5zaWduZWQgc2FtcGxl SWQpOwogICAgIHN0YXRpYyBSZWY8SlNPTjo6T2JqZWN0PiBjcmVhdGVFdmVudERpc3BhdGNoRGF0 YShjb25zdCBFdmVudCYpOwogICAgIHN0YXRpYyBSZWY8SlNPTjo6T2JqZWN0PiBjcmVhdGVHZW5l cmljVGltZXJEYXRhKGludCB0aW1lcklkKTsKICAgICBzdGF0aWMgUmVmPEpTT046Ok9iamVjdD4g Y3JlYXRlVGltZXJJbnN0YWxsRGF0YShpbnQgdGltZXJJZCwgU2Vjb25kcyB0aW1lb3V0LCBib29s IHNpbmdsZVNob3QpOwotICAgIHN0YXRpYyBSZWY8SlNPTjo6T2JqZWN0PiBjcmVhdGVFdmFsdWF0 ZVNjcmlwdERhdGEoY29uc3QgU3RyaW5nJiwgZG91YmxlIGxpbmVOdW1iZXIpOworICAgIHN0YXRp YyBSZWY8SlNPTjo6T2JqZWN0PiBjcmVhdGVFdmFsdWF0ZVNjcmlwdERhdGEoY29uc3QgU3RyaW5n JiwgaW50IGxpbmVOdW1iZXIsIGludCBjb2x1bW5OdW1iZXIpOwogICAgIHN0YXRpYyBSZWY8SlNP Tjo6T2JqZWN0PiBjcmVhdGVUaW1lU3RhbXBEYXRhKGNvbnN0IFN0cmluZyYpOwogICAgIHN0YXRp YyBSZWY8SlNPTjo6T2JqZWN0PiBjcmVhdGVBbmltYXRpb25GcmFtZURhdGEoaW50IGNhbGxiYWNr SWQpOwogICAgIHN0YXRpYyBSZWY8SlNPTjo6T2JqZWN0PiBjcmVhdGVPYnNlcnZlckNhbGxiYWNr RGF0YShjb25zdCBTdHJpbmcmIGNhbGxiYWNrVHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAppbmRl eCBiZTAyNjYxNjM2MWJhMGRlNTJjMTAzZGRjNWUzYzE4N2MwMTlkYzVmLi4yZTI3MGQ0NmE4MjZl MmMxY2QyMDNhNmVmNTFiNWQ0YzdmZmNmMjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKQEAgLTI5 Myw5ICsyOTMsOSBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0b3BGcm9tQ29uc29s ZShKU0M6OkV4ZWNTdGF0ZSosIGNvbnN0IFN0cmluZyYgdGl0bAogICAgIH0KIH0KIAotdm9pZCBJ bnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsQ2FsbEZ1bmN0aW9uKGNvbnN0IFN0cmluZyYgc2Ny aXB0TmFtZSwgaW50IHNjcmlwdExpbmUsIEZyYW1lKiBmcmFtZSkKK3ZvaWQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6d2lsbENhbGxGdW5jdGlvbihjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGlu dCBzY3JpcHRMaW5lLCBpbnQgc2NyaXB0Q29sdW1uLCBGcmFtZSogZnJhbWUpCiB7Ci0gICAgcHVz aEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVGdW5jdGlvbkNhbGxE YXRhKHNjcmlwdE5hbWUsIHNjcmlwdExpbmUpLCBUaW1lbGluZVJlY29yZFR5cGU6OkZ1bmN0aW9u Q2FsbCwgdHJ1ZSwgZnJhbWUpOworICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3Jk RmFjdG9yeTo6Y3JlYXRlRnVuY3Rpb25DYWxsRGF0YShzY3JpcHROYW1lLCBzY3JpcHRMaW5lLCBz Y3JpcHRDb2x1bW4pLCBUaW1lbGluZVJlY29yZFR5cGU6OkZ1bmN0aW9uQ2FsbCwgdHJ1ZSwgZnJh bWUpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENhbGxGdW5jdGlvbihG cmFtZSopCkBAIC00MDIsOSArNDAyLDkgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpk aWRGaXJlVGltZXIoKQogICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29y ZFR5cGU6OlRpbWVyRmlyZSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2ls bEV2YWx1YXRlU2NyaXB0KGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgbGluZU51bWJlciwgRnJhbWUm IGZyYW1lKQordm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsRXZhbHVhdGVTY3JpcHQo Y29uc3QgU3RyaW5nJiB1cmwsIGludCBsaW5lTnVtYmVyLCBpbnQgY29sdW1uTnVtYmVyLCBGcmFt ZSYgZnJhbWUpCiB7Ci0gICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5 OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdERhdGEodXJsLCBsaW5lTnVtYmVyKSwgVGltZWxpbmVSZWNv cmRUeXBlOjpFdmFsdWF0ZVNjcmlwdCwgdHJ1ZSwgJmZyYW1lKTsKKyAgICBwdXNoQ3VycmVudFJl Y29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2YWx1YXRlU2NyaXB0RGF0YSh1cmws IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciksIFRpbWVsaW5lUmVjb3JkVHlwZTo6RXZhbHVhdGVT Y3JpcHQsIHRydWUsICZmcmFtZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 ZGlkRXZhbHVhdGVTY3JpcHQoRnJhbWUmKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2FnZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCBjZjI2MzVlZTI1 ODg5MTNlNzY3MzI2OTczNzg0NzI1OGNjMWMyMzFiLi40MDMzY2RmZTE3MTM0YmY2ZDc2YmJjNzky MWU4ODVhOGFlMmFmYjFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdl bnRzL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaApAQCAtMTE4LDExICsxMTgsMTEgQEAg cHVibGljOgogICAgIHZvaWQgZGlkUmVtb3ZlVGltZXIoaW50IHRpbWVySWQsIEZyYW1lKik7CiAg ICAgdm9pZCB3aWxsRmlyZVRpbWVyKGludCB0aW1lcklkLCBGcmFtZSopOwogICAgIHZvaWQgZGlk RmlyZVRpbWVyKCk7Ci0gICAgdm9pZCB3aWxsQ2FsbEZ1bmN0aW9uKGNvbnN0IFN0cmluZyYgc2Ny aXB0TmFtZSwgaW50IHNjcmlwdExpbmUsIEZyYW1lKik7CisgICAgdm9pZCB3aWxsQ2FsbEZ1bmN0 aW9uKGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50IHNjcmlwdExpbmUsIGludCBzY3JpcHRD b2x1bW4sIEZyYW1lKik7CiAgICAgdm9pZCBkaWRDYWxsRnVuY3Rpb24oRnJhbWUqKTsKICAgICB2 b2lkIHdpbGxEaXNwYXRjaEV2ZW50KGNvbnN0IEV2ZW50JiwgRnJhbWUqKTsKICAgICB2b2lkIGRp ZERpc3BhdGNoRXZlbnQoKTsKLSAgICB2b2lkIHdpbGxFdmFsdWF0ZVNjcmlwdChjb25zdCBTdHJp bmcmLCBpbnQsIEZyYW1lJik7CisgICAgdm9pZCB3aWxsRXZhbHVhdGVTY3JpcHQoY29uc3QgU3Ry aW5nJiwgaW50IGxpbmVOdW1iZXIsIGludCBjb2x1bW5OdW1iZXIsIEZyYW1lJik7CiAgICAgdm9p ZCBkaWRFdmFsdWF0ZVNjcmlwdChGcmFtZSYpOwogICAgIHZvaWQgZGlkSW52YWxpZGF0ZUxheW91 dChGcmFtZSYpOwogICAgIHZvaWQgd2lsbExheW91dChGcmFtZSYpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5h Z2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv VGltZWxpbmVNYW5hZ2VyLmpzCmluZGV4IGEyNTRmMDA1OWYyMDQxMWM0OWYzMzgxZTAxNGY3NWNj OGFkNjVmZjMuLmRmOGQwNGY4YzBhZWViNGJiN2FiZmFlYzJjMTRjMGQ5YjM4YmUwYzggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1Rp bWVsaW5lTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKQEAgLTUzMiwxMCArNTMyLDkgQEAgV0ku VGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0 CiAgICAgICAgICAgICAgICAgdmFyIHNjcmlwdFJlc291cmNlID0gbWFpbkZyYW1lLnVybCA9PT0g cmVjb3JkUGF5bG9hZC5kYXRhLnVybCA/IG1haW5GcmFtZS5tYWluUmVzb3VyY2UgOiBtYWluRnJh bWUucmVzb3VyY2VGb3JVUkwocmVjb3JkUGF5bG9hZC5kYXRhLnVybCwgdHJ1ZSk7CiAgICAgICAg ICAgICAgICAgaWYgKHNjcmlwdFJlc291cmNlKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIFRo ZSBsaW5lTnVtYmVyIGlzIDEtYmFzZWQsIGJ1dCB3ZSBleHBlY3QgMC1iYXNlZC4KLSAgICAgICAg ICAgICAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSByZWNvcmRQYXlsb2FkLmRhdGEubGluZU51bWJl ciAtIDE7Ci0KLSAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IE5vIGNvbHVtbiBudW1iZXIg aXMgcHJvdmlkZWQuCi0gICAgICAgICAgICAgICAgICAgIHNvdXJjZUNvZGVMb2NhdGlvbiA9IHNj cmlwdFJlc291cmNlLmNyZWF0ZVNvdXJjZUNvZGVMb2NhdGlvbihsaW5lTnVtYmVyLCAwKTsKKyAg ICAgICAgICAgICAgICAgICAgbGV0IGxpbmVOdW1iZXIgPSByZWNvcmRQYXlsb2FkLmRhdGEubGlu ZU51bWJlciAtIDE7CisgICAgICAgICAgICAgICAgICAgIGxldCBjb2x1bW5OdW1iZXIgPSAiY29s dW1uTnVtYmVyIiBpbiByZWNvcmRQYXlsb2FkLmRhdGEgPyByZWNvcmRQYXlsb2FkLmRhdGEuY29s dW1uTnVtYmVyIC0gMSA6IDA7CisgICAgICAgICAgICAgICAgICAgIHNvdXJjZUNvZGVMb2NhdGlv biA9IHNjcmlwdFJlc291cmNlLmNyZWF0ZVNvdXJjZUNvZGVMb2NhdGlvbihsaW5lTnVtYmVyLCBj b2x1bW5OdW1iZXIpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KIApAQCAtNTg2 LDEwICs1ODUsOSBAQCBXSS5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1lbGluZU1hbmFnZXIg ZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgICAgICB2YXIgc2NyaXB0UmVzb3VyY2UgPSBt YWluRnJhbWUudXJsID09PSByZWNvcmRQYXlsb2FkLmRhdGEuc2NyaXB0TmFtZSA/IG1haW5GcmFt ZS5tYWluUmVzb3VyY2UgOiBtYWluRnJhbWUucmVzb3VyY2VGb3JVUkwocmVjb3JkUGF5bG9hZC5k YXRhLnNjcmlwdE5hbWUsIHRydWUpOwogICAgICAgICAgICAgICAgIGlmIChzY3JpcHRSZXNvdXJj ZSkgewogICAgICAgICAgICAgICAgICAgICAvLyBUaGUgbGluZU51bWJlciBpcyAxLWJhc2VkLCBi dXQgd2UgZXhwZWN0IDAtYmFzZWQuCi0gICAgICAgICAgICAgICAgICAgIHZhciBsaW5lTnVtYmVy ID0gcmVjb3JkUGF5bG9hZC5kYXRhLnNjcmlwdExpbmUgLSAxOwotCi0gICAgICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiBObyBjb2x1bW4gbnVtYmVyIGlzIHByb3ZpZGVkLgotICAgICAgICAgICAg ICAgICAgICBzb3VyY2VDb2RlTG9jYXRpb24gPSBzY3JpcHRSZXNvdXJjZS5jcmVhdGVTb3VyY2VD b2RlTG9jYXRpb24obGluZU51bWJlciwgMCk7CisgICAgICAgICAgICAgICAgICAgIGxldCBsaW5l TnVtYmVyID0gcmVjb3JkUGF5bG9hZC5kYXRhLnNjcmlwdExpbmUgLSAxOworICAgICAgICAgICAg ICAgICAgICBsZXQgY29sdW1uTnVtYmVyID0gInNjcmlwdENvbHVtbiIgaW4gcmVjb3JkUGF5bG9h ZC5kYXRhID8gcmVjb3JkUGF5bG9hZC5kYXRhLnNjcmlwdENvbHVtbiAtIDEgOiAwOworICAgICAg ICAgICAgICAgICAgICBzb3VyY2VDb2RlTG9jYXRpb24gPSBzY3JpcHRSZXNvdXJjZS5jcmVhdGVT b3VyY2VDb2RlTG9jYXRpb24obGluZU51bWJlciwgY29sdW1uTnVtYmVyKTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjOTBmZjI1MjI2OTQ0NDJhY2I1OGQ5MTRi ZGZkMDg2Y2ZmOGRjOGVjLi5kMTRjYmMyOTM2N2UyOTJmNzQzY2Q0ZTZmYTIzNzU3NjhiMzE1YTJi IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDEtMjIgIERldmluIFJvdXNzbyAgPGRyb3Vz c29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6d2lsbEV2YWx1YXRlU2NyaXB0IHNob3VsZCBpbmNsdWRlIGNvbHVtbiBudW1iZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjE5MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTM5MDU5MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Sm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgICogaW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29s dW1uLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci90aW1lbGluZS9saW5lLWNvbHVt bi1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDE5LTAxLTIyICBNaWNoYWVsIENhdGFuemFybyAg PG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBza2lwIGFsbCBy ZXNvdXJjZSBsb2FkIHN0YXRpc3RpY3MgdGVzdHMgb24gR1RLCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvbGluZS1jb2x1bW4tZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi41MzJmZjk1NjM1OTM2YWE4MTQwMTExZTJhNDlkN2UyNzdiODRmYTAxCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDIzOCBAQAorVGVzdCB0aGF0IHNjcmlwdCBUaW1lbGluZSByZWNv cmRzIGhhdmUgY29sdW1uIG51bWJlcnMuCisKKworCis9PSBSdW5uaW5nIHRlc3Qgc3VpdGU6IFRp bWVsaW5lLkxpbmVDb2x1bW4KKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBUaW1lbGluZS5MaW5lQ29s dW1uLndpbGxDYWxsRnVuY3Rpb24KK0V2YWx1YXRpbmcgaW4gcGFnZS4uLgorUEFTUzogQ2FwdHVy aW5nIHN0YXJ0ZWQuCit7CisgICJzdGFydFRpbWUiOiAiPGZpbHRlcmVkPiIsCisgICJkYXRhIjog e30sCisgICJjaGlsZHJlbiI6IFsKKyAgICB7CisgICAgICAic3RhcnRUaW1lIjogIjxmaWx0ZXJl ZD4iLAorICAgICAgInN0YWNrVHJhY2UiOiBbCisgICAgICAgIHsKKyAgICAgICAgICAiZnVuY3Rp b25OYW1lIjogImNsaWNrIiwKKyAgICAgICAgICAidXJsIjogIltuYXRpdmUgY29kZV0iLAorICAg ICAgICAgICJzY3JpcHRJZCI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICAgICAibGluZU51bWJlciI6 IDAsCisgICAgICAgICAgImNvbHVtbk51bWJlciI6IDAKKyAgICAgICAgfSwKKyAgICAgICAgewor ICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiAid2lsbENhbGxGdW5jdGlvblRlc3QiLAorICAgICAg ICAgICJ1cmwiOiAidGltZWxpbmUvbGluZS1jb2x1bW4uaHRtbCIsCisgICAgICAgICAgInNjcmlw dElkIjogIjxmaWx0ZXJlZD4iLAorICAgICAgICAgICJsaW5lTnVtYmVyIjogMjYsCisgICAgICAg ICAgImNvbHVtbk51bWJlciI6IDQ0CisgICAgICAgIH0sCisgICAgICAgIHsKKyAgICAgICAgICAi ZnVuY3Rpb25OYW1lIjogImdsb2JhbCBjb2RlIiwKKyAgICAgICAgICAidXJsIjogIiIsCisgICAg ICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAorICAgICAgICAgICJsaW5lTnVtYmVyIjog MSwKKyAgICAgICAgICAiY29sdW1uTnVtYmVyIjogMjEKKyAgICAgICAgfSwKKyAgICAgICAgewor ICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiAiZXZhbHVhdGVXaXRoU2NvcGVFeHRlbnNpb24iLAor ICAgICAgICAgICJ1cmwiOiAiW25hdGl2ZSBjb2RlXSIsCisgICAgICAgICAgInNjcmlwdElkIjog IjxmaWx0ZXJlZD4iLAorICAgICAgICAgICJsaW5lTnVtYmVyIjogMCwKKyAgICAgICAgICAiY29s dW1uTnVtYmVyIjogMAorICAgICAgICB9LAorICAgICAgICB7CisgICAgICAgICAgImZ1bmN0aW9u TmFtZSI6ICIiLAorICAgICAgICAgICJ1cmwiOiAiIiwKKyAgICAgICAgICAic2NyaXB0SWQiOiAi PGZpbHRlcmVkPiIsCisgICAgICAgICAgImxpbmVOdW1iZXIiOiAxMzQsCisgICAgICAgICAgImNv bHVtbk51bWJlciI6IDk3CisgICAgICAgIH0KKyAgICAgIF0sCisgICAgICAiZGF0YSI6IHt9LAor ICAgICAgImZyYW1lSWQiOiAiPGZpbHRlcmVkPiIsCisgICAgICAidHlwZSI6ICJTY2hlZHVsZVN0 eWxlUmVjYWxjdWxhdGlvbiIKKyAgICB9LAorICAgIHsKKyAgICAgICJzdGFydFRpbWUiOiAiPGZp bHRlcmVkPiIsCisgICAgICAiZnJhbWVJZCI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICJkYXRhIjog eworICAgICAgICAidHlwZSI6ICJjbGljayIKKyAgICAgIH0sCisgICAgICAiY2hpbGRyZW4iOiBb XSwKKyAgICAgICJlbmRUaW1lIjogIjxmaWx0ZXJlZD4iLAorICAgICAgInR5cGUiOiAiRXZlbnRE aXNwYXRjaCIKKyAgICB9LAorICAgIHsKKyAgICAgICJzdGFydFRpbWUiOiAiPGZpbHRlcmVkPiIs CisgICAgICAiZnJhbWVJZCI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICJkYXRhIjogeworICAgICAg ICAidHlwZSI6ICJjbGljayIKKyAgICAgIH0sCisgICAgICAiY2hpbGRyZW4iOiBbCisgICAgICAg IHsKKyAgICAgICAgICAic3RhcnRUaW1lIjogIjxmaWx0ZXJlZD4iLAorICAgICAgICAgICJzdGFj a1RyYWNlIjogWworICAgICAgICAgICAgeworICAgICAgICAgICAgICAiZnVuY3Rpb25OYW1lIjog ImNsaWNrIiwKKyAgICAgICAgICAgICAgInVybCI6ICJbbmF0aXZlIGNvZGVdIiwKKyAgICAgICAg ICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAorICAgICAgICAgICAgICAibGluZU51bWJl ciI6IDAsCisgICAgICAgICAgICAgICJjb2x1bW5OdW1iZXIiOiAwCisgICAgICAgICAgICB9LAor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAiZnVuY3Rpb25OYW1lIjogIndpbGxDYWxsRnVu Y3Rpb25UZXN0IiwKKyAgICAgICAgICAgICAgInVybCI6ICJ0aW1lbGluZS9saW5lLWNvbHVtbi5o dG1sIiwKKyAgICAgICAgICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAorICAgICAgICAg ICAgICAibGluZU51bWJlciI6IDI2LAorICAgICAgICAgICAgICAiY29sdW1uTnVtYmVyIjogNDQK KyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICJmdW5jdGlvbk5h bWUiOiAiZ2xvYmFsIGNvZGUiLAorICAgICAgICAgICAgICAidXJsIjogIiIsCisgICAgICAgICAg ICAgICJzY3JpcHRJZCI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICAgICAgICAgImxpbmVOdW1iZXIi OiAxLAorICAgICAgICAgICAgICAiY29sdW1uTnVtYmVyIjogMjEKKyAgICAgICAgICAgIH0sCisg ICAgICAgICAgICB7CisgICAgICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiAiZXZhbHVhdGVXaXRo U2NvcGVFeHRlbnNpb24iLAorICAgICAgICAgICAgICAidXJsIjogIltuYXRpdmUgY29kZV0iLAor ICAgICAgICAgICAgICAic2NyaXB0SWQiOiAiPGZpbHRlcmVkPiIsCisgICAgICAgICAgICAgICJs aW5lTnVtYmVyIjogMCwKKyAgICAgICAgICAgICAgImNvbHVtbk51bWJlciI6IDAKKyAgICAgICAg ICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiAiIiwK KyAgICAgICAgICAgICAgInVybCI6ICIiLAorICAgICAgICAgICAgICAic2NyaXB0SWQiOiAiPGZp bHRlcmVkPiIsCisgICAgICAgICAgICAgICJsaW5lTnVtYmVyIjogMTM0LAorICAgICAgICAgICAg ICAiY29sdW1uTnVtYmVyIjogOTcKKyAgICAgICAgICAgIH0KKyAgICAgICAgICBdLAorICAgICAg ICAgICJmcmFtZUlkIjogIjxmaWx0ZXJlZD4iLAorICAgICAgICAgICJkYXRhIjogeworICAgICAg ICAgICAgInNjcmlwdE5hbWUiOiAidGltZWxpbmUvbGluZS1jb2x1bW4uaHRtbCIsCisgICAgICAg ICAgICAic2NyaXB0TGluZSI6IDE3LAorICAgICAgICAgICAgInNjcmlwdENvbHVtbiI6IDY1Cisg ICAgICAgICAgfSwKKyAgICAgICAgICAiY2hpbGRyZW4iOiBbXSwKKyAgICAgICAgICAiZW5kVGlt ZSI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICAgICAidHlwZSI6ICJGdW5jdGlvbkNhbGwiCisgICAg ICAgIH0KKyAgICAgIF0sCisgICAgICAiZW5kVGltZSI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICJ0 eXBlIjogIkV2ZW50RGlzcGF0Y2giCisgICAgfSwKKyAgICB7CisgICAgICAic3RhcnRUaW1lIjog IjxmaWx0ZXJlZD4iLAorICAgICAgInN0YWNrVHJhY2UiOiBbCisgICAgICAgIHsKKyAgICAgICAg ICAiZnVuY3Rpb25OYW1lIjogInByb2ZpbGUiLAorICAgICAgICAgICJ1cmwiOiAiW25hdGl2ZSBj b2RlXSIsCisgICAgICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAorICAgICAgICAgICJs aW5lTnVtYmVyIjogMCwKKyAgICAgICAgICAiY29sdW1uTnVtYmVyIjogMAorICAgICAgICB9LAor ICAgICAgICB7CisgICAgICAgICAgImZ1bmN0aW9uTmFtZSI6ICJ3aWxsQ2FsbEZ1bmN0aW9uVGVz dCIsCisgICAgICAgICAgInVybCI6ICJ0aW1lbGluZS9saW5lLWNvbHVtbi5odG1sIiwKKyAgICAg ICAgICAic2NyaXB0SWQiOiAiPGZpbHRlcmVkPiIsCisgICAgICAgICAgImxpbmVOdW1iZXIiOiAy NSwKKyAgICAgICAgICAiY29sdW1uTnVtYmVyIjogMjAKKyAgICAgICAgfSwKKyAgICAgICAgewor ICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiAiZ2xvYmFsIGNvZGUiLAorICAgICAgICAgICJ1cmwi OiAiIiwKKyAgICAgICAgICAic2NyaXB0SWQiOiAiPGZpbHRlcmVkPiIsCisgICAgICAgICAgImxp bmVOdW1iZXIiOiAxLAorICAgICAgICAgICJjb2x1bW5OdW1iZXIiOiAyMQorICAgICAgICB9LAor ICAgICAgICB7CisgICAgICAgICAgImZ1bmN0aW9uTmFtZSI6ICJldmFsdWF0ZVdpdGhTY29wZUV4 dGVuc2lvbiIsCisgICAgICAgICAgInVybCI6ICJbbmF0aXZlIGNvZGVdIiwKKyAgICAgICAgICAi c2NyaXB0SWQiOiAiPGZpbHRlcmVkPiIsCisgICAgICAgICAgImxpbmVOdW1iZXIiOiAwLAorICAg ICAgICAgICJjb2x1bW5OdW1iZXIiOiAwCisgICAgICAgIH0sCisgICAgICAgIHsKKyAgICAgICAg ICAiZnVuY3Rpb25OYW1lIjogIiIsCisgICAgICAgICAgInVybCI6ICIiLAorICAgICAgICAgICJz Y3JpcHRJZCI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICAgICAibGluZU51bWJlciI6IDEzNCwKKyAg ICAgICAgICAiY29sdW1uTnVtYmVyIjogOTcKKyAgICAgICAgfQorICAgICAgXSwKKyAgICAgICJm cmFtZUlkIjogIjxmaWx0ZXJlZD4iLAorICAgICAgImRhdGEiOiB7CisgICAgICAgICJ0aXRsZSI6 ICIiCisgICAgICB9LAorICAgICAgImNoaWxkcmVuIjogW10sCisgICAgICAiZW5kVGltZSI6ICI8 ZmlsdGVyZWQ+IiwKKyAgICAgICJ0eXBlIjogIkNvbnNvbGVQcm9maWxlIgorICAgIH0KKyAgXSwK KyAgImVuZFRpbWUiOiAiPGZpbHRlcmVkPiIsCisgICJ0eXBlIjogIlJlbmRlcmluZ0ZyYW1lIgor fQorUEFTUzogQ2FwdHVyaW5nIHN0b3BwZWQuCisKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBUaW1l bGluZS5MaW5lQ29sdW1uLndpbGxFdmFsdWF0ZVNjcmlwdAorRXZhbHVhdGluZyBpbiBwYWdlLi4u CitQQVNTOiBDYXB0dXJpbmcgc3RhcnRlZC4KK3sKKyAgInN0YXJ0VGltZSI6ICI8ZmlsdGVyZWQ+ IiwKKyAgImRhdGEiOiB7fSwKKyAgImNoaWxkcmVuIjogWworICAgIHsKKyAgICAgICJzdGFydFRp bWUiOiAiPGZpbHRlcmVkPiIsCisgICAgICAic3RhY2tUcmFjZSI6IFsKKyAgICAgICAgeworICAg ICAgICAgICJmdW5jdGlvbk5hbWUiOiAicHJvZmlsZSIsCisgICAgICAgICAgInVybCI6ICJbbmF0 aXZlIGNvZGVdIiwKKyAgICAgICAgICAic2NyaXB0SWQiOiAiPGZpbHRlcmVkPiIsCisgICAgICAg ICAgImxpbmVOdW1iZXIiOiAwLAorICAgICAgICAgICJjb2x1bW5OdW1iZXIiOiAwCisgICAgICAg IH0sCisgICAgICAgIHsKKyAgICAgICAgICAiZnVuY3Rpb25OYW1lIjogIndpbGxFdmFsdWF0ZVNj cmlwdFRlc3QiLAorICAgICAgICAgICJ1cmwiOiAidGltZWxpbmUvbGluZS1jb2x1bW4uaHRtbCIs CisgICAgICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAorICAgICAgICAgICJsaW5lTnVt YmVyIjogMzEsCisgICAgICAgICAgImNvbHVtbk51bWJlciI6IDIwCisgICAgICAgIH0sCisgICAg ICAgIHsKKyAgICAgICAgICAiZnVuY3Rpb25OYW1lIjogImdsb2JhbCBjb2RlIiwKKyAgICAgICAg ICAidXJsIjogIiIsCisgICAgICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAorICAgICAg ICAgICJsaW5lTnVtYmVyIjogMSwKKyAgICAgICAgICAiY29sdW1uTnVtYmVyIjogMjMKKyAgICAg ICAgfSwKKyAgICAgICAgeworICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiAiZXZhbHVhdGVXaXRo U2NvcGVFeHRlbnNpb24iLAorICAgICAgICAgICJ1cmwiOiAiW25hdGl2ZSBjb2RlXSIsCisgICAg ICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAorICAgICAgICAgICJsaW5lTnVtYmVyIjog MCwKKyAgICAgICAgICAiY29sdW1uTnVtYmVyIjogMAorICAgICAgICB9LAorICAgICAgICB7Cisg ICAgICAgICAgImZ1bmN0aW9uTmFtZSI6ICIiLAorICAgICAgICAgICJ1cmwiOiAiIiwKKyAgICAg ICAgICAic2NyaXB0SWQiOiAiPGZpbHRlcmVkPiIsCisgICAgICAgICAgImxpbmVOdW1iZXIiOiAx MzQsCisgICAgICAgICAgImNvbHVtbk51bWJlciI6IDk3CisgICAgICAgIH0KKyAgICAgIF0sCisg ICAgICAiZnJhbWVJZCI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICJkYXRhIjogeworICAgICAgICAi dGl0bGUiOiAiIgorICAgICAgfSwKKyAgICAgICJjaGlsZHJlbiI6IFtdLAorICAgICAgImVuZFRp bWUiOiAiPGZpbHRlcmVkPiIsCisgICAgICAidHlwZSI6ICJDb25zb2xlUHJvZmlsZSIKKyAgICB9 CisgIF0sCisgICJlbmRUaW1lIjogIjxmaWx0ZXJlZD4iLAorICAidHlwZSI6ICJSZW5kZXJpbmdG cmFtZSIKK30KK1BBU1M6IENhcHR1cmluZyBzdG9wcGVkLgorCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvbGluZS1jb2x1bW4uaHRtbCBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci90aW1lbGluZS9saW5lLWNvbHVtbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRkOWM1YWVhNTAz NDc3M2VlOGZlZDMzMjU2NWViNjkyYjM0M2Y3MjMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvbGluZS1jb2x1bW4uaHRtbApAQCAtMCwwICsxLDEwNyBA QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2h0 dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9wcm90b2NvbC10ZXN0LmpzIj48L3NjcmlwdD4K KzxzY3JpcHQ+CisKK2Z1bmN0aW9uIGJhcih4KQoreworICAgIHJldHVybiB4ICogMTA7Cit9CisK K2Z1bmN0aW9uIGZvbygpIHsKKyAgICBiYXIoNDIpOworfQorCitmdW5jdGlvbiBsb2FkKCkgewor ICAgIGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiNidXR0b24iKS5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsIChldmVudCkgPT4geworICAgICAgICBmb28oKTsKKyAgICB9KTsKKworICAgIHJ1blRl c3QoKTsKK30KKworZnVuY3Rpb24gd2lsbENhbGxGdW5jdGlvblRlc3QoKSB7CisgICAgY29uc29s ZS5wcm9maWxlKCk7CisgICAgZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiI2J1dHRvbiIpLmNsaWNr KCk7CisgICAgY29uc29sZS5wcm9maWxlRW5kKCk7Cit9CisKK2Z1bmN0aW9uIHdpbGxFdmFsdWF0 ZVNjcmlwdFRlc3QoKSB7CisgICAgY29uc29sZS5wcm9maWxlKCk7CisgICAgZm9vKCk7CisgICAg Y29uc29sZS5wcm9maWxlRW5kKCk7Cit9CisKK2Z1bmN0aW9uIHRlc3QoKSB7CisgICAgUHJvdG9j b2xUZXN0LmRlYnVnKCk7CisKKyAgICBsZXQgc3VpdGUgPSBQcm90b2NvbFRlc3QuY3JlYXRlQXN5 bmNTdWl0ZSgiVGltZWxpbmUuTGluZUNvbHVtbiIpOworCisgICAgZnVuY3Rpb24gcmVwbGFjZXIo a2V5LCB2YWx1ZSkgeworICAgICAgICBpZiAoa2V5ID09PSAic3RhcnRUaW1lIiB8fCBrZXkgPT09 ICJlbmRUaW1lIiB8fCBrZXkgPT09ICJzY3JpcHRJZCIgfHwga2V5ID09PSAiZnJhbWVJZCIpCisg ICAgICAgICAgICByZXR1cm4gIjxmaWx0ZXJlZD4iOworICAgICAgICBpZiAoa2V5ID09PSAidXJs IiB8fCBrZXkgPT09ICJzY3JpcHROYW1lIikKKyAgICAgICAgICAgIHJldHVybiB2YWx1ZS5yZXBs YWNlKC9eLitMYXlvdXRUZXN0c1wvaW5zcGVjdG9yXC8vLCAiIik7CisgICAgICAgIHJldHVybiB2 YWx1ZTsKKyAgICB9CisKKyAgICBjb25zdCB0ZXN0cyA9IFsKKyAgICAgICAgeworICAgICAgICAg ICAgbmFtZTogIlRpbWVsaW5lLkxpbmVDb2x1bW4ud2lsbENhbGxGdW5jdGlvbiIsCisgICAgICAg ICAgICBkZXNjcmlwdGlvbjogIlRlc3QgdGhhdCBjb2x1bW4gbnVtYmVycyBhcmUgcGFzc2VkIHRo cm91Z2ggdGhlIHdpbGxDYWxsRnVuY3Rpb24gaW5zdHJ1bWVudGF0aW9uIHBvaW50LiIsCisgICAg ICAgICAgICBleHByZXNzaW9uOiBgd2lsbENhbGxGdW5jdGlvblRlc3QoKWAsCisgICAgICAgIH0s CisgICAgICAgIHsKKyAgICAgICAgICAgIG5hbWU6ICJUaW1lbGluZS5MaW5lQ29sdW1uLndpbGxF dmFsdWF0ZVNjcmlwdCIsCisgICAgICAgICAgICBkZXNjcmlwdGlvbjogIlRlc3QgdGhhdCBjb2x1 bW4gbnVtYmVycyBhcmUgcGFzc2VkIHRocm91Z2ggdGhlIHdpbGxFdmFsdWF0ZVNjcmlwdCBpbnN0 cnVtZW50YXRpb24gcG9pbnQuIiwKKyAgICAgICAgICAgIGV4cHJlc3Npb246IGB3aWxsRXZhbHVh dGVTY3JpcHRUZXN0KClgLAorICAgICAgICB9LAorICAgIF07CisKKyAgICBmb3IgKGxldCB7bmFt ZSwgZGVzY3JpcHRpb24sIGV4cHJlc3Npb259IG9mIHRlc3RzKSB7CisgICAgICAgIHN1aXRlLmFk ZFRlc3RDYXNlKHsKKyAgICAgICAgICAgIG5hbWUsCisgICAgICAgICAgICBkZXNjcmlwdGlvbiwK KyAgICAgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICAgICAgbGV0 IGV2ZW50TmFtZXMgPSBbXTsKKworICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGhhbmRsZUV2ZW50 KGV2ZW50TmFtZSwgaGFuZGxlcikgeworICAgICAgICAgICAgICAgICAgICBldmVudE5hbWVzLnB1 c2goZXZlbnROYW1lKTsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yUHJvdG9jb2wuZXZl bnRIYW5kbGVyW2V2ZW50TmFtZV0gPSBoYW5kbGVyOworICAgICAgICAgICAgICAgIH0KKworICAg ICAgICAgICAgICAgIGhhbmRsZUV2ZW50KCJUaW1lbGluZS5ldmVudFJlY29yZGVkIiwgKGV2ZW50 KSA9PiB7CisgICAgICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5sb2coSlNPTi5zdHJpbmdp ZnkoZXZlbnQucGFyYW1zLnJlY29yZCwgcmVwbGFjZXIsIDIpKTsKKyAgICAgICAgICAgICAgICB9 KTsKKworICAgICAgICAgICAgICAgIGhhbmRsZUV2ZW50KCJUaW1lbGluZS5wcm9ncmFtbWF0aWND YXB0dXJlU3RhcnRlZCIsICgpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgUHJvdG9jb2xUZXN0 LnBhc3MoIkNhcHR1cmluZyBzdGFydGVkLiIpOworICAgICAgICAgICAgICAgIH0pOworCisgICAg ICAgICAgICAgICAgaGFuZGxlRXZlbnQoIlRpbWVsaW5lLnByb2dyYW1tYXRpY0NhcHR1cmVTdG9w cGVkIiwgKCkgPT4geworICAgICAgICAgICAgICAgICAgICBQcm90b2NvbFRlc3QucGFzcygiQ2Fw dHVyaW5nIHN0b3BwZWQuIik7CisKKyAgICAgICAgICAgICAgICAgICAgZm9yIChsZXQgZXZlbnRO YW1lIG9mIGV2ZW50TmFtZXMpCisgICAgICAgICAgICAgICAgICAgICAgICBkZWxldGUgSW5zcGVj dG9yUHJvdG9jb2wuZXZlbnRIYW5kbGVyW2V2ZW50TmFtZV07CisKKyAgICAgICAgICAgICAgICAg ICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgICAgIH0pOworCisgICAgICAgICAgICAgICAgUHJv dG9jb2xUZXN0LmxvZygiRXZhbHVhdGluZyBpbiBwYWdlLi4uIik7CisgICAgICAgICAgICAgICAg UHJvdG9jb2xUZXN0LmV2YWx1YXRlSW5QYWdlKGV4cHJlc3Npb24pCisgICAgICAgICAgICAgICAg LmNhdGNoKHJlamVjdCk7CisgICAgICAgICAgICB9LAorICAgICAgICB9KTsKKyAgICB9CisKKyAg ICBzdWl0ZS5ydW5UZXN0Q2FzZXNBbmRGaW5pc2goKTsKK30KKworPC9zY3JpcHQ+Cis8L2hlYWQ+ Cis8Ym9keSBvbmxvYWQ9ImxvYWQoKSI+CisgICAgPHA+VGVzdCB0aGF0IHNjcmlwdCBUaW1lbGlu ZSByZWNvcmRzIGhhdmUgY29sdW1uIG51bWJlcnMuPC9wPgorICAgIDxidXR0b24gaWQ9ImJ1dHRv biI+PC9idXR0b24+Cis8L2JvZHk+Cis8L2h0bWw+Cg==